From 3fed190db0ef24d0f51972ee20bd84c253c4c32f Mon Sep 17 00:00:00 2001 From: Magento Mirror Date: Sat, 17 Jan 2009 18:11:51 -0500 Subject: [PATCH] Import Magento Release 1.1.5 --- 404/index.php | 6 + STATUS.txt | 289 +- app/Mage.php | 33 +- app/code/core/Mage/Admin/Model/Acl.php | 6 + .../core/Mage/Admin/Model/Acl/Assert/Ip.php | 6 + .../core/Mage/Admin/Model/Acl/Assert/Time.php | 6 + .../core/Mage/Admin/Model/Acl/Resource.php | 6 + app/code/core/Mage/Admin/Model/Acl/Role.php | 6 + .../Mage/Admin/Model/Acl/Role/Generic.php | 6 + .../core/Mage/Admin/Model/Acl/Role/Group.php | 6 + .../Mage/Admin/Model/Acl/Role/Registry.php | 6 + .../core/Mage/Admin/Model/Acl/Role/User.php | 6 + app/code/core/Mage/Admin/Model/Config.php | 6 + app/code/core/Mage/Admin/Model/Mysql4/Acl.php | 6 + .../core/Mage/Admin/Model/Mysql4/Acl/Role.php | 6 + .../Model/Mysql4/Acl/Role/Collection.php | 6 + .../Model/Mysql4/Permissions/Collection.php | 6 + .../core/Mage/Admin/Model/Mysql4/Role.php | 6 + .../Admin/Model/Mysql4/Role/Collection.php | 6 + .../core/Mage/Admin/Model/Mysql4/Roles.php | 6 + .../Admin/Model/Mysql4/Roles/Collection.php | 6 + .../Model/Mysql4/Roles/User/Collection.php | 6 + .../core/Mage/Admin/Model/Mysql4/Rules.php | 6 + .../Admin/Model/Mysql4/Rules/Collection.php | 6 + .../core/Mage/Admin/Model/Mysql4/User.php | 9 +- .../Admin/Model/Mysql4/User/Collection.php | 6 + app/code/core/Mage/Admin/Model/Observer.php | 8 +- app/code/core/Mage/Admin/Model/Role.php | 6 + app/code/core/Mage/Admin/Model/Roles.php | 6 + app/code/core/Mage/Admin/Model/Rules.php | 6 + app/code/core/Mage/Admin/Model/Session.php | 6 + app/code/core/Mage/Admin/Model/User.php | 6 + app/code/core/Mage/Admin/etc/admin.xml | 6 + app/code/core/Mage/Admin/etc/config.xml | 6 + .../sql/admin_setup/mysql4-install-0.7.0.php | 6 + .../mysql4-upgrade-0.7.0-0.7.1.php | 6 + .../Mage/AdminNotification/Helper/Data.php | 6 + .../Mage/AdminNotification/Model/Feed.php | 6 + .../Mage/AdminNotification/Model/Inbox.php | 6 + .../AdminNotification/Model/Mysql4/Inbox.php | 6 + .../Model/Mysql4/Inbox/Collection.php | 6 + .../Mage/AdminNotification/Model/Observer.php | 6 + .../Mage/AdminNotification/etc/config.xml | 6 + .../Mage/AdminNotification/etc/system.xml | 8 +- .../mysql4-install-1.0.0.php | 6 + .../core/Mage/Adminhtml/Block/Abstract.php | 6 + .../core/Mage/Adminhtml/Block/Api/Buttons.php | 6 + .../Mage/Adminhtml/Block/Api/Editroles.php | 6 + .../Mage/Adminhtml/Block/Api/Edituser.php | 6 + .../Mage/Adminhtml/Block/Api/Grid/Role.php | 6 + .../core/Mage/Adminhtml/Block/Api/Role.php | 6 + .../Adminhtml/Block/Api/Role/Grid/User.php | 6 + .../core/Mage/Adminhtml/Block/Api/Roles.php | 6 + .../Mage/Adminhtml/Block/Api/Tab/Roleinfo.php | 6 + .../Adminhtml/Block/Api/Tab/Rolesedit.php | 6 + .../Adminhtml/Block/Api/Tab/Rolesusers.php | 6 + .../Adminhtml/Block/Api/Tab/Userroles.php | 6 + .../core/Mage/Adminhtml/Block/Api/User.php | 6 + .../Mage/Adminhtml/Block/Api/User/Edit.php | 6 + .../Adminhtml/Block/Api/User/Edit/Form.php | 6 + .../Block/Api/User/Edit/Tab/Main.php | 6 + .../Block/Api/User/Edit/Tab/Roles.php | 6 + .../Adminhtml/Block/Api/User/Edit/Tabs.php | 6 + .../Mage/Adminhtml/Block/Api/User/Grid.php | 6 + .../core/Mage/Adminhtml/Block/Api/Users.php | 6 + app/code/core/Mage/Adminhtml/Block/Backup.php | 6 + .../core/Mage/Adminhtml/Block/Backup/Grid.php | 6 + .../Block/Backup/Grid/Filter/Type.php | 6 + .../Block/Backup/Grid/Renderer/Type.php | 6 + .../core/Mage/Adminhtml/Block/Catalog.php | 6 + .../Block/Catalog/Category/Abstract.php | 184 + .../Catalog/Category/Checkboxes/Tree.php | 98 + .../Adminhtml/Block/Catalog/Category/Edit.php | 133 +- .../Block/Catalog/Category/Edit/Form.php | 143 + .../Block/Catalog/Category/Helper/Image.php | 6 + .../Block/Catalog/Category/Tab/Design.php | 6 + .../Block/Catalog/Category/Tab/Feature.php | 6 + .../Block/Catalog/Category/Tab/General.php | 56 +- .../Block/Catalog/Category/Tab/Product.php | 12 +- .../Adminhtml/Block/Catalog/Category/Tabs.php | 6 + .../Adminhtml/Block/Catalog/Category/Tree.php | 154 +- .../Mage/Adminhtml/Block/Catalog/Form.php | 6 + .../Form/Renderer/Fieldset/Element.php | 6 + .../Mage/Adminhtml/Block/Catalog/Product.php | 6 + .../Block/Catalog/Product/Attribute.php | 6 + .../Block/Catalog/Product/Attribute/Edit.php | 6 + .../Catalog/Product/Attribute/Edit/Form.php | 6 + .../Product/Attribute/Edit/Tab/Front.php | 6 + .../Product/Attribute/Edit/Tab/Main.php | 8 +- .../Product/Attribute/Edit/Tab/Options.php | 10 +- .../Product/Attribute/Edit/Tab/System.php | 6 + .../Catalog/Product/Attribute/Edit/Tabs.php | 6 + .../Block/Catalog/Product/Attribute/Grid.php | 6 + .../Attribute/New/Product/Attributes.php | 6 + .../Product/Attribute/New/Product/Created.php | 6 + .../Catalog/Product/Attribute/Set/Grid.php | 6 + .../Catalog/Product/Attribute/Set/Main.php | 6 + .../Attribute/Set/Main/Formattribute.php | 6 + .../Product/Attribute/Set/Main/Formgroup.php | 6 + .../Product/Attribute/Set/Main/Formset.php | 6 + .../Attribute/Set/Main/Tree/Attribute.php | 6 + .../Product/Attribute/Set/Main/Tree/Group.php | 6 + .../Product/Attribute/Set/Toolbar/Add.php | 6 + .../Product/Attribute/Set/Toolbar/Main.php | 6 + .../Attribute/Set/Toolbar/Main/Filter.php | 6 + .../Block/Catalog/Product/Created.php | 6 + .../Adminhtml/Block/Catalog/Product/Edit.php | 6 + .../Catalog/Product/Edit/Action/Attribute.php | 6 + .../Edit/Action/Attribute/Tab/Attributes.php | 6 + .../Edit/Action/Attribute/Tab/Inventory.php | 6 + .../Edit/Action/Attribute/Tab/Websites.php | 6 + .../Product/Edit/Action/Attribute/Tabs.php | 6 + .../Product/Edit/Tab/Ajax/Serializer.php | 6 + .../Block/Catalog/Product/Edit/Tab/Alerts.php | 6 + .../Catalog/Product/Edit/Tab/Alerts/Price.php | 6 + .../Catalog/Product/Edit/Tab/Alerts/Stock.php | 6 + .../Catalog/Product/Edit/Tab/Attributes.php | 6 + .../Product/Edit/Tab/Attributes/Create.php | 6 + .../Catalog/Product/Edit/Tab/Categories.php | 17 +- .../Catalog/Product/Edit/Tab/Crosssell.php | 6 + .../Catalog/Product/Edit/Tab/Inventory.php | 6 + .../Catalog/Product/Edit/Tab/Options.php | 6 + .../Product/Edit/Tab/Options/Option.php | 10 +- .../Edit/Tab/Options/Type/Abstract.php | 6 + .../Product/Edit/Tab/Options/Type/Date.php | 6 + .../Product/Edit/Tab/Options/Type/File.php | 6 + .../Product/Edit/Tab/Options/Type/Select.php | 6 + .../Product/Edit/Tab/Options/Type/Text.php | 6 + .../Block/Catalog/Product/Edit/Tab/Price.php | 6 + .../Catalog/Product/Edit/Tab/Price/Tier.php | 6 + .../Catalog/Product/Edit/Tab/Related.php | 6 + .../Catalog/Product/Edit/Tab/Settings.php | 6 + .../Catalog/Product/Edit/Tab/Super/Config.php | 6 + .../Product/Edit/Tab/Super/Config/Grid.php | 6 + .../Super/Config/Grid/Filter/Inventory.php | 6 + .../Super/Config/Grid/Renderer/Checkbox.php | 6 + .../Super/Config/Grid/Renderer/Inventory.php | 6 + .../Product/Edit/Tab/Super/Config/Simple.php | 10 +- .../Catalog/Product/Edit/Tab/Super/Group.php | 6 + .../Product/Edit/Tab/Super/Settings.php | 6 + .../Block/Catalog/Product/Edit/Tab/Tag.php | 6 + .../Catalog/Product/Edit/Tab/Tag/Customer.php | 6 + .../Block/Catalog/Product/Edit/Tab/Upsell.php | 6 + .../Catalog/Product/Edit/Tab/Websites.php | 6 + .../Block/Catalog/Product/Edit/Tabs.php | 6 + .../Product/Edit/Tabs/Configurable.php | 6 + .../Catalog/Product/Edit/Tabs/Grouped.php | 6 + .../Product/Frontend/Product/Watermark.php | 10 +- .../Adminhtml/Block/Catalog/Product/Grid.php | 6 + .../Catalog/Product/Helper/Form/Apply.php | 6 + .../Catalog/Product/Helper/Form/Boolean.php | 6 + .../Catalog/Product/Helper/Form/Gallery.php | 6 + .../Product/Helper/Form/Gallery/Content.php | 6 + .../Catalog/Product/Helper/Form/Image.php | 6 + .../Catalog/Product/Helper/Form/Price.php | 6 + .../Block/Catalog/Product/Set/Main.php | 6 + .../Catalog/Product/Set/Toolbar/Main.php | 6 + .../Mage/Adminhtml/Block/Catalog/Search.php | 6 + .../Adminhtml/Block/Catalog/Search/Edit.php | 6 + .../Block/Catalog/Search/Edit/Form.php | 10 +- .../Adminhtml/Block/Catalog/Search/Grid.php | 6 + .../Adminhtml/Block/Checkout/Agreement.php | 6 + .../Block/Checkout/Agreement/Edit.php | 6 + .../Block/Checkout/Agreement/Edit/Form.php | 23 +- .../Block/Checkout/Agreement/Grid.php | 6 + .../core/Mage/Adminhtml/Block/Cms/Block.php | 6 + .../Mage/Adminhtml/Block/Cms/Block/Edit.php | 6 + .../Adminhtml/Block/Cms/Block/Edit/Form.php | 10 +- .../Mage/Adminhtml/Block/Cms/Block/Grid.php | 6 + .../core/Mage/Adminhtml/Block/Cms/Page.php | 6 + .../Mage/Adminhtml/Block/Cms/Page/Edit.php | 6 + .../Adminhtml/Block/Cms/Page/Edit/Form.php | 6 + .../Block/Cms/Page/Edit/Tab/Design.php | 24 +- .../Block/Cms/Page/Edit/Tab/Main.php | 12 +- .../Block/Cms/Page/Edit/Tab/Meta.php | 10 +- .../Adminhtml/Block/Cms/Page/Edit/Tabs.php | 6 + .../Mage/Adminhtml/Block/Cms/Page/Grid.php | 13 +- .../Block/Cms/Page/Grid/Renderer/Action.php | 35 + .../core/Mage/Adminhtml/Block/Customer.php | 6 + .../Mage/Adminhtml/Block/Customer/Edit.php | 6 + .../Adminhtml/Block/Customer/Edit/Form.php | 6 + .../Block/Customer/Edit/Renderer/Newpass.php | 10 +- .../Block/Customer/Edit/Renderer/Region.php | 6 + .../Block/Customer/Edit/Tab/Account.php | 6 + .../Block/Customer/Edit/Tab/Addresses.php | 6 + .../Block/Customer/Edit/Tab/Cart.php | 6 + .../Block/Customer/Edit/Tab/Carts.php | 6 + .../Block/Customer/Edit/Tab/Newsletter.php | 6 + .../Customer/Edit/Tab/Newsletter/Grid.php | 6 + .../Tab/Newsletter/Grid/Filter/Status.php | 6 + .../Tab/Newsletter/Grid/Renderer/Action.php | 6 + .../Tab/Newsletter/Grid/Renderer/Status.php | 6 + .../Block/Customer/Edit/Tab/Orders.php | 6 + .../Block/Customer/Edit/Tab/Reviews.php | 6 + .../Adminhtml/Block/Customer/Edit/Tab/Tag.php | 6 + .../Block/Customer/Edit/Tab/Tags.php | 6 + .../Block/Customer/Edit/Tab/View.php | 6 + .../Block/Customer/Edit/Tab/View/Cart.php | 6 + .../Block/Customer/Edit/Tab/View/Orders.php | 6 + .../Block/Customer/Edit/Tab/View/Sales.php | 6 + .../Block/Customer/Edit/Tab/View/Wishlist.php | 6 + .../Block/Customer/Edit/Tab/Wishlist.php | 6 + .../Wishlist/Grid/Renderer/Description.php | 6 + .../Adminhtml/Block/Customer/Edit/Tabs.php | 6 + .../Mage/Adminhtml/Block/Customer/Grid.php | 6 + .../Block/Customer/Grid/Filter/Country.php | 6 + .../Mage/Adminhtml/Block/Customer/Group.php | 6 + .../Adminhtml/Block/Customer/Group/Edit.php | 6 + .../Block/Customer/Group/Edit/Form.php | 6 + .../Adminhtml/Block/Customer/Group/Grid.php | 6 + .../Mage/Adminhtml/Block/Customer/Online.php | 6 + .../Block/Customer/Online/Filter.php | 6 + .../Adminhtml/Block/Customer/Online/Grid.php | 6 + .../Customer/Online/Grid/Renderer/Ip.php | 6 + .../Customer/Online/Grid/Renderer/Type.php | 6 + .../Customer/Online/Grid/Renderer/Url.php | 6 + .../core/Mage/Adminhtml/Block/Dashboard.php | 6 + .../Adminhtml/Block/Dashboard/Abstract.php | 6 + .../Mage/Adminhtml/Block/Dashboard/Bar.php | 6 + .../Adminhtml/Block/Dashboard/Diagrams.php | 6 + .../Mage/Adminhtml/Block/Dashboard/Graph.php | 6 + .../Mage/Adminhtml/Block/Dashboard/Grid.php | 6 + .../Mage/Adminhtml/Block/Dashboard/Grids.php | 6 + .../Adminhtml/Block/Dashboard/Orders/Grid.php | 6 + .../Mage/Adminhtml/Block/Dashboard/Sales.php | 6 + .../Block/Dashboard/Searches/Last.php | 6 + .../Searches/Renderer/Searchquery.php | 6 + .../Block/Dashboard/Searches/Top.php | 6 + .../Adminhtml/Block/Dashboard/Tab/Amounts.php | 6 + .../Block/Dashboard/Tab/Customers/Most.php | 6 + .../Block/Dashboard/Tab/Customers/Newest.php | 6 + .../Adminhtml/Block/Dashboard/Tab/Orders.php | 6 + .../Block/Dashboard/Tab/Products/Ordered.php | 6 + .../Block/Dashboard/Tab/Products/Viewed.php | 6 + .../Mage/Adminhtml/Block/Dashboard/Totals.php | 6 + .../Block/Extensions/Config/Edit.php | 6 + .../Block/Extensions/Config/Form.php | 6 + .../Block/Extensions/Console/Edit.php | 6 + .../Block/Extensions/Console/Edit/Form.php | 6 + .../Block/Extensions/Custom/Edit.php | 14 +- .../Block/Extensions/Custom/Edit/Form.php | 6 + .../Extensions/Custom/Edit/Tab/Abstract.php | 6 + .../Extensions/Custom/Edit/Tab/Contents.php | 6 + .../Extensions/Custom/Edit/Tab/Depends.php | 6 + .../Block/Extensions/Custom/Edit/Tab/Grid.php | 76 + .../Custom/Edit/Tab/Load.php} | 39 +- .../Custom/Edit/Tab/Maintainers.php | 6 + .../Extensions/Custom/Edit/Tab/Package.php | 19 + .../Extensions/Custom/Edit/Tab/Release.php | 6 + .../Block/Extensions/Custom/Edit/Tabs.php | 12 + .../Adminhtml/Block/Extensions/File/Form.php | 6 + .../Mage/Adminhtml/Block/Extensions/Local.php | 6 + .../Adminhtml/Block/Extensions/Local/Edit.php | 6 + .../Block/Extensions/Local/Edit/Form.php | 6 + .../Extensions/Local/Edit/Tab/Abstract.php | 6 + .../Extensions/Local/Edit/Tab/Actions.php | 6 + .../Extensions/Local/Edit/Tab/Changelog.php | 6 + .../Extensions/Local/Edit/Tab/Contents.php | 6 + .../Extensions/Local/Edit/Tab/Depends.php | 6 + .../Extensions/Local/Edit/Tab/Package.php | 6 + .../Block/Extensions/Local/Edit/Tabs.php | 6 + .../Adminhtml/Block/Extensions/Local/Grid.php | 6 + .../Extensions/Local/Grid/Renderer/Action.php | 6 + .../Block/Extensions/Local/Upgrade.php | 6 + .../Block/Extensions/Mass/Install.php | 6 + .../Block/Extensions/Mass/Uninstall.php | 6 + .../Block/Extensions/Mass/Upgrade.php | 6 + .../Adminhtml/Block/Extensions/Remote.php | 6 + .../Block/Extensions/Remote/Edit.php | 6 + .../Block/Extensions/Remote/Edit/Form.php | 6 + .../Extensions/Remote/Edit/Tab/Abstract.php | 6 + .../Extensions/Remote/Edit/Tab/Actions.php | 6 + .../Extensions/Remote/Edit/Tab/Changelog.php | 6 + .../Extensions/Remote/Edit/Tab/Package.php | 6 + .../Block/Extensions/Remote/Edit/Tabs.php | 6 + .../Block/Extensions/Remote/Grid.php | 6 + .../Remote/Grid/Renderer/Action.php | 6 + .../core/Mage/Adminhtml/Block/Html/Date.php | 6 + .../core/Mage/Adminhtml/Block/Html/Select.php | 6 + .../Mage/Adminhtml/Block/Media/Editor.php | 6 + .../Mage/Adminhtml/Block/Media/Uploader.php | 6 + .../core/Mage/Adminhtml/Block/Messages.php | 6 + .../Adminhtml/Block/Newsletter/Problem.php | 6 + .../Block/Newsletter/Problem/Grid.php | 6 + .../Problem/Grid/Filter/Checkbox.php | 6 + .../Problem/Grid/Renderer/Checkbox.php | 6 + .../Mage/Adminhtml/Block/Newsletter/Queue.php | 6 + .../Adminhtml/Block/Newsletter/Queue/Edit.php | 6 + .../Block/Newsletter/Queue/Edit/Form.php | 6 + .../Adminhtml/Block/Newsletter/Queue/Grid.php | 6 + .../Newsletter/Queue/Grid/Renderer/Action.php | 6 + .../Adminhtml/Block/Newsletter/Subscriber.php | 6 + .../Block/Newsletter/Subscriber/Grid.php | 6 + .../Subscriber/Grid/Filter/Checkbox.php | 6 + .../Subscriber/Grid/Filter/Website.php | 6 + .../Subscriber/Grid/Renderer/Checkbox.php | 6 + .../Subscriber/Grid/Renderer/Website.php | 6 + .../Adminhtml/Block/Newsletter/Template.php | 6 + .../Block/Newsletter/Template/Edit.php | 6 + .../Block/Newsletter/Template/Edit/Form.php | 10 +- .../Block/Newsletter/Template/Grid.php | 6 + .../Template/Grid/Renderer/Action.php | 6 + .../Template/Grid/Renderer/Sender.php | 6 + .../Block/Newsletter/Template/Preview.php | 6 + .../Adminhtml/Block/Notification/Grid.php | 6 + .../Notification/Grid/Renderer/Actions.php | 6 + .../Notification/Grid/Renderer/Notice.php | 6 + .../Notification/Grid/Renderer/Severity.php | 6 + .../Adminhtml/Block/Notification/Inbox.php | 6 + .../Adminhtml/Block/Notification/Toolbar.php | 6 + .../Adminhtml/Block/Notification/Window.php | 6 + app/code/core/Mage/Adminhtml/Block/Page.php | 6 + .../core/Mage/Adminhtml/Block/Page/Footer.php | 6 + .../core/Mage/Adminhtml/Block/Page/Head.php | 6 + .../core/Mage/Adminhtml/Block/Page/Header.php | 6 + .../core/Mage/Adminhtml/Block/Page/Menu.php | 6 + .../Adminhtml/Block/Permissions/Buttons.php | 6 + .../Adminhtml/Block/Permissions/Editroles.php | 6 + .../Adminhtml/Block/Permissions/Edituser.php | 6 + .../Adminhtml/Block/Permissions/Grid/Role.php | 6 + .../Adminhtml/Block/Permissions/Grid/User.php | 6 + .../Mage/Adminhtml/Block/Permissions/Role.php | 6 + .../Block/Permissions/Role/Grid/User.php | 6 + .../Adminhtml/Block/Permissions/Roles.php | 6 + .../Block/Permissions/Tab/Roleinfo.php | 6 + .../Block/Permissions/Tab/Rolesedit.php | 6 + .../Block/Permissions/Tab/Rolesusers.php | 6 + .../Block/Permissions/Tab/Useredit.php | 6 + .../Block/Permissions/Tab/Userroles.php | 6 + .../Mage/Adminhtml/Block/Permissions/User.php | 6 + .../Adminhtml/Block/Permissions/User/Edit.php | 6 + .../Block/Permissions/User/Edit/Form.php | 6 + .../Block/Permissions/User/Edit/Tab/Main.php | 6 + .../Block/Permissions/User/Edit/Tab/Roles.php | 6 + .../Block/Permissions/User/Edit/Tabs.php | 6 + .../Adminhtml/Block/Permissions/User/Grid.php | 6 + .../Block/Permissions/Usernroles.php | 6 + .../Adminhtml/Block/Permissions/Users.php | 6 + .../Mage/Adminhtml/Block/Poll/Answer/Edit.php | 6 + .../Adminhtml/Block/Poll/Answer/Edit/Form.php | 6 + .../core/Mage/Adminhtml/Block/Poll/Edit.php | 6 + .../Mage/Adminhtml/Block/Poll/Edit/Form.php | 6 + .../Adminhtml/Block/Poll/Edit/Tab/Answers.php | 6 + .../Block/Poll/Edit/Tab/Answers/Form.php | 6 + .../Block/Poll/Edit/Tab/Answers/Grid.php | 6 + .../Block/Poll/Edit/Tab/Answers/List.php | 6 + .../Adminhtml/Block/Poll/Edit/Tab/Form.php | 6 + .../Mage/Adminhtml/Block/Poll/Edit/Tabs.php | 6 + .../core/Mage/Adminhtml/Block/Poll/Grid.php | 10 +- .../core/Mage/Adminhtml/Block/Poll/Poll.php | 6 + .../Mage/Adminhtml/Block/Promo/Catalog.php | 6 + .../Adminhtml/Block/Promo/Catalog/Edit.php | 6 + .../Block/Promo/Catalog/Edit/Form.php | 6 + .../Block/Promo/Catalog/Edit/Tab/Actions.php | 6 + .../Promo/Catalog/Edit/Tab/Conditions.php | 6 + .../Block/Promo/Catalog/Edit/Tab/Main.php | 6 + .../Block/Promo/Catalog/Edit/Tabs.php | 6 + .../Adminhtml/Block/Promo/Catalog/Grid.php | 6 + .../core/Mage/Adminhtml/Block/Promo/Quote.php | 6 + .../Mage/Adminhtml/Block/Promo/Quote/Edit.php | 6 + .../Adminhtml/Block/Promo/Quote/Edit/Form.php | 6 + .../Block/Promo/Quote/Edit/Tab/Actions.php | 6 + .../Block/Promo/Quote/Edit/Tab/Conditions.php | 6 + .../Block/Promo/Quote/Edit/Tab/Main.php | 6 + .../Adminhtml/Block/Promo/Quote/Edit/Tabs.php | 6 + .../Mage/Adminhtml/Block/Promo/Quote/Grid.php | 6 + .../Block/Promo/Widget/Chooser/Sku.php | 6 + .../core/Mage/Adminhtml/Block/Rating/Edit.php | 6 + .../Mage/Adminhtml/Block/Rating/Edit/Form.php | 6 + .../Adminhtml/Block/Rating/Edit/Tab/Form.php | 6 + .../Block/Rating/Edit/Tab/Options.php | 6 + .../Mage/Adminhtml/Block/Rating/Edit/Tabs.php | 6 + .../core/Mage/Adminhtml/Block/Rating/Grid.php | 6 + .../Mage/Adminhtml/Block/Rating/Rating.php | 6 + .../Block/Report/Customer/Accounts.php | 6 + .../Block/Report/Customer/Accounts/Grid.php | 6 + .../Block/Report/Customer/Orders.php | 6 + .../Block/Report/Customer/Orders/Grid.php | 6 + .../Block/Report/Customer/Totals.php | 6 + .../Block/Report/Customer/Totals/Grid.php | 6 + .../core/Mage/Adminhtml/Block/Report/Grid.php | 6 + .../Report/Grid/Column/Renderer/Currency.php | 6 + .../Report/Grid/Column/Renderer/Customer.php | 6 + .../Report/Grid/Column/Renderer/Product.php | 6 + .../Mage/Adminhtml/Block/Report/Product.php | 6 + .../Adminhtml/Block/Report/Product/Grid.php | 6 + .../Block/Report/Product/Lowstock.php | 6 + .../Block/Report/Product/Lowstock/Grid.php | 6 + .../Block/Report/Product/Ordered.php | 6 + .../Block/Report/Product/Ordered/Grid.php | 6 + .../Adminhtml/Block/Report/Product/Viewed.php | 6 + .../Block/Report/Product/Viewed/Grid.php | 6 + .../Block/Report/Review/Customer.php | 6 + .../Block/Report/Review/Customer/Grid.php | 6 + .../Adminhtml/Block/Report/Review/Detail.php | 6 + .../Block/Report/Review/Detail/Grid.php | 6 + .../Adminhtml/Block/Report/Review/Product.php | 6 + .../Block/Report/Review/Product/Grid.php | 15 +- .../Adminhtml/Block/Report/Sales/Coupons.php | 6 + .../Block/Report/Sales/Coupons/Grid.php | 6 + .../Adminhtml/Block/Report/Sales/Invoiced.php | 6 + .../Block/Report/Sales/Invoiced/Grid.php | 6 + .../Adminhtml/Block/Report/Sales/Refunded.php | 6 + .../Block/Report/Sales/Refunded/Grid.php | 8 +- .../Adminhtml/Block/Report/Sales/Sales.php | 6 + .../Block/Report/Sales/Sales/Grid.php | 6 + .../Adminhtml/Block/Report/Sales/Shipping.php | 6 + .../Block/Report/Sales/Shipping/Grid.php | 6 + .../Mage/Adminhtml/Block/Report/Sales/Tax.php | 6 + .../Adminhtml/Block/Report/Sales/Tax/Grid.php | 6 + .../Mage/Adminhtml/Block/Report/Search.php | 6 + .../Adminhtml/Block/Report/Search/Grid.php | 6 + .../Block/Report/Shopcart/Abandoned.php | 6 + .../Block/Report/Shopcart/Abandoned/Grid.php | 6 + .../Block/Report/Shopcart/Customer.php | 6 + .../Block/Report/Shopcart/Customer/Grid.php | 6 + .../Block/Report/Shopcart/Product.php | 6 + .../Block/Report/Shopcart/Product/Grid.php | 6 + .../Adminhtml/Block/Report/Tag/Customer.php | 6 + .../Block/Report/Tag/Customer/Detail.php | 6 + .../Block/Report/Tag/Customer/Detail/Grid.php | 6 + .../Block/Report/Tag/Customer/Grid.php | 6 + .../Adminhtml/Block/Report/Tag/Popular.php | 6 + .../Block/Report/Tag/Popular/Detail.php | 6 + .../Block/Report/Tag/Popular/Detail/Grid.php | 6 + .../Block/Report/Tag/Popular/Grid.php | 6 + .../Adminhtml/Block/Report/Tag/Product.php | 6 + .../Block/Report/Tag/Product/Detail.php | 6 + .../Block/Report/Tag/Product/Detail/Grid.php | 6 + .../Block/Report/Tag/Product/Grid.php | 6 + .../Mage/Adminhtml/Block/Report/Wishlist.php | 6 + .../Adminhtml/Block/Report/Wishlist/Grid.php | 6 + .../core/Mage/Adminhtml/Block/Review/Add.php | 6 + .../Mage/Adminhtml/Block/Review/Add/Form.php | 6 + .../core/Mage/Adminhtml/Block/Review/Edit.php | 6 + .../Mage/Adminhtml/Block/Review/Edit/Form.php | 6 + .../core/Mage/Adminhtml/Block/Review/Grid.php | 6 + .../Block/Review/Grid/Filter/Type.php | 6 + .../Block/Review/Grid/Renderer/Type.php | 6 + .../core/Mage/Adminhtml/Block/Review/Main.php | 18 +- .../Adminhtml/Block/Review/Product/Grid.php | 6 + .../Block/Review/Rating/Detailed.php | 6 + .../Adminhtml/Block/Review/Rating/Summary.php | 6 + app/code/core/Mage/Adminhtml/Block/Sales.php | 6 + .../Mage/Adminhtml/Block/Sales/Creditmemo.php | 6 + .../Adminhtml/Block/Sales/Creditmemo/Grid.php | 6 + .../Mage/Adminhtml/Block/Sales/Invoice.php | 6 + .../Adminhtml/Block/Sales/Invoice/Grid.php | 6 + .../Adminhtml/Block/Sales/Items/Abstract.php | 37 +- .../Block/Sales/Items/Column/Default.php | 15 + .../Block/Sales/Items/Column/Name.php | 6 + .../Block/Sales/Items/Column/Qty.php | 6 + .../Sales/Items/Renderer/Configurable.php | 42 + .../Block/Sales/Items/Renderer/Default.php | 6 + .../core/Mage/Adminhtml/Block/Sales/Order.php | 6 + .../Adminhtml/Block/Sales/Order/Abstract.php | 6 + .../Block/Sales/Order/Comments/View.php | 6 + .../Adminhtml/Block/Sales/Order/Create.php | 6 + .../Block/Sales/Order/Create/Abstract.php | 6 + .../Sales/Order/Create/Billing/Address.php | 6 + .../Sales/Order/Create/Billing/Method.php | 6 + .../Order/Create/Billing/Method/Form.php | 6 + .../Block/Sales/Order/Create/Comment.php | 6 + .../Block/Sales/Order/Create/Coupons.php | 6 + .../Block/Sales/Order/Create/Coupons/Form.php | 6 + .../Block/Sales/Order/Create/Customer.php | 6 + .../Sales/Order/Create/Customer/Grid.php | 6 + .../Block/Sales/Order/Create/Data.php | 6 + .../Block/Sales/Order/Create/Form.php | 6 + .../Block/Sales/Order/Create/Form/Account.php | 6 + .../Block/Sales/Order/Create/Form/Address.php | 6 + .../Block/Sales/Order/Create/Giftmessage.php | 6 + .../Sales/Order/Create/Giftmessage/Form.php | 8 + .../Block/Sales/Order/Create/Header.php | 6 + .../Block/Sales/Order/Create/Items.php | 6 + .../Block/Sales/Order/Create/Items/Grid.php | 6 + .../Block/Sales/Order/Create/Messages.php | 6 + .../Block/Sales/Order/Create/Newsletter.php | 6 + .../Sales/Order/Create/Newsletter/Form.php | 6 + .../Block/Sales/Order/Create/Search.php | 6 + .../Block/Sales/Order/Create/Search/Grid.php | 17 +- .../Search/Grid/Renderer/Giftmessage.php | 6 + .../Sales/Order/Create/Shipping/Address.php | 6 + .../Sales/Order/Create/Shipping/Method.php | 6 + .../Order/Create/Shipping/Method/Form.php | 6 + .../Block/Sales/Order/Create/Sidebar.php | 6 + .../Sales/Order/Create/Sidebar/Abstract.php | 6 + .../Block/Sales/Order/Create/Sidebar/Cart.php | 6 + .../Sales/Order/Create/Sidebar/Compared.php | 6 + .../Sales/Order/Create/Sidebar/Pcompared.php | 6 + .../Sales/Order/Create/Sidebar/Pviewed.php | 6 + .../Sales/Order/Create/Sidebar/Reorder.php | 6 + .../Sales/Order/Create/Sidebar/Viewed.php | 6 + .../Sales/Order/Create/Sidebar/Wishlist.php | 6 + .../Block/Sales/Order/Create/Store.php | 6 + .../Block/Sales/Order/Create/Store/Select.php | 6 + .../Block/Sales/Order/Create/Totals.php | 6 + .../Sales/Order/Create/Totals/Default.php | 6 + .../Block/Sales/Order/Create/Totals/Table.php | 6 + .../Block/Sales/Order/Create/Totals/Tax.php | 6 + .../Block/Sales/Order/Creditmemo/Create.php | 6 + .../Sales/Order/Creditmemo/Create/Form.php | 6 + .../Sales/Order/Creditmemo/Create/Items.php | 18 +- .../Block/Sales/Order/Creditmemo/View.php | 6 + .../Sales/Order/Creditmemo/View/Comments.php | 6 + .../Sales/Order/Creditmemo/View/Form.php | 6 + .../Sales/Order/Creditmemo/View/Items.php | 6 + .../Mage/Adminhtml/Block/Sales/Order/Grid.php | 8 +- .../Block/Sales/Order/Invoice/Create.php | 6 + .../Block/Sales/Order/Invoice/Create/Form.php | 14 + .../Sales/Order/Invoice/Create/Items.php | 6 + .../Sales/Order/Invoice/Create/Tracking.php | 6 + .../Block/Sales/Order/Invoice/View.php | 6 + .../Sales/Order/Invoice/View/Comments.php | 6 + .../Block/Sales/Order/Invoice/View/Form.php | 6 + .../Block/Sales/Order/Invoice/View/Items.php | 6 + .../Adminhtml/Block/Sales/Order/Payment.php | 6 + .../Block/Sales/Order/Shipment/Create.php | 6 + .../Sales/Order/Shipment/Create/Form.php | 6 + .../Sales/Order/Shipment/Create/Items.php | 32 + .../Sales/Order/Shipment/Create/Tracking.php | 6 + .../Sales/Order/Shipment/Tracking/Info.php | 6 + .../Block/Sales/Order/Shipment/View.php | 6 + .../Sales/Order/Shipment/View/Comments.php | 6 + .../Block/Sales/Order/Shipment/View/Form.php | 6 + .../Block/Sales/Order/Shipment/View/Items.php | 6 + .../Sales/Order/Shipment/View/Tracking.php | 6 + .../Adminhtml/Block/Sales/Order/Totalbar.php | 6 + .../Adminhtml/Block/Sales/Order/Totals.php | 6 + .../Block/Sales/Order/Totals/Tax.php | 6 + .../Mage/Adminhtml/Block/Sales/Order/View.php | 6 + .../Adminhtml/Block/Sales/Order/View/Form.php | 6 + .../Block/Sales/Order/View/Giftmessage.php | 6 + .../Block/Sales/Order/View/History.php | 6 + .../Adminhtml/Block/Sales/Order/View/Info.php | 6 + .../Block/Sales/Order/View/Items.php | 6 + .../Order/View/Items/Renderer/Default.php | 6 + .../Block/Sales/Order/View/Messages.php | 6 + .../Sales/Order/View/Tab/Creditmemos.php | 6 + .../Block/Sales/Order/View/Tab/History.php | 21 + .../Block/Sales/Order/View/Tab/Info.php | 6 + .../Block/Sales/Order/View/Tab/Invoices.php | 6 + .../Block/Sales/Order/View/Tab/Shipments.php | 6 + .../Adminhtml/Block/Sales/Order/View/Tabs.php | 6 + .../Block/Sales/Reorder/Renderer/Action.php | 6 + .../Mage/Adminhtml/Block/Sales/Shipment.php | 6 + .../Adminhtml/Block/Sales/Shipment/Grid.php | 6 + .../core/Mage/Adminhtml/Block/Sitemap.php | 6 + .../Mage/Adminhtml/Block/Sitemap/Edit.php | 6 + .../Adminhtml/Block/Sitemap/Edit/Form.php | 8 +- .../Mage/Adminhtml/Block/Sitemap/Grid.php | 6 + .../Block/Sitemap/Grid/Renderer/Link.php | 6 + .../Block/Sitemap/Grid/Renderer/Time.php | 6 + .../Mage/Adminhtml/Block/Store/Switcher.php | 7 + .../Adminhtml/Block/System/Account/Edit.php | 6 + .../Block/System/Account/Edit/Form.php | 6 + .../Adminhtml/Block/System/Cache/Edit.php | 59 +- .../Adminhtml/Block/System/Cache/Form.php | 22 +- .../Adminhtml/Block/System/Config/Dwstree.php | 6 + .../Adminhtml/Block/System/Config/Edit.php | 6 + .../Adminhtml/Block/System/Config/Form.php | 6 + .../Block/System/Config/Form/Field.php | 17 +- .../Config/Form/Field/Array/Abstract.php | 13 +- .../System/Config/Form/Field/Datetime.php | 6 + .../Block/System/Config/Form/Field/Export.php | 6 + .../Block/System/Config/Form/Field/Image.php | 6 + .../Block/System/Config/Form/Field/Import.php | 10 +- .../System/Config/Form/Field/Notification.php | 43 + .../Config/Form/Field/Regexceptions.php | 10 +- .../Form/Field/Select/Allowspecific.php | 6 + .../Block/System/Config/Form/Fieldset.php | 12 +- .../Form/Fieldset/Modules/DisableOutput.php | 6 + .../Config/Form/Fieldset/Order/Statuses.php | 6 + .../Adminhtml/Block/System/Config/Tabs.php | 8 +- .../Adminhtml/Block/System/Convert/Gui.php | 6 + .../Block/System/Convert/Gui/Edit.php | 6 + .../Block/System/Convert/Gui/Edit/Form.php | 8 +- .../System/Convert/Gui/Edit/Tab/Upload.php | 6 + .../System/Convert/Gui/Edit/Tab/View.php | 6 + .../System/Convert/Gui/Edit/Tab/Wizard.php | 6 + .../Block/System/Convert/Gui/Edit/Tabs.php | 6 + .../Block/System/Convert/Gui/Grid.php | 6 + .../Block/System/Convert/Profile.php | 6 + .../Block/System/Convert/Profile/Edit.php | 6 + .../Convert/Profile/Edit/Filter/Action.php | 8 +- .../System/Convert/Profile/Edit/Form.php | 6 + .../Convert/Profile/Edit/Renderer/Action.php | 6 + .../System/Convert/Profile/Edit/Tab/Edit.php | 6 + .../Convert/Profile/Edit/Tab/History.php | 6 + .../System/Convert/Profile/Edit/Tab/Run.php | 6 + .../System/Convert/Profile/Edit/Tabs.php | 6 + .../Block/System/Convert/Profile/Grid.php | 6 + .../Block/System/Convert/Profile/Run.php | 28 +- .../Mage/Adminhtml/Block/System/Currency.php | 6 + .../Block/System/Currency/Edit/Form.php | 6 + .../Block/System/Currency/Edit/Tab/Main.php | 6 + .../Block/System/Currency/Edit/Tab/Rates.php | 6 + .../Block/System/Currency/Edit/Tabs.php | 6 + .../Block/System/Currency/Rate/Matrix.php | 6 + .../Mage/Adminhtml/Block/System/Design.php | 6 + .../Adminhtml/Block/System/Design/Edit.php | 6 + .../Block/System/Design/Edit/Tab/General.php | 6 + .../Block/System/Design/Edit/Tabs.php | 6 + .../Adminhtml/Block/System/Design/Grid.php | 6 + .../Adminhtml/Block/System/Email/Template.php | 6 + .../Block/System/Email/Template/Edit.php | 6 + .../Block/System/Email/Template/Edit/Form.php | 6 + .../Block/System/Email/Template/Grid.php | 6 + .../Email/Template/Grid/Filter/Type.php | 6 + .../Email/Template/Grid/Renderer/Action.php | 6 + .../Email/Template/Grid/Renderer/Sender.php | 6 + .../Email/Template/Grid/Renderer/Type.php | 6 + .../Block/System/Email/Template/Preview.php | 6 + .../Block/System/Store/Delete/Group.php | 6 + .../Block/System/Store/Delete/Store.php | 6 + .../Block/System/Store/Delete/Website.php | 6 + .../Adminhtml/Block/System/Store/Edit.php | 6 + .../Block/System/Store/Edit/Form.php | 8 +- .../Adminhtml/Block/System/Store/Grid.php | 12 +- .../Block/System/Store/Grid/Render/Group.php | 6 + .../Block/System/Store/Grid/Render/Store.php | 6 + .../System/Store/Grid/Render/Website.php | 6 + .../Adminhtml/Block/System/Store/Store.php | 6 + app/code/core/Mage/Adminhtml/Block/Tag.php | 6 + .../Mage/Adminhtml/Block/Tag/Customer.php | 6 + .../Adminhtml/Block/Tag/Customer/Grid.php | 6 + .../core/Mage/Adminhtml/Block/Tag/Edit.php | 6 + .../Mage/Adminhtml/Block/Tag/Edit/Form.php | 6 + .../Mage/Adminhtml/Block/Tag/Grid/All.php | 6 + .../Adminhtml/Block/Tag/Grid/Customers.php | 6 + .../Mage/Adminhtml/Block/Tag/Grid/Pending.php | 6 + .../Adminhtml/Block/Tag/Grid/Products.php | 6 + .../core/Mage/Adminhtml/Block/Tag/Pending.php | 6 + .../core/Mage/Adminhtml/Block/Tag/Product.php | 6 + .../Mage/Adminhtml/Block/Tag/Product/Grid.php | 6 + .../core/Mage/Adminhtml/Block/Tag/Tag.php | 6 + .../Mage/Adminhtml/Block/Tag/Tag/Edit.php | 6 + .../Adminhtml/Block/Tag/Tag/Edit/Form.php | 6 + .../Mage/Adminhtml/Block/Tag/Tag/Grid.php | 6 + .../core/Mage/Adminhtml/Block/Tax/Class.php | 6 + .../Mage/Adminhtml/Block/Tax/Class/Edit.php | 6 + .../Adminhtml/Block/Tax/Class/Edit/Form.php | 8 +- .../Mage/Adminhtml/Block/Tax/Class/Grid.php | 6 + .../Mage/Adminhtml/Block/Tax/Rate/Form.php | 6 + .../Mage/Adminhtml/Block/Tax/Rate/Grid.php | 8 +- .../Block/Tax/Rate/Grid/Renderer/Data.php | 6 + .../Adminhtml/Block/Tax/Rate/ImportExport.php | 6 + .../Mage/Adminhtml/Block/Tax/Rate/Title.php | 6 + .../Block/Tax/Rate/Title/Fieldset.php | 6 + .../Adminhtml/Block/Tax/Rate/Toolbar/Add.php | 6 + .../Adminhtml/Block/Tax/Rate/Toolbar/Save.php | 6 + .../core/Mage/Adminhtml/Block/Tax/Rule.php | 6 + .../Mage/Adminhtml/Block/Tax/Rule/Edit.php | 6 + .../Adminhtml/Block/Tax/Rule/Edit/Form.php | 6 + .../Mage/Adminhtml/Block/Tax/Rule/Grid.php | 6 + .../core/Mage/Adminhtml/Block/Template.php | 6 + .../core/Mage/Adminhtml/Block/Text/List.php | 6 + .../core/Mage/Adminhtml/Block/Urlrewrite.php | 6 + .../Mage/Adminhtml/Block/Urlrewrite/Add.php | 30 +- .../Adminhtml/Block/Urlrewrite/Add/Form.php | 12 +- .../Block/Urlrewrite/Category/Tree.php | 6 + .../Mage/Adminhtml/Block/Urlrewrite/Edit.php | 6 + .../Adminhtml/Block/Urlrewrite/Edit/Form.php | 6 + .../Mage/Adminhtml/Block/Urlrewrite/Grid.php | 6 + .../Block/Urlrewrite/Product/Grid.php | 21 +- app/code/core/Mage/Adminhtml/Block/Widget.php | 6 + .../Mage/Adminhtml/Block/Widget/Accordion.php | 6 + .../Adminhtml/Block/Widget/Accordion/Item.php | 8 +- .../Adminhtml/Block/Widget/Breadcrumbs.php | 6 + .../Mage/Adminhtml/Block/Widget/Button.php | 6 + .../Mage/Adminhtml/Block/Widget/Container.php | 6 + .../core/Mage/Adminhtml/Block/Widget/Form.php | 10 +- .../Adminhtml/Block/Widget/Form/Container.php | 6 + .../Adminhtml/Block/Widget/Form/Element.php | 6 + .../Block/Widget/Form/Element/Gallery.php | 6 + .../Block/Widget/Form/Renderer/Element.php | 6 + .../Block/Widget/Form/Renderer/Fieldset.php | 6 + .../Widget/Form/Renderer/Fieldset/Element.php | 6 + .../core/Mage/Adminhtml/Block/Widget/Grid.php | 6 + .../Adminhtml/Block/Widget/Grid/Block.php | 6 + .../Adminhtml/Block/Widget/Grid/Column.php | 10 +- .../Widget/Grid/Column/Filter/Abstract.php | 6 + .../Widget/Grid/Column/Filter/Checkbox.php | 6 + .../Widget/Grid/Column/Filter/Country.php | 6 + .../Block/Widget/Grid/Column/Filter/Date.php | 6 + .../Widget/Grid/Column/Filter/Datetime.php | 6 + .../Widget/Grid/Column/Filter/Interface.php | 6 + .../Widget/Grid/Column/Filter/Massaction.php | 6 + .../Block/Widget/Grid/Column/Filter/Price.php | 8 +- .../Block/Widget/Grid/Column/Filter/Radio.php | 6 + .../Block/Widget/Grid/Column/Filter/Range.php | 6 + .../Widget/Grid/Column/Filter/Select.php | 8 +- .../Block/Widget/Grid/Column/Filter/Store.php | 12 +- .../Block/Widget/Grid/Column/Filter/Text.php | 8 +- .../Widget/Grid/Column/Renderer/Abstract.php | 39 +- .../Widget/Grid/Column/Renderer/Action.php | 6 + .../Widget/Grid/Column/Renderer/Checkbox.php | 16 +- .../Widget/Grid/Column/Renderer/Concat.php | 6 + .../Widget/Grid/Column/Renderer/Country.php | 6 + .../Widget/Grid/Column/Renderer/Currency.php | 17 +- .../Widget/Grid/Column/Renderer/Date.php | 14 +- .../Widget/Grid/Column/Renderer/Datetime.php | 6 + .../Widget/Grid/Column/Renderer/Input.php | 6 + .../Widget/Grid/Column/Renderer/Interface.php | 6 + .../Widget/Grid/Column/Renderer/Longtext.php | 6 + .../Grid/Column/Renderer/Massaction.php | 11 +- .../Widget/Grid/Column/Renderer/Number.php | 16 +- .../Widget/Grid/Column/Renderer/Options.php | 6 + .../Widget/Grid/Column/Renderer/Price.php | 16 +- .../Widget/Grid/Column/Renderer/Radio.php | 16 +- .../Widget/Grid/Column/Renderer/Select.php | 8 +- .../Widget/Grid/Column/Renderer/Store.php | 6 + .../Widget/Grid/Column/Renderer/Text.php | 6 + .../Widget/Grid/Column/Renderer/Wrapline.php | 6 + .../Adminhtml/Block/Widget/Grid/Container.php | 6 + .../Block/Widget/Grid/Massaction.php | 6 + .../Block/Widget/Grid/Massaction/Abstract.php | 6 + .../Block/Widget/Grid/Massaction/Item.php | 6 + .../Massaction/Item/Additional/Default.php | 6 + .../Massaction/Item/Additional/Interface.php | 6 + .../Adminhtml/Block/Widget/Tab/Interface.php | 6 + .../core/Mage/Adminhtml/Block/Widget/Tabs.php | 26 + .../core/Mage/Adminhtml/Block/Widget/Tree.php | 6 + .../Adminhtml/Block/Widget/View/Container.php | 6 + .../core/Mage/Adminhtml/Controller/Action.php | 6 + .../Adminhtml/Controller/Sales/Creditmemo.php | 6 + .../Adminhtml/Controller/Sales/Invoice.php | 6 + .../Adminhtml/Controller/Sales/Shipment.php | 6 + app/code/core/Mage/Adminhtml/Exception.php | 6 + .../Catalog/Product/Edit/Action/Attribute.php | 6 + .../Adminhtml/Helper/Dashboard/Abstract.php | 6 + .../Mage/Adminhtml/Helper/Dashboard/Data.php | 6 + .../Mage/Adminhtml/Helper/Dashboard/Order.php | 6 + .../Adminhtml/Helper/Dashboard/Product.php | 6 + .../Adminhtml/Helper/Dashboard/Visitor.php | 6 + app/code/core/Mage/Adminhtml/Helper/Data.php | 6 + app/code/core/Mage/Adminhtml/Helper/Js.php | 6 + .../core/Mage/Adminhtml/Helper/Media/Js.php | 6 + app/code/core/Mage/Adminhtml/Model/Config.php | 6 + .../core/Mage/Adminhtml/Model/Config/Data.php | 6 + .../Model/Customer/Renderer/Region.php | 17 +- .../core/Mage/Adminhtml/Model/Extension.php | 17 +- .../Adminhtml/Model/Extension/Collection.php | 23 + .../Model/Extension/Collection/Abstract.php | 6 + .../Mage/Adminhtml/Model/Giftmessage/Save.php | 6 + .../Model/Newsletter/Renderer/Text.php | 6 + .../core/Mage/Adminhtml/Model/Observer.php | 6 + .../core/Mage/Adminhtml/Model/Sales/Order.php | 6 + .../Adminhtml/Model/Sales/Order/Create.php | 83 +- .../Adminhtml/Model/Sales/Order/Random.php | 6 + .../Mage/Adminhtml/Model/Search/Catalog.php | 6 + .../Mage/Adminhtml/Model/Search/Customer.php | 6 + .../Mage/Adminhtml/Model/Search/Order.php | 6 + .../core/Mage/Adminhtml/Model/Session.php | 6 + .../Mage/Adminhtml/Model/Session/Quote.php | 6 + .../System/Config/Backend/Admin/Custom.php | 6 + .../System/Config/Backend/Admin/Usecustom.php | 6 + .../Model/System/Config/Backend/Baseurl.php | 24 +- .../Model/System/Config/Backend/Category.php | 6 + .../System/Config/Backend/Currency/Cron.php | 6 + .../Model/System/Config/Backend/Datashare.php | 6 + .../System/Config/Backend/Design/Package.php | 6 + .../Model/System/Config/Backend/Encrypted.php | 6 + .../Model/System/Config/Backend/Image.php | 6 + .../Model/System/Config/Backend/Image/Pdf.php | 6 + .../System/Config/Backend/Layer/Children.php | 6 + .../Model/System/Config/Backend/Locale.php | 6 + .../System/Config/Backend/Price/Scope.php | 6 + .../Config/Backend/Product/Alert/Cron.php | 6 + .../System/Config/Backend/Seo/Product.php | 6 + .../System/Config/Backend/Serialized.php | 6 + .../Config/Backend/Serialized/Array.php | 6 + .../Config/Backend/Shipping/Tablerate.php | 6 + .../Model/System/Config/Backend/Sitemap.php | 6 + .../System/Config/Backend/Sitemap/Cron.php | 6 + .../Model/System/Config/Backend/Store.php | 6 + .../Model/System/Config/Clone/Media/Image.php | 6 + .../Model/System/Config/Source/Admin/Page.php | 6 + .../Model/System/Config/Source/Allregion.php | 6 + .../Config/Source/Catalog/GridPerPage.php | 6 + .../System/Config/Source/Catalog/ListMode.php | 6 + .../Config/Source/Catalog/ListPerPage.php | 6 + .../Model/System/Config/Source/Category.php | 6 + .../Model/System/Config/Source/Checktype.php | 6 + .../Model/System/Config/Source/Cms/Page.php | 6 + .../Model/System/Config/Source/Country.php | 6 + .../System/Config/Source/Country/Full.php | 6 + .../System/Config/Source/Cron/Frequency.php | 6 + .../Model/System/Config/Source/Currency.php | 6 + .../System/Config/Source/Currency/Service.php | 6 + .../System/Config/Source/Customer/Group.php | 6 + .../Model/System/Config/Source/Date/Short.php | 6 + .../System/Config/Source/Design/Package.php | 6 + .../System/Config/Source/Design/Robots.php | 6 + .../System/Config/Source/Dev/Dbautoup.php | 6 + .../System/Config/Source/Email/Identity.php | 6 + .../System/Config/Source/Email/Method.php | 6 + .../System/Config/Source/Email/Smtpauth.php | 6 + .../System/Config/Source/Email/Template.php | 6 + .../System/Config/Source/Enabledisable.php | 6 + .../Model/System/Config/Source/Frequency.php | 6 + .../Model/System/Config/Source/Language.php | 6 + .../Model/System/Config/Source/Locale.php | 6 + .../System/Config/Source/Locale/Country.php | 6 + .../System/Config/Source/Locale/Currency.php | 6 + .../Config/Source/Locale/Currency/All.php | 6 + .../System/Config/Source/Locale/Timezone.php | 6 + .../Model/System/Config/Source/Nooptreq.php | 6 + .../Config/Source/Notification/Frequency.php | 6 + .../System/Config/Source/Order/Status.php | 24 +- .../System/Config/Source/Order/Status/New.php | 25 +- .../Config/Source/Order/Status/Processing.php | 25 +- .../Config/Source/Payment/Allmethods.php | 47 + .../Config/Source/Payment/Allowedmethods.php | 36 +- .../Source/Payment/Allspecificcountries.php | 6 + .../System/Config/Source/Payment/Cctype.php | 6 + .../Config/Source/Paypal/Standardtypes.php | 6 + .../Config/Source/Paypal/Transactiontype.php | 6 + .../System/Config/Source/Price/Scope.php | 6 + .../Config/Source/Product/Options/Price.php | 6 + .../Config/Source/Product/Options/Type.php | 6 + .../Config/Source/Product/Thumbnail.php | 6 + .../System/Config/Source/Reports/Scope.php | 6 + .../Config/Source/Shipping/Allmethods.php | 63 + .../Config/Source/Shipping/Allowedmethods.php | 33 +- .../Source/Shipping/Allspecificcountries.php | 6 + .../Config/Source/Shipping/Flatrate.php | 6 + .../Config/Source/Shipping/Tablerate.php | 6 + .../Config/Source/Shipping/Taxclass.php | 6 + .../Model/System/Config/Source/Store.php | 6 + .../System/Config/Source/Tax/Apply/On.php | 6 + .../System/Config/Source/Tax/Basedon.php | 6 + .../System/Config/Source/Tax/Catalog.php | 6 + .../Config/Source/Watermark/Position.php | 6 + .../System/Config/Source/Web/Protocol.php | 6 + .../Model/System/Config/Source/Website.php | 6 + .../Model/System/Config/Source/Yesno.php | 6 + .../Mage/Adminhtml/Model/System/Store.php | 8 +- app/code/core/Mage/Adminhtml/Model/Url.php | 6 + .../controllers/Api/RoleController.php | 6 + .../controllers/Api/UserController.php | 6 + .../Catalog/CategoryController.php | 175 +- .../Product/Action/AttributeController.php | 6 + .../Catalog/Product/AttributeController.php | 6 + .../Catalog/Product/DatafeedsController.php | 6 + .../Catalog/Product/GalleryController.php | 6 + .../Catalog/Product/GroupController.php | 6 + .../Catalog/Product/ReviewController.php | 6 + .../Catalog/Product/SetController.php | 6 + .../controllers/Catalog/ProductController.php | 18 +- .../controllers/Catalog/SearchController.php | 8 +- .../controllers/CatalogController.php | 6 + .../Checkout/AgreementController.php | 8 +- .../controllers/Cms/BlockController.php | 6 + .../controllers/Cms/PageController.php | 6 + .../controllers/Customer/ConfigController.php | 6 + .../controllers/Customer/GroupController.php | 6 + .../controllers/Customer/OnlineController.php | 6 + .../controllers/CustomerController.php | 6 + .../controllers/DashboardController.php | 6 + .../Extensions/ConfigController.php | 6 + .../Extensions/ConsoleController.php | 6 + .../Extensions/CustomController.php | 480 +-- .../controllers/Extensions/FileController.php | 6 + .../Extensions/LocalController.php | 6 + .../Extensions/RemoteController.php | 6 + .../Adminhtml/controllers/IndexController.php | 6 + .../Adminhtml/controllers/JsonController.php | 6 + .../controllers/Media/EditorController.php | 6 + .../controllers/Media/UploaderController.php | 6 + .../Newsletter/ProblemController.php | 6 + .../Newsletter/QueueController.php | 6 + .../Newsletter/SubscriberController.php | 6 + .../Newsletter/TemplateController.php | 6 + .../Permissions/RoleController.php | 6 + .../Permissions/UserController.php | 6 + .../controllers/Poll/AnswerController.php | 6 + .../Adminhtml/controllers/PollController.php | 6 + .../controllers/Promo/CatalogController.php | 6 + .../controllers/Promo/QuoteController.php | 9 + .../controllers/Promo/WidgetController.php | 76 +- .../Adminhtml/controllers/PromoController.php | 6 + .../controllers/RatingController.php | 6 + .../controllers/Report/CustomerController.php | 6 + .../controllers/Report/ProductController.php | 6 + .../controllers/Report/ReviewController.php | 6 + .../controllers/Report/SalesController.php | 6 + .../controllers/Report/ShopcartController.php | 6 + .../controllers/Report/TagController.php | 6 + .../controllers/ReportController.php | 6 + .../Sales/CreditmemoController.php | 6 + .../controllers/Sales/InvoiceController.php | 6 + .../Sales/Order/CreateController.php | 11 + .../Sales/Order/CreditmemoController.php | 19 + .../Sales/Order/EditController.php | 6 + .../Sales/Order/InvoiceController.php | 8 +- .../Sales/Order/ShipmentController.php | 6 + .../Order/View/GiftmessageController.php | 6 + .../controllers/Sales/OrderController.php | 24 +- .../controllers/Sales/ShipmentController.php | 6 + .../Adminhtml/controllers/SalesController.php | 6 + .../controllers/SitemapController.php | 6 + .../controllers/System/AccountController.php | 6 + .../controllers/System/BackupController.php | 6 + .../controllers/System/CacheController.php | 50 +- .../controllers/System/ConfigController.php | 6 + .../System/Convert/GuiController.php | 6 + .../System/Convert/ProfileController.php | 6 + .../controllers/System/CurrencyController.php | 6 + .../controllers/System/DesignController.php | 6 + .../System/Email/TemplateController.php | 6 + .../controllers/System/StoreController.php | 6 + .../controllers/SystemController.php | 6 + .../Adminhtml/controllers/TagController.php | 6 + .../Tax/Class/CustomerController.php | 6 + .../Tax/Class/ProductController.php | 6 + .../controllers/Tax/ClassController.php | 6 + .../controllers/Tax/RateController.php | 6 + .../controllers/Tax/RuleController.php | 6 + .../controllers/UrlrewriteController.php | 6 + app/code/core/Mage/Adminhtml/etc/config.xml | 6 + app/code/core/Mage/Api/Controller/Action.php | 6 + app/code/core/Mage/Api/Exception.php | 6 + app/code/core/Mage/Api/Helper/Data.php | 6 + app/code/core/Mage/Api/Model/Acl.php | 6 + .../core/Mage/Api/Model/Acl/Assert/Ip.php | 6 + .../core/Mage/Api/Model/Acl/Assert/Time.php | 6 + app/code/core/Mage/Api/Model/Acl/Resource.php | 6 + app/code/core/Mage/Api/Model/Acl/Role.php | 6 + .../core/Mage/Api/Model/Acl/Role/Generic.php | 6 + .../core/Mage/Api/Model/Acl/Role/Group.php | 6 + .../core/Mage/Api/Model/Acl/Role/Registry.php | 6 + .../core/Mage/Api/Model/Acl/Role/User.php | 6 + app/code/core/Mage/Api/Model/Config.php | 6 + app/code/core/Mage/Api/Model/Mysql4/Acl.php | 6 + .../core/Mage/Api/Model/Mysql4/Acl/Role.php | 6 + .../Api/Model/Mysql4/Acl/Role/Collection.php | 6 + .../Model/Mysql4/Permissions/Collection.php | 6 + app/code/core/Mage/Api/Model/Mysql4/Role.php | 6 + .../Mage/Api/Model/Mysql4/Role/Collection.php | 6 + app/code/core/Mage/Api/Model/Mysql4/Roles.php | 6 + .../Api/Model/Mysql4/Roles/Collection.php | 6 + .../Model/Mysql4/Roles/User/Collection.php | 6 + app/code/core/Mage/Api/Model/Mysql4/Rules.php | 6 + .../Api/Model/Mysql4/Rules/Collection.php | 6 + app/code/core/Mage/Api/Model/Mysql4/User.php | 16 +- .../Mage/Api/Model/Mysql4/User/Collection.php | 6 + .../core/Mage/Api/Model/Resource/Abstract.php | 6 + app/code/core/Mage/Api/Model/Role.php | 6 + app/code/core/Mage/Api/Model/Roles.php | 6 + app/code/core/Mage/Api/Model/Rules.php | 6 + app/code/core/Mage/Api/Model/Server.php | 6 + .../Api/Model/Server/Adapter/Interface.php | 6 + .../Mage/Api/Model/Server/Adapter/Soap.php | 10 +- .../Mage/Api/Model/Server/Adapter/Xmlrpc.php | 6 + .../core/Mage/Api/Model/Server/Handler.php | 6 + .../Api/Model/Server/Handler/Abstract.php | 26 + app/code/core/Mage/Api/Model/Session.php | 62 +- app/code/core/Mage/Api/Model/User.php | 14 + .../Mage/Api/controllers/IndexController.php | 6 + .../Mage/Api/controllers/SoapController.php | 6 + .../Mage/Api/controllers/XmlrpcController.php | 6 + app/code/core/Mage/Api/etc/api.xml | 10 + app/code/core/Mage/Api/etc/config.xml | 43 + app/code/core/Mage/Api/etc/system.xml | 60 + .../sql/api_setup/mysql4-install-0.7.0.php | 6 + .../api_setup/mysql4-upgrade-0.7.0-0.7.1.php | 40 + app/code/core/Mage/Backup/Exception.php | 6 + app/code/core/Mage/Backup/Helper/Data.php | 6 + app/code/core/Mage/Backup/Model/Backup.php | 6 + app/code/core/Mage/Backup/Model/Db.php | 6 + .../core/Mage/Backup/Model/Fs/Collection.php | 6 + app/code/core/Mage/Backup/Model/Media.php | 6 + app/code/core/Mage/Backup/Model/Mysql4/Db.php | 6 + app/code/core/Mage/Backup/Model/View.php | 6 + app/code/core/Mage/Backup/etc/config.xml | 6 + .../Catalog/Product/Edit/Tab/Attributes.php | 6 + .../Product/Edit/Tab/Attributes/Extend.php | 6 + .../Product/Edit/Tab/Attributes/Special.php | 6 + .../Catalog/Product/Edit/Tab/Bundle.php | 6 + .../Product/Edit/Tab/Bundle/Option.php | 6 + .../Product/Edit/Tab/Bundle/Option/Search.php | 6 + .../Edit/Tab/Bundle/Option/Search/Grid.php | 6 + .../Edit/Tab/Bundle/Option/Selection.php | 6 + .../Adminhtml/Catalog/Product/Edit/Tabs.php | 6 + .../Adminhtml/Sales/Order/Items/Renderer.php | 6 + .../Sales/Order/View/Items/Renderer.php | 6 + .../Block/Catalog/Product/List/Partof.php | 6 + .../Bundle/Block/Catalog/Product/Price.php | 6 + .../Bundle/Block/Catalog/Product/View.php | 6 + .../Catalog/Product/View/Type/Bundle.php | 6 + .../Product/View/Type/Bundle/Option.php | 6 + .../View/Type/Bundle/Option/Checkbox.php | 6 + .../Product/View/Type/Bundle/Option/Multi.php | 6 + .../Product/View/Type/Bundle/Option/Radio.php | 6 + .../View/Type/Bundle/Option/Select.php | 6 + .../Block/Checkout/Cart/Item/Renderer.php | 6 + .../Block/Sales/Order/Items/Renderer.php | 6 + app/code/core/Mage/Bundle/Helper/Data.php | 6 + .../Bundle/Model/CatalogIndex/Data/Bundle.php | 6 + .../core/Mage/Bundle/Model/Mysql4/Bundle.php | 6 + .../core/Mage/Bundle/Model/Mysql4/Option.php | 6 + .../Bundle/Model/Mysql4/Option/Collection.php | 6 + .../Mage/Bundle/Model/Mysql4/Selection.php | 30 + .../Model/Mysql4/Selection/Collection.php | 6 + app/code/core/Mage/Bundle/Model/Observer.php | 6 + app/code/core/Mage/Bundle/Model/Option.php | 6 + .../Product/Attribute/Source/Price/View.php | 6 + .../core/Mage/Bundle/Model/Product/Price.php | 74 +- .../core/Mage/Bundle/Model/Product/Type.php | 19 +- .../Model/Sales/Order/Pdf/Items/Abstract.php | 6 + .../Sales/Order/Pdf/Items/Creditmemo.php | 84 +- .../Model/Sales/Order/Pdf/Items/Invoice.php | 57 +- .../Model/Sales/Order/Pdf/Items/Shipment.php | 8 +- app/code/core/Mage/Bundle/Model/Selection.php | 6 + .../Source/Option/Selection/Price/Type.php | 6 + .../Mage/Bundle/Model/Source/Option/Type.php | 6 + .../controllers/SelectionController.php | 6 + app/code/core/Mage/Bundle/etc/config.xml | 6 + .../sql/bundle_setup/mysql4-install-0.1.0.php | 6 + .../mysql4-upgrade-0.1.0-0.1.1.php | 6 + .../mysql4-upgrade-0.1.1-0.1.2.php | 6 + .../mysql4-upgrade-0.1.2-0.1.3.php | 6 + .../mysql4-upgrade-0.1.3-0.1.4.php | 6 + .../core/Mage/Catalog/Block/Breadcrumbs.php | 6 + .../core/Mage/Catalog/Block/Category/View.php | 6 + .../Catalog/Block/Layer/Filter/Abstract.php | 6 + .../Catalog/Block/Layer/Filter/Attribute.php | 6 + .../Catalog/Block/Layer/Filter/Category.php | 6 + .../Mage/Catalog/Block/Layer/Filter/Price.php | 6 + .../core/Mage/Catalog/Block/Layer/State.php | 6 + .../core/Mage/Catalog/Block/Layer/View.php | 6 + .../core/Mage/Catalog/Block/Navigation.php | 7 + app/code/core/Mage/Catalog/Block/Product.php | 6 + .../Mage/Catalog/Block/Product/Abstract.php | 6 + .../Catalog/Block/Product/Compare/List.php | 6 + .../Catalog/Block/Product/Compare/Sidebar.php | 6 + .../Mage/Catalog/Block/Product/Gallery.php | 6 + .../core/Mage/Catalog/Block/Product/List.php | 6 + .../Catalog/Block/Product/List/Crosssell.php | 6 + .../Catalog/Block/Product/List/Random.php | 6 + .../Catalog/Block/Product/List/Related.php | 6 + .../Catalog/Block/Product/List/Toolbar.php | 6 + .../Catalog/Block/Product/List/Upsell.php | 6 + .../core/Mage/Catalog/Block/Product/New.php | 33 +- .../core/Mage/Catalog/Block/Product/Price.php | 6 + .../core/Mage/Catalog/Block/Product/Send.php | 6 + .../core/Mage/Catalog/Block/Product/View.php | 11 +- .../Catalog/Block/Product/View/Abstract.php | 6 + .../Catalog/Block/Product/View/Additional.php | 6 + .../Catalog/Block/Product/View/Attributes.php | 17 +- .../Block/Product/View/Description.php | 6 + .../Mage/Catalog/Block/Product/View/Media.php | 6 + .../Catalog/Block/Product/View/Options.php | 6 + .../Block/Product/View/Options/Abstract.php | 6 + .../Block/Product/View/Options/Type/Date.php | 12 +- .../Product/View/Options/Type/Default.php | 6 + .../Block/Product/View/Options/Type/File.php | 6 + .../Product/View/Options/Type/Select.php | 20 +- .../Block/Product/View/Options/Type/Text.php | 6 + .../Mage/Catalog/Block/Product/View/Price.php | 6 + .../Mage/Catalog/Block/Product/View/Tabs.php | 6 + .../Block/Product/View/Type/Configurable.php | 6 + .../Block/Product/View/Type/Grouped.php | 6 + .../Block/Product/View/Type/Simple.php | 6 + .../Block/Product/View/Type/Virtual.php | 6 + .../Catalog/Block/Seo/Sitemap/Abstract.php | 6 + .../Catalog/Block/Seo/Sitemap/Category.php | 6 + .../Catalog/Block/Seo/Sitemap/Product.php | 6 + app/code/core/Mage/Catalog/Exception.php | 6 + .../core/Mage/Catalog/Helper/Category.php | 6 + app/code/core/Mage/Catalog/Helper/Data.php | 8 + app/code/core/Mage/Catalog/Helper/Image.php | 6 + app/code/core/Mage/Catalog/Helper/Map.php | 6 + app/code/core/Mage/Catalog/Helper/Product.php | 6 + .../Mage/Catalog/Helper/Product/Compare.php | 6 + .../core/Mage/Catalog/Helper/Product/Url.php | 6 + app/code/core/Mage/Catalog/Model/Abstract.php | 9 +- .../core/Mage/Catalog/Model/Api/Resource.php | 6 + app/code/core/Mage/Catalog/Model/Category.php | 39 + .../core/Mage/Catalog/Model/Category/Api.php | 82 +- .../Catalog/Model/Category/Attribute/Api.php | 6 + .../Category/Attribute/Backend/Image.php | 6 + .../Category/Attribute/Backend/Urlkey.php | 6 + .../Category/Attribute/Source/Layout.php | 6 + .../Model/Category/Attribute/Source/Mode.php | 6 + .../Model/Category/Attribute/Source/Page.php | 6 + app/code/core/Mage/Catalog/Model/Config.php | 6 + app/code/core/Mage/Catalog/Model/Convert.php | 6 + .../Catalog/Model/Convert/Adapter/Catalog.php | 6 + .../Catalog/Model/Convert/Adapter/Product.php | 175 +- .../Catalog/Model/Convert/Parser/Product.php | 6 + app/code/core/Mage/Catalog/Model/Design.php | 6 + .../Mage/Catalog/Model/Entity/Attribute.php | 18 + .../Attribute/Design/Options/Container.php | 29 + .../Product/Attribute/Frontend/Image.php | 6 + app/code/core/Mage/Catalog/Model/Layer.php | 6 + .../Catalog/Model/Layer/Filter/Abstract.php | 6 + .../Catalog/Model/Layer/Filter/Attribute.php | 6 + .../Catalog/Model/Layer/Filter/Category.php | 6 + .../Mage/Catalog/Model/Layer/Filter/Item.php | 6 + .../Mage/Catalog/Model/Layer/Filter/Price.php | 6 + .../core/Mage/Catalog/Model/Layer/State.php | 6 + app/code/core/Mage/Catalog/Model/Observer.php | 11 + app/code/core/Mage/Catalog/Model/Product.php | 466 +-- .../core/Mage/Catalog/Model/Product/Api.php | 6 + .../Catalog/Model/Product/Attribute/Api.php | 28 +- .../Model/Product/Attribute/Backend/Media.php | 6 + .../Model/Product/Attribute/Backend/Price.php | 6 + .../Product/Attribute/Backend/Startdate.php | 10 +- .../Product/Attribute/Backend/Tierprice.php | 6 + .../Product/Attribute/Backend/Urlkey.php | 6 + .../Product/Attribute/Frontend/Image.php | 6 + .../Model/Product/Attribute/Media/Api.php | 6 + .../Model/Product/Attribute/Set/Api.php | 6 + .../Model/Product/Attribute/Tierprice/Api.php | 6 + .../Catalog/Model/Product/Compare/Item.php | 6 + .../Catalog/Model/Product/Compare/List.php | 6 + .../core/Mage/Catalog/Model/Product/Image.php | 6 + .../core/Mage/Catalog/Model/Product/Link.php | 15 + .../Mage/Catalog/Model/Product/Link/Api.php | 6 + .../Catalog/Model/Product/Media/Config.php | 6 + .../Mage/Catalog/Model/Product/Option.php | 13 +- .../Catalog/Model/Product/Option/Value.php | 6 + .../Mage/Catalog/Model/Product/Status.php | 6 + .../core/Mage/Catalog/Model/Product/Type.php | 6 + .../Catalog/Model/Product/Type/Abstract.php | 6 + .../Mage/Catalog/Model/Product/Type/Api.php | 6 + .../Model/Product/Type/Configurable.php | 26 +- .../Product/Type/Configurable/Attribute.php | 6 + .../Model/Product/Type/Configurable/Price.php | 6 + .../Catalog/Model/Product/Type/Grouped.php | 6 + .../Mage/Catalog/Model/Product/Type/Price.php | 8 + .../Catalog/Model/Product/Type/Simple.php | 6 + .../Catalog/Model/Product/Type/Virtual.php | 6 + .../core/Mage/Catalog/Model/Product/Url.php | 68 +- .../Mage/Catalog/Model/Product/Visibility.php | 6 + .../Mage/Catalog/Model/Product/Website.php | 6 + .../Catalog/Model/Resource/Eav/Attribute.php | 6 + .../Model/Resource/Eav/Mysql4/Abstract.php | 6 + .../Model/Resource/Eav/Mysql4/Category.php | 131 +- .../Category/Attribute/Frontend/Image.php | 6 + .../Category/Attribute/Source/Layout.php | 6 + .../Mysql4/Category/Attribute/Source/Mode.php | 6 + .../Mysql4/Category/Attribute/Source/Page.php | 6 + .../Eav/Mysql4/Category/Collection.php | 6 + .../Resource/Eav/Mysql4/Category/Tree.php | 98 +- .../Eav/Mysql4/Collection/Abstract.php | 6 + .../Model/Resource/Eav/Mysql4/Product.php | 28 +- .../Product/Attribute/Backend/Gallery.php | 6 + .../Product/Attribute/Backend/Image.php | 6 + .../Product/Attribute/Backend/Media.php | 6 + .../Product/Attribute/Backend/Tierprice.php | 6 + .../Product/Attribute/Backend/Urlkey.php | 6 + .../Product/Attribute/Frontend/Image.php | 6 + .../Product/Attribute/Frontend/Tierprice.php | 6 + .../Eav/Mysql4/Product/Collection.php | 14 +- .../Eav/Mysql4/Product/Compare/Item.php | 6 + .../Product/Compare/Item/Collection.php | 6 + .../Resource/Eav/Mysql4/Product/Link.php | 6 + .../Eav/Mysql4/Product/Link/Collection.php | 142 + .../Product/Link/Product/Collection.php | 6 + .../Resource/Eav/Mysql4/Product/Option.php | 16 + .../Eav/Mysql4/Product/Option/Collection.php | 32 +- .../Eav/Mysql4/Product/Option/Value.php | 20 +- .../Product/Option/Value/Collection.php | 6 + .../Resource/Eav/Mysql4/Product/Status.php | 6 + .../Eav/Mysql4/Product/Type/Configurable.php | 6 + .../Product/Type/Configurable/Attribute.php | 6 + .../Configurable/Attribute/Collection.php | 6 + .../Type/Configurable/Product/Collection.php | 6 + .../Resource/Eav/Mysql4/Product/Website.php | 35 +- .../Model/Resource/Eav/Mysql4/Sendfriend.php | 6 + .../Eav/Mysql4/Sendfriend/Collection.php | 6 + .../Model/Resource/Eav/Mysql4/Setup.php | 25 + .../Catalog/Model/Resource/Eav/Mysql4/Url.php | 10 +- .../core/Mage/Catalog/Model/Sendfriend.php | 6 + app/code/core/Mage/Catalog/Model/Session.php | 6 + app/code/core/Mage/Catalog/Model/Url.php | 6 + .../controllers/CategoryController.php | 6 + .../Catalog/controllers/IndexController.php | 6 + .../controllers/Product/CompareController.php | 6 + .../Catalog/controllers/ProductController.php | 6 + .../controllers/Seo/SitemapController.php | 6 + app/code/core/Mage/Catalog/etc/api.xml | 6 + app/code/core/Mage/Catalog/etc/config.xml | 8 +- app/code/core/Mage/Catalog/etc/convert.xml | 6 + app/code/core/Mage/Catalog/etc/system.xml | 18 +- .../catalog_setup/mysql4-install-0.7.0.php | 8 + .../mysql4-upgrade-0.6.40-0.7.0.php | 6 + .../mysql4-upgrade-0.7.0-0.7.1.php | 6 + .../mysql4-upgrade-0.7.1-0.7.2.php | 6 + .../mysql4-upgrade-0.7.11-0.7.12.php | 6 + .../mysql4-upgrade-0.7.12-0.7.13.php | 6 + .../mysql4-upgrade-0.7.13-0.7.14.php | 6 + .../mysql4-upgrade-0.7.14-0.7.15.php | 6 + .../mysql4-upgrade-0.7.15-0.7.16.php | 6 + .../mysql4-upgrade-0.7.16-0.7.17.php | 6 + .../mysql4-upgrade-0.7.17-0.7.18.php | 6 + .../mysql4-upgrade-0.7.18-0.7.19.php | 6 + .../mysql4-upgrade-0.7.19-0.7.20.php | 6 + .../mysql4-upgrade-0.7.2-0.7.3.php | 6 + .../mysql4-upgrade-0.7.20-0.7.21.php | 6 + .../mysql4-upgrade-0.7.21-0.7.22.php | 6 + .../mysql4-upgrade-0.7.22-0.7.23.php | 6 + .../mysql4-upgrade-0.7.23-0.7.24.php | 6 + .../mysql4-upgrade-0.7.24-0.7.25.php | 6 + .../mysql4-upgrade-0.7.25-0.7.26.php | 6 + .../mysql4-upgrade-0.7.26-0.7.27.php | 6 + .../mysql4-upgrade-0.7.27-0.7.28.php | 6 + .../mysql4-upgrade-0.7.28-0.7.29.php | 6 + .../mysql4-upgrade-0.7.29-0.7.30.php | 6 + .../mysql4-upgrade-0.7.30-0.7.31.php | 6 + .../mysql4-upgrade-0.7.31-0.7.32.php | 6 + .../mysql4-upgrade-0.7.32-0.7.33.php | 6 + .../mysql4-upgrade-0.7.33-0.7.34.php | 6 + .../mysql4-upgrade-0.7.34-0.7.35.php | 6 + .../mysql4-upgrade-0.7.35-0.7.36.php | 6 + .../mysql4-upgrade-0.7.36-0.7.37.php | 6 + .../mysql4-upgrade-0.7.37-0.7.38.php | 6 + .../mysql4-upgrade-0.7.38-0.7.39.php | 6 + .../mysql4-upgrade-0.7.39-0.7.40.php | 6 + .../mysql4-upgrade-0.7.4-0.7.5.php | 6 + .../mysql4-upgrade-0.7.40-0.7.41.php | 6 + .../mysql4-upgrade-0.7.41-0.7.42.php | 6 + .../mysql4-upgrade-0.7.42-0.7.43.php | 6 + .../mysql4-upgrade-0.7.43-0.7.44.php | 6 + .../mysql4-upgrade-0.7.44-0.7.45.php | 6 + .../mysql4-upgrade-0.7.45-0.7.46.php | 6 + .../mysql4-upgrade-0.7.46-0.7.47.php | 6 + .../mysql4-upgrade-0.7.47-0.7.48.php | 6 + .../mysql4-upgrade-0.7.48-0.7.49.php | 6 + .../mysql4-upgrade-0.7.49-0.7.50.php | 6 + .../mysql4-upgrade-0.7.5-0.7.6.php | 6 + .../mysql4-upgrade-0.7.50-0.7.51.php | 44 + .../mysql4-upgrade-0.7.51-0.7.52.php | 51 + .../mysql4-upgrade-0.7.6-0.7.7.php | 6 + .../mysql4-upgrade-0.7.7-0.7.8.php | 6 + .../mysql4-upgrade-0.7.8-0.7.9.php | 6 + .../Mage/CatalogIndex/Model/Attribute.php | 6 + .../CatalogIndex/Model/Catalog/Index/Flag.php | 52 + .../Model/Catalog/Index/Kill/Flag.php | 29 + .../Mage/CatalogIndex/Model/Data/Abstract.php | 26 + .../CatalogIndex/Model/Data/Configurable.php | 10 +- .../Mage/CatalogIndex/Model/Data/Grouped.php | 6 + .../Mage/CatalogIndex/Model/Data/Simple.php | 6 + .../Mage/CatalogIndex/Model/Data/Virtual.php | 6 + .../core/Mage/CatalogIndex/Model/Indexer.php | 197 +- .../CatalogIndex/Model/Indexer/Abstract.php | 6 + .../Mage/CatalogIndex/Model/Indexer/Eav.php | 6 + .../CatalogIndex/Model/Indexer/Interface.php | 6 + .../Model/Indexer/Minimalprice.php | 9 +- .../Mage/CatalogIndex/Model/Indexer/Price.php | 6 + .../CatalogIndex/Model/Indexer/Tierprice.php | 6 + .../CatalogIndex/Model/Mysql4/Abstract.php | 6 + .../CatalogIndex/Model/Mysql4/Attribute.php | 6 + .../Model/Mysql4/Data/Abstract.php | 6 + .../Model/Mysql4/Data/Configurable.php | 12 +- .../Model/Mysql4/Data/Grouped.php | 40 +- .../CatalogIndex/Model/Mysql4/Indexer.php | 19 +- .../Model/Mysql4/Indexer/Abstract.php | 6 + .../CatalogIndex/Model/Mysql4/Indexer/Eav.php | 6 + .../Model/Mysql4/Indexer/Minimalprice.php | 6 + .../Model/Mysql4/Indexer/Price.php | 6 + .../Mage/CatalogIndex/Model/Mysql4/Price.php | 31 +- .../CatalogIndex/Model/Mysql4/Retreiver.php | 6 + .../core/Mage/CatalogIndex/Model/Observer.php | 14 + .../core/Mage/CatalogIndex/Model/Price.php | 7 + .../Mage/CatalogIndex/Model/Retreiver.php | 6 + .../core/Mage/CatalogIndex/etc/config.xml | 12 +- .../mysql4-install-0.7.0.php | 6 + .../mysql4-upgrade-0.7.0-0.7.1.php | 6 + .../mysql4-upgrade-0.7.1-0.7.2.php | 6 + .../mysql4-upgrade-0.7.2-0.7.3.php | 6 + .../mysql4-upgrade-0.7.3-0.7.4.php | 6 + .../mysql4-upgrade-0.7.4-0.7.5.php | 6 + .../mysql4-upgrade-0.7.5-0.7.6.php | 6 + .../mysql4-upgrade-0.7.6-0.7.7.php | 43 + .../Mage/CatalogInventory/Helper/Data.php | 6 + .../CatalogInventory/Model/Mysql4/Stock.php | 6 + .../Model/Mysql4/Stock/Item.php | 6 + .../Model/Mysql4/Stock/Item/Collection.php | 6 + .../Mage/CatalogInventory/Model/Observer.php | 27 +- .../Model/Source/Backorders.php | 6 + .../Mage/CatalogInventory/Model/Stock.php | 6 + .../CatalogInventory/Model/Stock/Item.php | 54 +- .../CatalogInventory/Model/Stock/Item/Api.php | 6 + .../core/Mage/CatalogInventory/etc/api.xml | 6 + .../core/Mage/CatalogInventory/etc/config.xml | 6 + .../core/Mage/CatalogInventory/etc/system.xml | 11 +- .../mysql4-install-0.7.0.php | 6 + .../mysql4-upgrade-0.7.0-0.7.1.php | 6 + .../mysql4-upgrade-0.7.1-0.7.2.php | 6 + .../core/Mage/CatalogRule/Helper/Data.php | 6 + .../Mage/CatalogRule/Model/Mysql4/Rule.php | 39 +- .../Model/Mysql4/Rule/Collection.php | 6 + .../Model/Mysql4/Rule/Product/Price.php | 6 + .../Mysql4/Rule/Product/Price/Collection.php | 6 + .../core/Mage/CatalogRule/Model/Observer.php | 6 + app/code/core/Mage/CatalogRule/Model/Rule.php | 6 + .../Model/Rule/Action/Collection.php | 6 + .../CatalogRule/Model/Rule/Action/Product.php | 6 + .../Model/Rule/Condition/Combine.php | 6 + .../Model/Rule/Condition/Product.php | 12 +- app/code/core/Mage/CatalogRule/etc/config.xml | 6 + .../mysql4-install-0.7.0.php | 6 + .../mysql4-upgrade-0.7.0-0.7.1.php | 6 + .../mysql4-upgrade-0.7.1-0.7.2.php | 6 + .../mysql4-upgrade-0.7.2-0.7.3.php | 6 + .../CatalogSearch/Block/Advanced/Form.php | 47 + .../CatalogSearch/Block/Advanced/Result.php | 6 + .../Mage/CatalogSearch/Block/Autocomplete.php | 6 + .../core/Mage/CatalogSearch/Block/Result.php | 6 + .../core/Mage/CatalogSearch/Block/Term.php | 6 + .../core/Mage/CatalogSearch/Helper/Data.php | 17 +- .../Mage/CatalogSearch/Model/Advanced.php | 25 +- .../Model/Mysql4/Advanced/Collection.php | 6 + .../Mage/CatalogSearch/Model/Mysql4/Query.php | 6 + .../Model/Mysql4/Query/Collection.php | 6 + .../Model/Mysql4/Search/Collection.php | 79 +- .../core/Mage/CatalogSearch/Model/Query.php | 9 +- .../core/Mage/CatalogSearch/Model/Session.php | 6 + .../controllers/AdvancedController.php | 6 + .../controllers/AjaxController.php | 6 + .../controllers/ResultController.php | 6 + .../controllers/TermController.php | 6 + .../core/Mage/CatalogSearch/etc/config.xml | 6 + .../core/Mage/CatalogSearch/etc/system.xml | 6 + .../mysql4-install-0.7.0.php | 6 + .../mysql4-upgrade-0.7.1-0.7.2.php | 6 + .../mysql4-upgrade-0.7.2-0.7.3.php | 6 + .../mysql4-upgrade-0.7.3-0.7.4.php | 6 + app/code/core/Mage/Checkout/Block/Cart.php | 6 + .../Mage/Checkout/Block/Cart/Abstract.php | 6 + .../core/Mage/Checkout/Block/Cart/Coupon.php | 6 + .../Mage/Checkout/Block/Cart/Crosssell.php | 11 +- .../Checkout/Block/Cart/Item/Renderer.php | 6 + .../Block/Cart/Item/Renderer/Configurable.php | 6 + .../Block/Cart/Item/Renderer/Grouped.php | 6 + .../Mage/Checkout/Block/Cart/Shipping.php | 10 +- .../core/Mage/Checkout/Block/Cart/Sidebar.php | 43 +- .../core/Mage/Checkout/Block/Cart/Totals.php | 6 + app/code/core/Mage/Checkout/Block/Links.php | 6 + .../Checkout/Block/Multishipping/Abstract.php | 6 + .../Block/Multishipping/Address/Select.php | 6 + .../Block/Multishipping/Addresses.php | 6 + .../Checkout/Block/Multishipping/Billing.php | 6 + .../Block/Multishipping/Billing/Items.php | 6 + .../Checkout/Block/Multishipping/Link.php | 21 +- .../Checkout/Block/Multishipping/Overview.php | 6 + .../Block/Multishipping/Payment/Info.php | 6 + .../Checkout/Block/Multishipping/Shipping.php | 6 + .../Checkout/Block/Multishipping/State.php | 6 + .../Checkout/Block/Multishipping/Success.php | 6 + app/code/core/Mage/Checkout/Block/Onepage.php | 6 + .../Mage/Checkout/Block/Onepage/Abstract.php | 6 + .../Mage/Checkout/Block/Onepage/Billing.php | 6 + .../Mage/Checkout/Block/Onepage/Failure.php | 6 + .../core/Mage/Checkout/Block/Onepage/Link.php | 6 + .../Mage/Checkout/Block/Onepage/Login.php | 6 + .../Mage/Checkout/Block/Onepage/Payment.php | 6 + .../Checkout/Block/Onepage/Payment/Info.php | 6 + .../Block/Onepage/Payment/Methods.php | 6 + .../Mage/Checkout/Block/Onepage/Progress.php | 6 + .../Mage/Checkout/Block/Onepage/Review.php | 6 + .../Checkout/Block/Onepage/Review/Info.php | 6 + .../Mage/Checkout/Block/Onepage/Shipping.php | 6 + .../Block/Onepage/Shipping/Method.php | 6 + .../Onepage/Shipping/Method/Additional.php | 6 + .../Onepage/Shipping/Method/Available.php | 6 + .../Mage/Checkout/Block/Onepage/Success.php | 26 +- app/code/core/Mage/Checkout/Block/Success.php | 6 + .../Mage/Checkout/Block/Total/Default.php | 6 + .../core/Mage/Checkout/Block/Total/Tax.php | 6 + .../core/Mage/Checkout/Controller/Action.php | 61 + app/code/core/Mage/Checkout/Exception.php | 6 + app/code/core/Mage/Checkout/Helper/Cart.php | 47 +- app/code/core/Mage/Checkout/Helper/Data.php | 128 +- app/code/core/Mage/Checkout/Helper/Url.php | 6 + .../core/Mage/Checkout/Model/Agreement.php | 6 + app/code/core/Mage/Checkout/Model/Cart.php | 6 + .../Model/Config/Source/Cart/Summary.php | 6 + .../Mage/Checkout/Model/Mysql4/Agreement.php | 6 + .../Model/Mysql4/Agreement/Collection.php | 9 +- .../core/Mage/Checkout/Model/Mysql4/Cart.php | 6 + .../core/Mage/Checkout/Model/Observer.php | 6 + app/code/core/Mage/Checkout/Model/Session.php | 13 + .../Mage/Checkout/Model/Type/Abstract.php | 6 + .../Checkout/Model/Type/Multishipping.php | 28 +- .../Model/Type/Multishipping/State.php | 6 + .../core/Mage/Checkout/Model/Type/Onepage.php | 53 +- .../Mage/Checkout/Model/Type/Standard.php | 6 + .../Checkout/controllers/CartController.php | 16 +- .../Checkout/controllers/IndexController.php | 6 + .../Multishipping/AddressController.php | 6 + .../controllers/MultishippingController.php | 21 +- .../controllers/OnepageController.php | 127 +- app/code/core/Mage/Checkout/etc/config.xml | 22 + app/code/core/Mage/Checkout/etc/system.xml | 8 +- .../checkout_setup/mysql4-install-0.9.1.php | 6 + .../mysql4-upgrade-0.9.0-0.9.1.php | 6 + .../mysql4-upgrade-0.9.1-0.9.2.php | 6 + app/code/core/Mage/Cms/Block/Block.php | 6 + app/code/core/Mage/Cms/Block/Page.php | 11 +- app/code/core/Mage/Cms/Controller/Router.php | 11 +- app/code/core/Mage/Cms/Helper/Data.php | 6 + app/code/core/Mage/Cms/Helper/Page.php | 15 + app/code/core/Mage/Cms/Model/Block.php | 6 + app/code/core/Mage/Cms/Model/Mysql4/Block.php | 6 + .../Cms/Model/Mysql4/Block/Collection.php | 6 + app/code/core/Mage/Cms/Model/Mysql4/Page.php | 6 + .../Mage/Cms/Model/Mysql4/Page/Collection.php | 14 +- app/code/core/Mage/Cms/Model/Observer.php | 6 + app/code/core/Mage/Cms/Model/Page.php | 6 + .../Mage/Cms/controllers/IndexController.php | 6 + .../Mage/Cms/controllers/PageController.php | 6 + app/code/core/Mage/Cms/etc/config.xml | 6 + app/code/core/Mage/Cms/etc/system.xml | 6 + .../sql/cms_setup/mysql4-install-0.7.0.php | 6 + .../cms_setup/mysql4-upgrade-0.7.0-0.7.1.php | 6 + .../cms_setup/mysql4-upgrade-0.7.1-0.7.2.php | 6 + .../cms_setup/mysql4-upgrade-0.7.2-0.7.3.php | 6 + .../cms_setup/mysql4-upgrade-0.7.4-0.7.5.php | 6 + .../cms_setup/mysql4-upgrade-0.7.5-0.7.6.php | 6 + app/code/core/Mage/Contacts/Helper/Data.php | 6 + .../Contacts/controllers/IndexController.php | 12 + app/code/core/Mage/Contacts/etc/config.xml | 6 + app/code/core/Mage/Contacts/etc/system.xml | 6 + .../contacts_setup/mysql4-install-0.7.1.php | 6 + .../contacts_setup/mysql4-install-0.8.0.php | 6 + .../mysql4-upgrade-0.7.1-0.7.2.php | 6 + app/code/core/Mage/Core/Block/Abstract.php | 47 +- app/code/core/Mage/Core/Block/Flush.php | 6 + app/code/core/Mage/Core/Block/Html/Date.php | 8 +- app/code/core/Mage/Core/Block/Html/Select.php | 6 + app/code/core/Mage/Core/Block/Messages.php | 6 + app/code/core/Mage/Core/Block/Profiler.php | 6 + app/code/core/Mage/Core/Block/Saver.php | 6 + .../core/Mage/Core/Block/Store/Switcher.php | 6 + app/code/core/Mage/Core/Block/Template.php | 6 + .../core/Mage/Core/Block/Template/Facade.php | 6 + .../core/Mage/Core/Block/Template/Smarty.php | 6 + .../core/Mage/Core/Block/Template/Zend.php | 6 + app/code/core/Mage/Core/Block/Text.php | 6 + app/code/core/Mage/Core/Block/Text/List.php | 6 + .../core/Mage/Core/Block/Text/List/Item.php | 6 + .../core/Mage/Core/Block/Text/List/Link.php | 6 + app/code/core/Mage/Core/Block/Text/Tag.php | 6 + .../core/Mage/Core/Block/Text/Tag/Css.php | 6 + .../Mage/Core/Block/Text/Tag/Css/Admin.php | 6 + .../core/Mage/Core/Block/Text/Tag/Debug.php | 6 + app/code/core/Mage/Core/Block/Text/Tag/Js.php | 6 + .../core/Mage/Core/Block/Text/Tag/Meta.php | 6 + .../Mage/Core/Controller/Front/Action.php | 6 + .../Mage/Core/Controller/Front/Router.php | 6 + .../Mage/Core/Controller/Request/Http.php | 32 +- .../Mage/Core/Controller/Response/Http.php | 6 + .../Mage/Core/Controller/Varien/Action.php | 14 +- .../Mage/Core/Controller/Varien/Front.php | 6 + .../Controller/Varien/Router/Abstract.php | 6 + .../Core/Controller/Varien/Router/Admin.php | 6 + .../Core/Controller/Varien/Router/Default.php | 6 + .../Controller/Varien/Router/Standard.php | 23 +- app/code/core/Mage/Core/Exception.php | 6 + app/code/core/Mage/Core/Helper/Abstract.php | 6 + app/code/core/Mage/Core/Helper/Data.php | 103 + app/code/core/Mage/Core/Helper/Js.php | 6 + app/code/core/Mage/Core/Helper/String.php | 6 + app/code/core/Mage/Core/Helper/Url.php | 8 +- app/code/core/Mage/Core/Model/Abstract.php | 11 +- app/code/core/Mage/Core/Model/App.php | 11 +- app/code/core/Mage/Core/Model/App/Area.php | 6 + app/code/core/Mage/Core/Model/Config.php | 6 + app/code/core/Mage/Core/Model/Config/Base.php | 6 + app/code/core/Mage/Core/Model/Config/Data.php | 6 + .../core/Mage/Core/Model/Config/Element.php | 6 + .../core/Mage/Core/Model/Config/Options.php | 6 + .../core/Mage/Core/Model/Config/System.php | 6 + app/code/core/Mage/Core/Model/Convert.php | 6 + .../Model/Convert/Adapter/Interactive.php | 6 + .../core/Mage/Core/Model/Convert/History.php | 6 + .../core/Mage/Core/Model/Convert/Profile.php | 6 + app/code/core/Mage/Core/Model/Cookie.php | 6 + app/code/core/Mage/Core/Model/Date.php | 6 + app/code/core/Mage/Core/Model/Design.php | 6 + .../core/Mage/Core/Model/Design/Package.php | 6 + .../Mage/Core/Model/Design/Source/Apply.php | 6 + .../Mage/Core/Model/Design/Source/Design.php | 6 + app/code/core/Mage/Core/Model/Email.php | 6 + .../core/Mage/Core/Model/Email/Template.php | 86 +- .../Mage/Core/Model/Email/Template/Filter.php | 22 +- .../core/Mage/Core/Model/Email/Transport.php | 6 + app/code/core/Mage/Core/Model/Flag.php | 70 + app/code/core/Mage/Core/Model/Language.php | 6 + app/code/core/Mage/Core/Model/Layout.php | 6 + app/code/core/Mage/Core/Model/Layout/Data.php | 6 + .../core/Mage/Core/Model/Layout/Element.php | 6 + .../core/Mage/Core/Model/Layout/Update.php | 10 + app/code/core/Mage/Core/Model/Locale.php | 43 +- .../core/Mage/Core/Model/Locale/Currency.php | 6 + app/code/core/Mage/Core/Model/Message.php | 6 + .../core/Mage/Core/Model/Message/Abstract.php | 6 + .../Mage/Core/Model/Message/Collection.php | 6 + .../core/Mage/Core/Model/Message/Error.php | 6 + .../core/Mage/Core/Model/Message/Notice.php | 6 + .../core/Mage/Core/Model/Message/Success.php | 6 + .../core/Mage/Core/Model/Message/Warning.php | 6 + .../core/Mage/Core/Model/Mysql4/Abstract.php | 6 + .../Core/Model/Mysql4/Collection/Abstract.php | 6 + .../core/Mage/Core/Model/Mysql4/Config.php | 6 + .../Mage/Core/Model/Mysql4/Config/Data.php | 6 + .../Model/Mysql4/Config/Data/Collection.php | 6 + .../Core/Model/Mysql4/Convert/History.php | 6 + .../Mysql4/Convert/History/Collection.php | 6 + .../Core/Model/Mysql4/Convert/Profile.php | 6 + .../Mysql4/Convert/Profile/Collection.php | 6 + .../core/Mage/Core/Model/Mysql4/Design.php | 6 + .../Core/Model/Mysql4/Design/Collection.php | 6 + .../Mysql4/Design/Package/Collection.php | 6 + .../Model/Mysql4/Design/Theme/Collection.php | 6 + .../Mage/Core/Model/Mysql4/Email/Template.php | 6 + .../Mysql4/Email/Template/Collection.php | 6 + app/code/core/Mage/Core/Model/Mysql4/Flag.php | 33 + .../core/Mage/Core/Model/Mysql4/History.php | 6 + .../core/Mage/Core/Model/Mysql4/Language.php | 6 + .../Core/Model/Mysql4/Language/Collection.php | 6 + .../core/Mage/Core/Model/Mysql4/Layout.php | 6 + .../core/Mage/Core/Model/Mysql4/Resource.php | 6 + .../core/Mage/Core/Model/Mysql4/Session.php | 6 + .../core/Mage/Core/Model/Mysql4/Store.php | 6 + .../Core/Model/Mysql4/Store/Collection.php | 10 +- .../Mage/Core/Model/Mysql4/Store/Group.php | 6 + .../Model/Mysql4/Store/Group/Collection.php | 9 +- .../core/Mage/Core/Model/Mysql4/Translate.php | 6 + .../Core/Model/Mysql4/Translate/String.php | 36 +- .../Mage/Core/Model/Mysql4/Url/Rewrite.php | 6 + .../Model/Mysql4/Url/Rewrite/Collection.php | 6 + .../core/Mage/Core/Model/Mysql4/Website.php | 6 + .../Core/Model/Mysql4/Website/Collection.php | 16 +- app/code/core/Mage/Core/Model/Resource.php | 6 + .../Mage/Core/Model/Resource/Abstract.php | 6 + .../Core/Model/Resource/Entity/Abstract.php | 6 + .../Mage/Core/Model/Resource/Entity/Table.php | 6 + .../Mage/Core/Model/Resource/Iterator.php | 6 + .../core/Mage/Core/Model/Resource/Setup.php | 6 + .../Mage/Core/Model/Resource/Transaction.php | 35 +- .../Core/Model/Resource/Type/Abstract.php | 6 + .../core/Mage/Core/Model/Resource/Type/Db.php | 6 + .../Core/Model/Resource/Type/Db/Mysqli.php | 6 + .../Model/Resource/Type/Db/Mysqli/Setup.php | 6 + .../Core/Model/Resource/Type/Db/Pdo/Mysql.php | 6 + app/code/core/Mage/Core/Model/Session.php | 6 + .../core/Mage/Core/Model/Session/Abstract.php | 6 + .../Core/Model/Session/Abstract/Varien.php | 6 + .../Mage/Core/Model/Session/Abstract/Zend.php | 6 + app/code/core/Mage/Core/Model/Store.php | 22 +- .../core/Mage/Core/Model/Store/Exception.php | 6 + app/code/core/Mage/Core/Model/Store/Group.php | 6 + app/code/core/Mage/Core/Model/Translate.php | 46 +- .../Mage/Core/Model/Translate/Abstract.php | 6 + .../core/Mage/Core/Model/Translate/Expr.php | 6 + .../core/Mage/Core/Model/Translate/Inline.php | 6 + .../core/Mage/Core/Model/Translate/String.php | 6 + app/code/core/Mage/Core/Model/Url.php | 36 +- app/code/core/Mage/Core/Model/Url/Rewrite.php | 11 + app/code/core/Mage/Core/Model/Website.php | 18 + .../Mage/Core/controllers/AjaxController.php | 6 + .../Mage/Core/controllers/IndexController.php | 6 + app/code/core/Mage/Core/etc/config.xml | 22 +- app/code/core/Mage/Core/etc/system.xml | 35 +- app/code/core/Mage/Core/functions.php | 11 +- .../sql/core_setup/mysql4-install-0.7.0.php | 6 + .../sql/core_setup/mysql4-install-0.8.0.php | 8 +- .../mysql4-upgrade-0.6.26-0.7.0.php | 6 + .../core_setup/mysql4-upgrade-0.7.1-0.7.2.php | 6 + .../core_setup/mysql4-upgrade-0.7.2-0.7.3.php | 6 + .../core_setup/mysql4-upgrade-0.7.3-0.7.4.php | 6 + .../core_setup/mysql4-upgrade-0.7.4-0.7.5.php | 6 + .../core_setup/mysql4-upgrade-0.7.5-0.7.6.php | 6 + .../core_setup/mysql4-upgrade-0.7.6-0.7.7.php | 6 + .../core_setup/mysql4-upgrade-0.7.7-0.7.8.php | 6 + .../core_setup/mysql4-upgrade-0.7.8-0.7.9.php | 6 + .../core_setup/mysql4-upgrade-0.8.0-0.8.1.php | 6 + .../core_setup/mysql4-upgrade-0.8.1-0.8.2.php | 6 + .../mysql4-upgrade-0.8.10-0.8.11.php | 38 + .../core_setup/mysql4-upgrade-0.8.2-0.8.3.php | 6 + .../core_setup/mysql4-upgrade-0.8.3-0.8.4.php | 6 + .../core_setup/mysql4-upgrade-0.8.4-0.8.5.php | 6 + .../core_setup/mysql4-upgrade-0.8.5-0.8.6.php | 6 + .../core_setup/mysql4-upgrade-0.8.6-0.8.7.php | 6 + .../core_setup/mysql4-upgrade-0.8.7-0.8.8.php | 6 + .../core_setup/mysql4-upgrade-0.8.8-0.8.9.php | 36 + .../mysql4-upgrade-0.8.9-0.8.10.php | 44 + app/code/core/Mage/Cron/Exception.php | 6 + app/code/core/Mage/Cron/Helper/Data.php | 6 + .../core/Mage/Cron/Model/Mysql4/Schedule.php | 6 + .../Cron/Model/Mysql4/Schedule/Collection.php | 6 + app/code/core/Mage/Cron/Model/Observer.php | 6 + app/code/core/Mage/Cron/Model/Schedule.php | 6 + app/code/core/Mage/Cron/etc/config.xml | 6 + app/code/core/Mage/Cron/etc/system.xml | 10 +- .../sql/cron_setup/mysql4-install-0.7.0.php | 6 + .../cron_setup/mysql4-upgrade-0.7.0-0.7.1.php | 6 + app/code/core/Mage/Customer/Block/Account.php | 6 + .../Mage/Customer/Block/Account/Dashboard.php | 6 + .../Block/Account/Dashboard/Address.php | 6 + .../Block/Account/Dashboard/Block.php | 6 + .../Block/Account/Dashboard/Hello.php | 6 + .../Customer/Block/Account/Dashboard/Info.php | 6 + .../Block/Account/Dashboard/Newsletter.php | 6 + .../Block/Account/Dashboard/Sidebar.php | 6 + .../Customer/Block/Account/Forgotpassword.php | 6 + .../Customer/Block/Account/Navigation.php | 6 + .../core/Mage/Customer/Block/Address/Book.php | 6 + .../core/Mage/Customer/Block/Address/Edit.php | 6 + .../Block/Address/Renderer/Default.php | 6 + .../Block/Address/Renderer/Interface.php | 6 + .../core/Mage/Customer/Block/Form/Edit.php | 6 + .../core/Mage/Customer/Block/Form/Login.php | 6 + .../Mage/Customer/Block/Form/Register.php | 6 + .../core/Mage/Customer/Block/Newsletter.php | 6 + .../Mage/Customer/Block/Widget/Abstract.php | 6 + .../core/Mage/Customer/Block/Widget/Dob.php | 6 + .../core/Mage/Customer/Block/Widget/Name.php | 6 + .../Mage/Customer/Block/Widget/Taxvat.php | 11 +- app/code/core/Mage/Customer/Exception.php | 6 + .../core/Mage/Customer/Helper/Address.php | 6 + app/code/core/Mage/Customer/Helper/Data.php | 6 + app/code/core/Mage/Customer/Model/Address.php | 6 + .../Mage/Customer/Model/Address/Abstract.php | 6 + .../core/Mage/Customer/Model/Address/Api.php | 6 + .../Mage/Customer/Model/Address/Config.php | 6 + .../core/Mage/Customer/Model/Api/Resource.php | 6 + .../core/Mage/Customer/Model/Config/Share.php | 8 +- .../Model/Convert/Adapter/Customer.php | 19 +- .../Model/Convert/Parser/Customer.php | 6 + .../core/Mage/Customer/Model/Customer.php | 15 + .../core/Mage/Customer/Model/Customer/Api.php | 6 + .../Customer/Attribute/Backend/Billing.php | 6 + .../Customer/Attribute/Backend/Password.php | 6 + .../Customer/Attribute/Backend/Shipping.php | 6 + .../Customer/Attribute/Backend/Store.php | 6 + .../Customer/Attribute/Backend/Website.php | 6 + .../Model/Customer/Attribute/Source/Group.php | 6 + .../Model/Customer/Attribute/Source/Store.php | 6 + .../Customer/Attribute/Source/Website.php | 6 + .../Mage/Customer/Model/Entity/Address.php | 6 + .../Address/Attribute/Backend/Region.php | 6 + .../Address/Attribute/Backend/Street.php | 6 + .../Address/Attribute/Source/Country.php | 6 + .../Address/Attribute/Source/Region.php | 6 + .../Model/Entity/Address/Collection.php | 6 + .../Mage/Customer/Model/Entity/Customer.php | 29 +- .../Model/Entity/Customer/Collection.php | 6 + .../core/Mage/Customer/Model/Entity/Group.php | 6 + .../Model/Entity/Group/Collection.php | 6 + .../core/Mage/Customer/Model/Entity/Setup.php | 6 + .../Model/Entity/Wishlist/Collection.php | 6 + app/code/core/Mage/Customer/Model/Group.php | 6 + .../core/Mage/Customer/Model/Group/Api.php | 6 + .../core/Mage/Customer/Model/Observer.php | 6 + app/code/core/Mage/Customer/Model/Session.php | 6 + .../controllers/AccountController.php | 8 + .../controllers/AddressController.php | 6 + .../Customer/controllers/ReviewController.php | 6 + app/code/core/Mage/Customer/etc/api.xml | 6 + app/code/core/Mage/Customer/etc/config.xml | 8 +- app/code/core/Mage/Customer/etc/system.xml | 30 +- .../customer_setup/mysql4-install-0.7.0.php | 6 + .../customer_setup/mysql4-install-0.8.0.php | 6 + .../mysql4-upgrade-0.6.1-0.7.0.php | 6 + .../mysql4-upgrade-0.7.0-0.7.1.php | 6 + .../mysql4-upgrade-0.7.1-0.7.2.php | 6 + .../mysql4-upgrade-0.7.2-0.7.3.php | 6 + .../mysql4-upgrade-0.8.0-0.8.1.php | 6 + .../mysql4-upgrade-0.8.2-0.8.3.php | 6 + .../mysql4-upgrade-0.8.4-0.8.5.php | 6 + .../mysql4-upgrade-0.8.5-0.8.6.php | 6 + .../mysql4-upgrade-0.8.6-0.8.7.php | 6 + .../mysql4-upgrade-0.8.7-0.8.8.php | 6 + app/code/core/Mage/Dataflow/Helper/Data.php | 6 + app/code/core/Mage/Dataflow/Model/Batch.php | 6 + .../Mage/Dataflow/Model/Batch/Abstract.php | 16 + .../core/Mage/Dataflow/Model/Batch/Export.php | 6 + .../core/Mage/Dataflow/Model/Batch/Import.php | 6 + .../core/Mage/Dataflow/Model/Batch/Io.php | 6 + app/code/core/Mage/Dataflow/Model/Convert.php | 6 + .../Mage/Dataflow/Model/Convert/Action.php | 6 + .../Model/Convert/Action/Abstract.php | 6 + .../Model/Convert/Action/Interface.php | 6 + .../Model/Convert/Adapter/Abstract.php | 6 + .../Model/Convert/Adapter/Db/Table.php | 6 + .../Dataflow/Model/Convert/Adapter/Http.php | 6 + .../Model/Convert/Adapter/Http/Curl.php | 6 + .../Model/Convert/Adapter/Interface.php | 6 + .../Dataflow/Model/Convert/Adapter/Io.php | 6 + .../Dataflow/Model/Convert/Adapter/Soap.php | 6 + .../Dataflow/Model/Convert/Adapter/Std.php | 6 + .../Model/Convert/Adapter/Zend/Cache.php | 6 + .../Model/Convert/Adapter/Zend/Db.php | 6 + .../Model/Convert/Container/Abstract.php | 6 + .../Model/Convert/Container/Collection.php | 6 + .../Model/Convert/Container/Generic.php | 6 + .../Model/Convert/Container/Interface.php | 6 + .../Mage/Dataflow/Model/Convert/Exception.php | 6 + .../Dataflow/Model/Convert/Iterator/Http.php | 6 + .../Model/Convert/Iterator/Interface.php | 6 + .../Model/Convert/Mapper/Abstract.php | 6 + .../Dataflow/Model/Convert/Mapper/Column.php | 6 + .../Model/Convert/Mapper/Interface.php | 6 + .../Model/Convert/Parser/Abstract.php | 6 + .../Dataflow/Model/Convert/Parser/Csv.php | 6 + .../Model/Convert/Parser/Interface.php | 6 + .../Model/Convert/Parser/Serialize.php | 6 + .../Model/Convert/Parser/Xml/Excel.php | 6 + .../Mage/Dataflow/Model/Convert/Profile.php | 6 + .../Model/Convert/Profile/Abstract.php | 6 + .../Model/Convert/Profile/Collection.php | 6 + .../Model/Convert/Profile/Interface.php | 6 + .../Model/Convert/Validator/Abstract.php | 6 + .../Model/Convert/Validator/Column.php | 6 + .../Model/Convert/Validator/Dryrun.php | 6 + .../Model/Convert/Validator/Interface.php | 6 + app/code/core/Mage/Dataflow/Model/Import.php | 6 + .../core/Mage/Dataflow/Model/Mysql4/Batch.php | 6 + .../Dataflow/Model/Mysql4/Batch/Abstract.php | 6 + .../Model/Mysql4/Batch/Collection.php | 6 + .../Dataflow/Model/Mysql4/Batch/Export.php | 6 + .../Dataflow/Model/Mysql4/Batch/Import.php | 6 + .../Mage/Dataflow/Model/Mysql4/Catalogold.php | 6 + .../Mage/Dataflow/Model/Mysql4/Import.php | 6 + .../Model/Mysql4/Import/Collection.php | 6 + .../Mage/Dataflow/Model/Mysql4/Profile.php | 6 + .../Model/Mysql4/Profile/Collection.php | 6 + .../Dataflow/Model/Mysql4/Profile/History.php | 6 + .../Mysql4/Profile/History/Collection.php | 6 + .../Mage/Dataflow/Model/Mysql4/Session.php | 6 + app/code/core/Mage/Dataflow/Model/Profile.php | 64 +- .../Mage/Dataflow/Model/Profile/History.php | 6 + app/code/core/Mage/Dataflow/Model/Session.php | 6 + .../Dataflow/Model/Session/Adapter/Http.php | 6 + .../Dataflow/Model/Session/Parser/Csv.php | 6 + app/code/core/Mage/Dataflow/etc/config.xml | 6 + .../dataflow_setup/mysql4-install-0.7.0.php | 6 + .../mysql4-upgrade-0.7.2-0.7.3.php | 6 + .../mysql4-upgrade-0.7.3-0.7.4.php | 6 + .../Adminhtml/Frontend/Currency/Base.php | 6 + .../Adminhtml/Frontend/Region/Updater.php | 6 + .../core/Mage/Directory/Block/Currency.php | 6 + app/code/core/Mage/Directory/Block/Data.php | 6 + app/code/core/Mage/Directory/Exception.php | 6 + app/code/core/Mage/Directory/Helper/Data.php | 6 + app/code/core/Mage/Directory/Helper/Url.php | 6 + .../core/Mage/Directory/Model/Country.php | 6 + .../core/Mage/Directory/Model/Country/Api.php | 6 + .../Mage/Directory/Model/Country/Format.php | 6 + .../core/Mage/Directory/Model/Currency.php | 6 + .../Mage/Directory/Model/Currency/Filter.php | 6 + .../Model/Currency/Import/Abstract.php | 6 + .../Model/Currency/Import/Webservicex.php | 6 + .../Mage/Directory/Model/Mysql4/Country.php | 6 + .../Model/Mysql4/Country/Collection.php | 8 +- .../Directory/Model/Mysql4/Country/Format.php | 6 + .../Mysql4/Country/Format/Collection.php | 6 + .../Mage/Directory/Model/Mysql4/Currency.php | 6 + .../Model/Mysql4/Currency/Collection.php | 6 + .../Mage/Directory/Model/Mysql4/Region.php | 6 + .../Model/Mysql4/Region/Collection.php | 6 + .../core/Mage/Directory/Model/Observer.php | 6 + app/code/core/Mage/Directory/Model/Region.php | 6 + .../core/Mage/Directory/Model/Region/Api.php | 6 + .../controllers/CurrencyController.php | 6 + app/code/core/Mage/Directory/etc/api.xml | 6 + app/code/core/Mage/Directory/etc/config.xml | 12 +- app/code/core/Mage/Directory/etc/system.xml | 2 +- .../directory_setup/mysql4-install-0.7.0.php | 6 + .../directory_setup/mysql4-install-0.8.0.php | 6 + .../mysql4-upgrade-0.7.0-0.7.1.php | 6 + .../mysql4-upgrade-0.7.1-0.7.2.php | 6 + .../mysql4-upgrade-0.8.0-0.8.1.php | 73 + app/code/core/Mage/Eav/Exception.php | 6 + app/code/core/Mage/Eav/Helper/Data.php | 6 + app/code/core/Mage/Eav/Model/Config.php | 6 + .../Mage/Eav/Model/Convert/Adapter/Entity.php | 16 +- .../Mage/Eav/Model/Convert/Adapter/Grid.php | 6 + .../Eav/Model/Convert/Parser/Abstract.php | 6 + app/code/core/Mage/Eav/Model/Entity.php | 6 + .../core/Mage/Eav/Model/Entity/Abstract.php | 12 +- .../core/Mage/Eav/Model/Entity/Attribute.php | 6 + .../Eav/Model/Entity/Attribute/Abstract.php | 6 + .../Entity/Attribute/Backend/Abstract.php | 6 + .../Model/Entity/Attribute/Backend/Array.php | 6 + .../Entity/Attribute/Backend/Datetime.php | 15 + .../Entity/Attribute/Backend/Default.php | 6 + .../Entity/Attribute/Backend/Increment.php | 6 + .../Entity/Attribute/Backend/Interface.php | 6 + .../Model/Entity/Attribute/Backend/Store.php | 6 + .../Entity/Attribute/Backend/Time/Created.php | 6 + .../Entity/Attribute/Backend/Time/Updated.php | 6 + .../Eav/Model/Entity/Attribute/Exception.php | 6 + .../Entity/Attribute/Frontend/Abstract.php | 6 + .../Entity/Attribute/Frontend/Datetime.php | 6 + .../Entity/Attribute/Frontend/Default.php | 6 + .../Entity/Attribute/Frontend/Interface.php | 6 + .../Mage/Eav/Model/Entity/Attribute/Group.php | 6 + .../Eav/Model/Entity/Attribute/Interface.php | 6 + .../Eav/Model/Entity/Attribute/Option.php | 6 + .../Mage/Eav/Model/Entity/Attribute/Set.php | 6 + .../Entity/Attribute/Source/Abstract.php | 6 + .../Model/Entity/Attribute/Source/Boolean.php | 6 + .../Model/Entity/Attribute/Source/Config.php | 6 + .../Entity/Attribute/Source/Interface.php | 6 + .../Model/Entity/Attribute/Source/Store.php | 6 + .../Model/Entity/Attribute/Source/Table.php | 21 +- .../core/Mage/Eav/Model/Entity/Collection.php | 6 + .../Eav/Model/Entity/Collection/Abstract.php | 6 + .../Eav/Model/Entity/Increment/Abstract.php | 6 + .../Eav/Model/Entity/Increment/Alphanum.php | 6 + .../Eav/Model/Entity/Increment/Interface.php | 6 + .../Eav/Model/Entity/Increment/Numeric.php | 6 + .../core/Mage/Eav/Model/Entity/Interface.php | 6 + app/code/core/Mage/Eav/Model/Entity/Setup.php | 6 + app/code/core/Mage/Eav/Model/Entity/Store.php | 6 + app/code/core/Mage/Eav/Model/Entity/Type.php | 6 + .../core/Mage/Eav/Model/Mysql4/Config.php | 6 + .../Eav/Model/Mysql4/Entity/Attribute.php | 16 +- .../Mysql4/Entity/Attribute/Collection.php | 6 + .../Model/Mysql4/Entity/Attribute/Group.php | 6 + .../Entity/Attribute/Group/Collection.php | 6 + .../Model/Mysql4/Entity/Attribute/Option.php | 6 + .../Entity/Attribute/Option/Collection.php | 22 +- .../Eav/Model/Mysql4/Entity/Attribute/Set.php | 6 + .../Entity/Attribute/Set/Collection.php | 6 + .../Mage/Eav/Model/Mysql4/Entity/Store.php | 6 + .../Mage/Eav/Model/Mysql4/Entity/Type.php | 6 + .../Model/Mysql4/Entity/Type/Collection.php | 6 + app/code/core/Mage/Eav/etc/config.xml | 8 +- .../sql/eav_setup/mysql4-install-0.7.0.php | 6 + .../eav_setup/mysql4-upgrade-0.7.0-0.7.1.php | 6 + .../eav_setup/mysql4-upgrade-0.7.1-0.7.2.php | 6 + .../eav_setup/mysql4-upgrade-0.7.2-0.7.3.php | 6 + .../eav_setup/mysql4-upgrade-0.7.3-0.7.4.php | 6 + .../eav_setup/mysql4-upgrade-0.7.4-0.7.5.php | 6 + .../eav_setup/mysql4-upgrade-0.7.5-0.7.6.php | 6 + .../eav_setup/mysql4-upgrade-0.7.6-0.7.7.php | 6 + .../eav_setup/mysql4-upgrade-0.7.7-0.7.8.php | 6 + .../eav_setup/mysql4-upgrade-0.7.8-0.7.9.php | 6 + .../eav_setup/mysql4-upgrade-0.7.9-0.7.10.php | 6 + .../Mage/GiftMessage/Block/Message/Form.php | 6 + .../Mage/GiftMessage/Block/Message/Helper.php | 6 + .../Mage/GiftMessage/Block/Message/Inline.php | 6 + .../core/Mage/GiftMessage/Helper/Data.php | 6 + .../core/Mage/GiftMessage/Helper/Message.php | 6 + app/code/core/Mage/GiftMessage/Helper/Url.php | 6 + .../Attribute/Backend/Boolean/Config.php | 6 + .../Attribute/Source/Boolean/Config.php | 6 + .../core/Mage/GiftMessage/Model/Message.php | 6 + .../Mage/GiftMessage/Model/Mysql4/Message.php | 6 + .../Model/Mysql4/Message/Collection.php | 6 + .../Mage/GiftMessage/Model/Mysql4/Setup.php | 6 + .../core/Mage/GiftMessage/Model/Observer.php | 6 + .../controllers/IndexController.php | 6 + app/code/core/Mage/GiftMessage/etc/config.xml | 6 + app/code/core/Mage/GiftMessage/etc/system.xml | 6 + .../mysql4-install-0.7.0.php | 6 + .../mysql4-upgrade-0.1.3-0.7.0.php | 6 + .../mysql4-upgrade-0.7.0-0.7.1.php | 6 + .../mysql4-upgrade-0.7.1-0.7.2.php | 6 + .../core/Mage/GoogleAnalytics/Block/Ga.php | 6 + .../core/Mage/GoogleAnalytics/Helper/Data.php | 6 + .../Mage/GoogleAnalytics/Model/Observer.php | 6 + .../core/Mage/GoogleAnalytics/etc/config.xml | 6 + .../core/Mage/GoogleAnalytics/etc/system.xml | 6 + .../Block/Adminhtml/Shipping/Merchant.php | 30 +- .../core/Mage/GoogleCheckout/Block/Form.php | 6 + .../core/Mage/GoogleCheckout/Block/Link.php | 6 + .../Mage/GoogleCheckout/Block/Redirect.php | 6 + .../core/Mage/GoogleCheckout/Exception.php | 6 + .../core/Mage/GoogleCheckout/Helper/Data.php | 6 + .../core/Mage/GoogleCheckout/Model/Api.php | 13 +- .../Mage/GoogleCheckout/Model/Api/Debug.php | 6 + .../GoogleCheckout/Model/Api/Xml/Abstract.php | 8 +- .../Model/Api/Xml/Calculate.php | 6 + .../GoogleCheckout/Model/Api/Xml/Callback.php | 126 +- .../GoogleCheckout/Model/Api/Xml/Checkout.php | 108 +- .../GoogleCheckout/Model/Api/Xml/Order.php | 13 +- .../GoogleCheckout/Model/Mysql4/Api/Debug.php | 6 + .../Model/Mysql4/Api/Debug/Collection.php | 6 + .../GoogleCheckout/Model/Mysql4/Setup.php | 6 + .../Mage/GoogleCheckout/Model/Mysql4/Tax.php | 6 + .../Mage/GoogleCheckout/Model/Observer.php | 28 + .../Mage/GoogleCheckout/Model/Payment.php | 20 +- .../Mage/GoogleCheckout/Model/Shipping.php | 6 + .../Model/Source/Checkout/Image.php | 18 +- .../GoogleCheckout/Model/Source/Locale.php | 11 +- .../Model/Source/Shipping/Carrier.php | 6 + .../Model/Source/Shipping/Category.php | 6 + .../Model/Source/Shipping/Units.php | 6 + .../controllers/ApiController.php | 6 + .../controllers/RedirectController.php | 23 + .../core/Mage/GoogleCheckout/etc/config.xml | 21 + .../core/Mage/GoogleCheckout/etc/system.xml | 113 +- .../mysql4-install-0.7.0.php | 6 + app/code/core/Mage/Install/Block/Abstract.php | 6 + app/code/core/Mage/Install/Block/Admin.php | 6 + app/code/core/Mage/Install/Block/Begin.php | 6 + app/code/core/Mage/Install/Block/Config.php | 6 + app/code/core/Mage/Install/Block/Download.php | 6 + app/code/core/Mage/Install/Block/End.php | 6 + app/code/core/Mage/Install/Block/Locale.php | 6 + app/code/core/Mage/Install/Block/State.php | 6 + .../core/Mage/Install/Controller/Action.php | 6 + app/code/core/Mage/Install/Helper/Data.php | 6 + app/code/core/Mage/Install/Model/Config.php | 6 + .../core/Mage/Install/Model/Installer.php | 6 + .../Mage/Install/Model/Installer/Abstract.php | 6 + .../Mage/Install/Model/Installer/Config.php | 6 + .../Mage/Install/Model/Installer/Console.php | 6 + .../Mage/Install/Model/Installer/Data.php | 6 + .../core/Mage/Install/Model/Installer/Db.php | 6 + .../core/Mage/Install/Model/Installer/Env.php | 6 + .../Install/Model/Installer/Filesystem.php | 6 + .../Mage/Install/Model/Installer/Pear.php | 6 + app/code/core/Mage/Install/Model/Observer.php | 6 + app/code/core/Mage/Install/Model/Session.php | 6 + app/code/core/Mage/Install/Model/Wizard.php | 6 + .../Install/controllers/IndexController.php | 6 + .../Install/controllers/WizardController.php | 6 + app/code/core/Mage/Install/etc/config.xml | 6 + app/code/core/Mage/Install/etc/install.xml | 6 + app/code/core/Mage/Log/Helper/Data.php | 6 + app/code/core/Mage/Log/Model/Aggregation.php | 6 + app/code/core/Mage/Log/Model/Customer.php | 6 + .../Mage/Log/Model/Mysql4/Aggregation.php | 6 + .../core/Mage/Log/Model/Mysql4/Customer.php | 6 + .../core/Mage/Log/Model/Mysql4/Visitor.php | 6 + .../Log/Model/Mysql4/Visitor/Aggregator.php | 6 + .../Log/Model/Mysql4/Visitor/Collection.php | 6 + app/code/core/Mage/Log/Model/Visitor.php | 6 + .../Mage/Log/Model/Visitor/Aggregator.php | 6 + app/code/core/Mage/Log/etc/config.xml | 6 + .../sql/log_setup/mysql4-install-0.7.0.php | 6 + .../log_setup/mysql4-upgrade-0.7.0-0.7.1.php | 6 + .../log_setup/mysql4-upgrade-0.7.1-0.7.2.php | 6 + app/code/core/Mage/Media/Helper/Data.php | 6 + app/code/core/Mage/Media/Model/File/Image.php | 6 + app/code/core/Mage/Media/Model/Image.php | 6 + .../Media/Model/Image/Config/Interface.php | 6 + app/code/core/Mage/Media/etc/config.xml | 6 + .../core/Mage/Newsletter/Block/Subscribe.php | 6 + app/code/core/Mage/Newsletter/Helper/Data.php | 6 + .../core/Mage/Newsletter/Model/Message.php | 6 + .../Mage/Newsletter/Model/Mysql4/Problem.php | 6 + .../Model/Mysql4/Problem/Collection.php | 6 + .../Mage/Newsletter/Model/Mysql4/Queue.php | 6 + .../Model/Mysql4/Queue/Collection.php | 6 + .../Newsletter/Model/Mysql4/Subscriber.php | 6 + .../Model/Mysql4/Subscriber/Collection.php | 6 + .../Mage/Newsletter/Model/Mysql4/Template.php | 6 + .../Model/Mysql4/Template/Collection.php | 6 + .../core/Mage/Newsletter/Model/Observer.php | 6 + .../core/Mage/Newsletter/Model/Problem.php | 6 + app/code/core/Mage/Newsletter/Model/Queue.php | 6 + .../core/Mage/Newsletter/Model/Session.php | 6 + .../core/Mage/Newsletter/Model/Subscriber.php | 205 +- .../core/Mage/Newsletter/Model/Template.php | 6 + .../controllers/ManageController.php | 9 +- .../controllers/SubscriberController.php | 6 + app/code/core/Mage/Newsletter/etc/config.xml | 10 +- app/code/core/Mage/Newsletter/etc/system.xml | 6 + .../newsletter_setup/mysql4-install-0.7.0.php | 6 + .../newsletter_setup/mysql4-install-0.8.0.php | 6 + .../mysql4-upgrade-0.7.0-0.7.1.php | 6 + app/code/core/Mage/Page/Block/Html.php | 50 +- .../core/Mage/Page/Block/Html/Breadcrumbs.php | 6 + app/code/core/Mage/Page/Block/Html/Footer.php | 6 + app/code/core/Mage/Page/Block/Html/Head.php | 20 +- app/code/core/Mage/Page/Block/Html/Header.php | 6 + app/code/core/Mage/Page/Block/Html/Pager.php | 6 + .../core/Mage/Page/Block/Html/Toplinks.php | 6 + .../core/Mage/Page/Block/Js/Translate.php | 6 + app/code/core/Mage/Page/Block/Redirect.php | 6 + app/code/core/Mage/Page/Block/Switch.php | 6 + .../Mage/Page/Block/Template/Container.php | 6 + .../core/Mage/Page/Block/Template/Links.php | 6 + app/code/core/Mage/Page/Helper/Data.php | 6 + app/code/core/Mage/Page/Helper/Html.php | 6 + app/code/core/Mage/Page/etc/config.xml | 6 + app/code/core/Mage/Page/etc/system.xml | 15 + app/code/core/Mage/Paygate/Helper/Data.php | 6 + .../core/Mage/Paygate/Model/Authorizenet.php | 19 +- .../Mage/Paygate/Model/Authorizenet/Debug.php | 6 + .../Paygate/Model/Authorizenet/Request.php | 6 + .../Paygate/Model/Authorizenet/Result.php | 6 + .../Model/Authorizenet/Source/Cctype.php | 6 + .../Authorizenet/Source/PaymentAction.php | 6 + .../Model/Mysql4/Authorizenet/Debug.php | 6 + .../Mysql4/Authorizenet/Debug/Collection.php | 6 + .../core/Mage/Paygate/Model/Payflow/Pro.php | 6 + .../Paygate/Model/Payflow/Pro/Request.php | 6 + .../Mage/Paygate/Model/Payflow/Pro/Result.php | 6 + .../Paygate/Model/Payflow/Source/Cctype.php | 6 + .../Model/Payflow/Source/PaymentAction.php | 6 + app/code/core/Mage/Paygate/etc/config.xml | 6 + app/code/core/Mage/Paygate/etc/system.xml | 64 +- .../paygate_setup/mysql4-install-0.7.0.php | 6 + app/code/core/Mage/Payment/Block/Form.php | 6 + app/code/core/Mage/Payment/Block/Form/Cc.php | 6 + .../core/Mage/Payment/Block/Form/Ccsave.php | 6 + .../core/Mage/Payment/Block/Form/Checkmo.php | 6 + .../Mage/Payment/Block/Form/Container.php | 6 + .../Mage/Payment/Block/Form/Purchaseorder.php | 6 + app/code/core/Mage/Payment/Block/Info.php | 6 + app/code/core/Mage/Payment/Block/Info/Cc.php | 6 + .../core/Mage/Payment/Block/Info/Ccsave.php | 6 + .../core/Mage/Payment/Block/Info/Checkmo.php | 6 + .../Mage/Payment/Block/Info/Container.php | 6 + .../Mage/Payment/Block/Info/Purchaseorder.php | 6 + app/code/core/Mage/Payment/Exception.php | 6 + app/code/core/Mage/Payment/Helper/Data.php | 6 + app/code/core/Mage/Payment/Model/Config.php | 24 +- app/code/core/Mage/Payment/Model/Info.php | 6 + .../Mage/Payment/Model/Method/Abstract.php | 37 +- .../core/Mage/Payment/Model/Method/Cc.php | 6 + .../core/Mage/Payment/Model/Method/Ccsave.php | 6 + .../Mage/Payment/Model/Method/Checkmo.php | 6 + .../core/Mage/Payment/Model/Method/Free.php | 6 + .../Payment/Model/Method/Purchaseorder.php | 6 + .../Mage/Payment/Model/Paygate/Request.php | 6 + .../Mage/Payment/Model/Paygate/Result.php | 6 + .../core/Mage/Payment/Model/Source/Cctype.php | 6 + app/code/core/Mage/Payment/etc/config.xml | 6 + app/code/core/Mage/Payment/etc/system.xml | 22 +- .../core/Mage/Paypal/Block/Express/Form.php | 6 + .../core/Mage/Paypal/Block/Express/Info.php | 6 + .../core/Mage/Paypal/Block/Express/Review.php | 6 + .../Paypal/Block/Express/Review/Details.php | 6 + .../core/Mage/Paypal/Block/Link/Shortcut.php | 6 + .../core/Mage/Paypal/Block/Standard/Form.php | 6 + app/code/core/Mage/Paypal/Helper/Data.php | 6 + app/code/core/Mage/Paypal/Model/Abstract.php | 6 + .../core/Mage/Paypal/Model/Api/Abstract.php | 6 + app/code/core/Mage/Paypal/Model/Api/Debug.php | 6 + app/code/core/Mage/Paypal/Model/Api/Nvp.php | 10 +- app/code/core/Mage/Paypal/Model/Direct.php | 17 +- app/code/core/Mage/Paypal/Model/Express.php | 140 +- .../core/Mage/Paypal/Model/Express/Review.php | 6 + .../Mage/Paypal/Model/Mysql4/Api/Debug.php | 6 + .../Model/Mysql4/Api/Debug/Collection.php | 6 + .../core/Mage/Paypal/Model/Mysql4/Setup.php | 6 + app/code/core/Mage/Paypal/Model/Session.php | 6 + .../core/Mage/Paypal/Model/Source/Cctype.php | 6 + .../Paypal/Model/Source/PaymentAction.php | 6 + .../Paypal/Model/Source/StandardAction.php | 6 + app/code/core/Mage/Paypal/Model/Standard.php | 60 +- .../Paypal/controllers/ExpressController.php | 151 +- .../Paypal/controllers/StandardController.php | 18 +- app/code/core/Mage/Paypal/etc/config.xml | 9 +- app/code/core/Mage/Paypal/etc/system.xml | 14 +- .../sql/paypal_setup/mysql4-install-0.7.0.php | 6 + .../core/Mage/PaypalUk/Block/Direct/Form.php | 6 + .../core/Mage/PaypalUk/Block/Direct/Info.php | 6 + .../core/Mage/PaypalUk/Block/Express/Form.php | 6 + .../core/Mage/PaypalUk/Block/Express/Info.php | 6 + .../Mage/PaypalUk/Block/Express/Review.php | 6 + .../PaypalUk/Block/Express/Review/Details.php | 6 + .../Mage/PaypalUk/Block/Link/Shortcut.php | 6 + app/code/core/Mage/PaypalUk/Helper/Data.php | 6 + .../core/Mage/PaypalUk/Model/Api/Abstract.php | 6 + .../core/Mage/PaypalUk/Model/Api/Debug.php | 6 + app/code/core/Mage/PaypalUk/Model/Api/Pro.php | 12 +- .../core/Mage/PaypalUk/Model/Api/Result.php | 6 + app/code/core/Mage/PaypalUk/Model/Direct.php | 6 + app/code/core/Mage/PaypalUk/Model/Express.php | 150 +- .../Mage/PaypalUk/Model/Express/Review.php | 6 + .../Mage/PaypalUk/Model/Mysql4/Api/Debug.php | 6 + .../Model/Mysql4/Api/Debug/Collection.php | 6 + app/code/core/Mage/PaypalUk/Model/Session.php | 6 + .../Mage/PaypalUk/Model/Source/Cctype.php | 6 + .../PaypalUk/Model/Source/PaymentAction.php | 6 + .../controllers/ExpressController.php | 154 +- app/code/core/Mage/PaypalUk/etc/config.xml | 6 + app/code/core/Mage/PaypalUk/etc/system.xml | 10 +- .../paypaluk_setup/mysql4-install-0.7.0.php | 6 + app/code/core/Mage/Poll/Block/ActivePoll.php | 6 + app/code/core/Mage/Poll/Block/Poll.php | 6 + app/code/core/Mage/Poll/Helper/Data.php | 6 + app/code/core/Mage/Poll/Model/Mysql4/Poll.php | 6 + .../Mage/Poll/Model/Mysql4/Poll/Answer.php | 6 + .../Model/Mysql4/Poll/Answer/Collection.php | 6 + .../Poll/Model/Mysql4/Poll/Collection.php | 6 + .../core/Mage/Poll/Model/Mysql4/Poll/Vote.php | 6 + app/code/core/Mage/Poll/Model/Poll.php | 6 + app/code/core/Mage/Poll/Model/Poll/Answer.php | 6 + app/code/core/Mage/Poll/Model/Poll/Vote.php | 6 + .../Mage/Poll/controllers/VoteController.php | 6 + app/code/core/Mage/Poll/etc/config.xml | 6 + app/code/core/Mage/Poll/etc/system.xml | 6 + .../sql/poll_setup/mysql4-install-0.7.0.php | 6 + .../poll_setup/mysql4-upgrade-0.6.0-0.6.1.php | 6 + .../poll_setup/mysql4-upgrade-0.7.1-0.7.2.php | 6 + .../Mage/ProductAlert/Block/Email/Price.php | 6 + .../Mage/ProductAlert/Block/Email/Stock.php | 6 + .../core/Mage/ProductAlert/Block/Price.php | 6 + .../core/Mage/ProductAlert/Block/Stock.php | 6 + .../core/Mage/ProductAlert/Helper/Data.php | 6 + .../core/Mage/ProductAlert/Model/Email.php | 6 + .../Mage/ProductAlert/Model/Mysql4/Price.php | 6 + .../Model/Mysql4/Price/Collection.php | 6 + .../Mysql4/Price/Customer/Collection.php | 6 + .../Mage/ProductAlert/Model/Mysql4/Stock.php | 6 + .../Model/Mysql4/Stock/Collection.php | 6 + .../Mysql4/Stock/Customer/Collection.php | 6 + .../core/Mage/ProductAlert/Model/Observer.php | 6 + .../core/Mage/ProductAlert/Model/Price.php | 6 + .../core/Mage/ProductAlert/Model/Stock.php | 6 + .../controllers/AddController.php | 6 + .../controllers/UnsubscribeController.php | 6 + .../core/Mage/ProductAlert/etc/config.xml | 6 + .../core/Mage/ProductAlert/etc/system.xml | 6 + .../mysql4-install-0.7.0.php | 6 + .../Mage/Rating/Block/Entity/Detailed.php | 6 + app/code/core/Mage/Rating/Helper/Data.php | 6 + .../core/Mage/Rating/Model/Mysql4/Rating.php | 6 + .../Rating/Model/Mysql4/Rating/Collection.php | 8 + .../Rating/Model/Mysql4/Rating/Entity.php | 6 + .../Rating/Model/Mysql4/Rating/Option.php | 66 +- .../Model/Mysql4/Rating/Option/Collection.php | 6 + .../Model/Mysql4/Rating/Option/Vote.php | 6 + .../Mysql4/Rating/Option/Vote/Collection.php | 6 + .../Mage/Rating/Model/Mysql4/Rating/Value.php | 6 + app/code/core/Mage/Rating/Model/Rating.php | 6 + .../core/Mage/Rating/Model/Rating/Entity.php | 6 + .../core/Mage/Rating/Model/Rating/Option.php | 6 + .../Mage/Rating/Model/Rating/Option/Vote.php | 6 + .../core/Mage/Rating/Model/Rating/Value.php | 6 + app/code/core/Mage/Rating/etc/config.xml | 6 + .../sql/rating_setup/mysql4-install-0.7.0.php | 6 + .../mysql4-upgrade-0.7.0-0.7.1.php | 6 + .../mysql4-upgrade-0.7.1-0.7.2.php | 6 + .../Mage/Reports/Block/Product/Compared.php | 10 +- .../Mage/Reports/Block/Product/Viewed.php | 10 +- app/code/core/Mage/Reports/Exception.php | 6 + app/code/core/Mage/Reports/Helper/Data.php | 6 + app/code/core/Mage/Reports/Model/Config.php | 6 + app/code/core/Mage/Reports/Model/Event.php | 6 + .../Mage/Reports/Model/Event/Observer.php | 6 + .../core/Mage/Reports/Model/Event/Type.php | 6 + .../Model/Mysql4/Accounts/Collection.php | 6 + .../Model/Mysql4/Coupons/Collection.php | 6 + .../Model/Mysql4/Customer/Collection.php | 6 + .../Mysql4/Customer/Orders/Collection.php | 6 + .../Mysql4/Customer/Totals/Collection.php | 6 + .../Entity/Summary/Collection/Abstract.php | 6 + .../core/Mage/Reports/Model/Mysql4/Event.php | 6 + .../Reports/Model/Mysql4/Event/Collection.php | 6 + .../Mage/Reports/Model/Mysql4/Event/Type.php | 6 + .../Model/Mysql4/Event/Type/Collection.php | 6 + .../Model/Mysql4/Invoiced/Collection.php | 6 + .../Reports/Model/Mysql4/Order/Collection.php | 9 +- .../Model/Mysql4/Product/Collection.php | 22 +- .../Mysql4/Product/Ordered/Collection.php | 6 + .../Mysql4/Product/Viewed/Collection.php | 6 + .../Reports/Model/Mysql4/Quote/Collection.php | 6 + .../Model/Mysql4/Refunded/Collection.php | 14 +- .../Model/Mysql4/Report/Collection.php | 6 + .../Model/Mysql4/Review/Collection.php | 6 + .../Mysql4/Review/Customer/Collection.php | 6 + .../Mysql4/Review/Product/Collection.php | 22 +- .../Model/Mysql4/Shipping/Collection.php | 6 + .../Mysql4/Shopcart/Product/Collection.php | 6 + .../Reports/Model/Mysql4/Tag/Collection.php | 6 + .../Model/Mysql4/Tag/Customer/Collection.php | 6 + .../Model/Mysql4/Tag/Product/Collection.php | 6 + .../Reports/Model/Mysql4/Tax/Collection.php | 6 + .../Model/Mysql4/Wishlist/Collection.php | 6 + .../Mysql4/Wishlist/Product/Collection.php | 6 + app/code/core/Mage/Reports/Model/Report.php | 6 + app/code/core/Mage/Reports/Model/Session.php | 6 + app/code/core/Mage/Reports/Model/Test.php | 6 + app/code/core/Mage/Reports/Model/Totals.php | 7 + app/code/core/Mage/Reports/etc/config.xml | 6 + app/code/core/Mage/Reports/etc/system.xml | 6 + .../reports_setup/mysql4-install-0.7.1.php | 6 + .../mysql4-upgrade-0.7.0-0.7.1.php | 6 + .../mysql4-upgrade-0.7.1-0.7.2.php | 6 + .../mysql4-upgrade-0.7.2-0.7.3.php | 6 + .../mysql4-upgrade-0.7.3-0.7.4.php | 6 + .../mysql4-upgrade-0.7.4-0.7.5.php | 6 + .../core/Mage/Review/Block/Customer/List.php | 6 + .../Mage/Review/Block/Customer/Recent.php | 6 + .../core/Mage/Review/Block/Customer/View.php | 6 + app/code/core/Mage/Review/Block/Form.php | 14 + app/code/core/Mage/Review/Block/Helper.php | 6 + .../core/Mage/Review/Block/Product/View.php | 6 + .../Mage/Review/Block/Product/View/List.php | 6 + app/code/core/Mage/Review/Block/View.php | 6 + app/code/core/Mage/Review/Helper/Data.php | 6 + .../core/Mage/Review/Model/Mysql4/Review.php | 81 + .../Review/Model/Mysql4/Review/Collection.php | 6 + .../Review/Model/Mysql4/Review/Comment.php | 6 + .../Mysql4/Review/Product/Collection.php | 6 + .../Model/Mysql4/Review/Status/Collection.php | 6 + .../Review/Model/Mysql4/Review/Summary.php | 6 + .../Mysql4/Review/Summary/Collection.php | 6 + app/code/core/Mage/Review/Model/Observer.php | 6 + app/code/core/Mage/Review/Model/Review.php | 6 + .../core/Mage/Review/Model/Review/Comment.php | 6 + .../core/Mage/Review/Model/Review/Summary.php | 6 + app/code/core/Mage/Review/Model/Session.php | 6 + .../Review/controllers/CustomerController.php | 12 +- .../Review/controllers/ProductController.php | 43 +- app/code/core/Mage/Review/etc/config.xml | 10 +- .../sql/review_setup/mysql4-install-0.7.0.php | 6 + .../mysql4-upgrade-0.7.0-0.7.1.php | 6 + .../mysql4-upgrade-0.7.1-0.7.2.php | 47 + .../mysql4-upgrade-0.7.2-0.7.3.php | 62 + .../core/Mage/Rss/Block/Catalog/Category.php | 8 +- app/code/core/Mage/Rss/Block/Catalog/New.php | 8 +- .../Mage/Rss/Block/Catalog/NotifyStock.php | 6 + .../core/Mage/Rss/Block/Catalog/Review.php | 6 + .../core/Mage/Rss/Block/Catalog/Salesrule.php | 6 + .../core/Mage/Rss/Block/Catalog/Special.php | 10 +- app/code/core/Mage/Rss/Block/Catalog/Tag.php | 8 +- app/code/core/Mage/Rss/Block/List.php | 6 + app/code/core/Mage/Rss/Block/Order/New.php | 6 + app/code/core/Mage/Rss/Block/Order/Status.php | 6 + app/code/core/Mage/Rss/Block/Wishlist.php | 8 +- app/code/core/Mage/Rss/Helper/Catalog.php | 6 + app/code/core/Mage/Rss/Helper/Data.php | 6 + app/code/core/Mage/Rss/Helper/Order.php | 6 + app/code/core/Mage/Rss/Model/Mysql4/Order.php | 6 + app/code/core/Mage/Rss/Model/Rss.php | 6 + app/code/core/Mage/Rss/Model/Session.php | 6 + .../Rss/controllers/CatalogController.php | 6 + .../Mage/Rss/controllers/IndexController.php | 6 + .../Mage/Rss/controllers/OrderController.php | 6 + app/code/core/Mage/Rss/etc/config.xml | 6 + app/code/core/Mage/Rss/etc/system.xml | 6 + app/code/core/Mage/Rule/Block/Actions.php | 6 + app/code/core/Mage/Rule/Block/Conditions.php | 6 + app/code/core/Mage/Rule/Block/Editable.php | 6 + app/code/core/Mage/Rule/Block/Newchild.php | 6 + app/code/core/Mage/Rule/Block/Rule.php | 6 + app/code/core/Mage/Rule/Helper/Data.php | 6 + .../core/Mage/Rule/Model/Action/Abstract.php | 10 +- .../Mage/Rule/Model/Action/Collection.php | 6 + .../core/Mage/Rule/Model/Action/Interface.php | 6 + .../Mage/Rule/Model/Condition/Abstract.php | 135 +- .../Mage/Rule/Model/Condition/Combine.php | 6 + .../Mage/Rule/Model/Condition/Interface.php | 6 + app/code/core/Mage/Rule/Model/Environment.php | 6 + app/code/core/Mage/Rule/Model/Mysql4/Rule.php | 6 + .../Rule/Model/Mysql4/Rule/Collection.php | 6 + .../core/Mage/Rule/Model/Renderer/Actions.php | 6 + .../Mage/Rule/Model/Renderer/Conditions.php | 6 + app/code/core/Mage/Rule/Model/Rule.php | 6 + app/code/core/Mage/Rule/etc/config.xml | 6 + .../core/Mage/Sales/Block/Items/Abstract.php | 6 + .../Mage/Sales/Block/Order/Creditmemo.php | 6 + .../Sales/Block/Order/Creditmemo/Items.php | 6 + .../core/Mage/Sales/Block/Order/Details.php | 6 + .../Block/Order/Email/Creditmemo/Items.php | 6 + .../Sales/Block/Order/Email/Invoice/Items.php | 6 + .../Mage/Sales/Block/Order/Email/Items.php | 6 + .../Sales/Block/Order/Email/Items/Default.php | 14 + .../Block/Order/Email/Items/Order/Default.php | 14 + .../Block/Order/Email/Shipment/Items.php | 6 + .../core/Mage/Sales/Block/Order/History.php | 7 + app/code/core/Mage/Sales/Block/Order/Info.php | 6 + .../core/Mage/Sales/Block/Order/Invoice.php | 6 + .../Mage/Sales/Block/Order/Invoice/Items.php | 6 + .../Block/Order/Item/Renderer/Default.php | 19 + .../core/Mage/Sales/Block/Order/Items.php | 6 + .../core/Mage/Sales/Block/Order/Print.php | 6 + .../Sales/Block/Order/Print/Creditmemo.php | 6 + .../Mage/Sales/Block/Order/Print/Invoice.php | 6 + .../Mage/Sales/Block/Order/Print/Shipment.php | 6 + .../core/Mage/Sales/Block/Order/Recent.php | 8 + .../core/Mage/Sales/Block/Order/Shipment.php | 6 + .../Mage/Sales/Block/Order/Shipment/Items.php | 6 + app/code/core/Mage/Sales/Block/Order/Tax.php | 6 + app/code/core/Mage/Sales/Block/Order/View.php | 6 + .../core/Mage/Sales/Block/Reorder/Sidebar.php | 9 +- app/code/core/Mage/Sales/Exception.php | 6 + app/code/core/Mage/Sales/Helper/Data.php | 6 + app/code/core/Mage/Sales/Helper/Reorder.php | 6 + .../core/Mage/Sales/Model/Api/Resource.php | 10 + app/code/core/Mage/Sales/Model/Config.php | 6 + .../core/Mage/Sales/Model/Convert/Order.php | 6 + .../core/Mage/Sales/Model/Convert/Quote.php | 10 +- .../core/Mage/Sales/Model/Email/Template.php | 6 + .../core/Mage/Sales/Model/Entity/Order.php | 6 + .../Mage/Sales/Model/Entity/Order/Address.php | 6 + .../Model/Entity/Order/Address/Collection.php | 6 + .../Order/Attribute/Backend/Billing.php | 6 + .../Entity/Order/Attribute/Backend/Child.php | 6 + .../Entity/Order/Attribute/Backend/Parent.php | 6 + .../Order/Attribute/Backend/Shipping.php | 6 + .../Sales/Model/Entity/Order/Collection.php | 6 + .../Sales/Model/Entity/Order/Creditmemo.php | 6 + .../Creditmemo/Attribute/Backend/Child.php | 6 + .../Creditmemo/Attribute/Backend/Parent.php | 6 + .../Entity/Order/Creditmemo/Collection.php | 6 + .../Model/Entity/Order/Creditmemo/Comment.php | 6 + .../Order/Creditmemo/Comment/Collection.php | 6 + .../Model/Entity/Order/Creditmemo/Item.php | 6 + .../Order/Creditmemo/Item/Collection.php | 6 + .../Mage/Sales/Model/Entity/Order/Invoice.php | 6 + .../Order/Invoice/Attribute/Backend/Child.php | 6 + .../Order/Invoice/Attribute/Backend/Item.php | 6 + .../Order/Invoice/Attribute/Backend/Order.php | 6 + .../Invoice/Attribute/Backend/Parent.php | 6 + .../Model/Entity/Order/Invoice/Collection.php | 6 + .../Model/Entity/Order/Invoice/Comment.php | 6 + .../Order/Invoice/Comment/Collection.php | 6 + .../Sales/Model/Entity/Order/Invoice/Item.php | 6 + .../Entity/Order/Invoice/Item/Collection.php | 6 + .../Mage/Sales/Model/Entity/Order/Item.php | 6 + .../Model/Entity/Order/Item/Collection.php | 6 + .../Mage/Sales/Model/Entity/Order/Payment.php | 6 + .../Model/Entity/Order/Payment/Collection.php | 6 + .../Sales/Model/Entity/Order/Shipment.php | 6 + .../Shipment/Attribute/Backend/Child.php | 6 + .../Shipment/Attribute/Backend/Parent.php | 6 + .../Entity/Order/Shipment/Collection.php | 6 + .../Model/Entity/Order/Shipment/Comment.php | 6 + .../Order/Shipment/Comment/Collection.php | 6 + .../Model/Entity/Order/Shipment/Item.php | 6 + .../Entity/Order/Shipment/Item/Collection.php | 6 + .../Model/Entity/Order/Shipment/Track.php | 6 + .../Order/Shipment/Track/Collection.php | 6 + .../Model/Entity/Order/Status/History.php | 6 + .../Order/Status/History/Collection.php | 6 + .../core/Mage/Sales/Model/Entity/Quote.php | 6 + .../Mage/Sales/Model/Entity/Quote/Address.php | 6 + .../Quote/Address/Attribute/Backend.php | 6 + .../Quote/Address/Attribute/Backend/Child.php | 6 + .../Address/Attribute/Backend/Parent.php | 6 + .../Address/Attribute/Backend/Region.php | 6 + .../Quote/Address/Attribute/Frontend.php | 6 + .../Attribute/Frontend/Custbalance.php | 6 + .../Address/Attribute/Frontend/Discount.php | 6 + .../Address/Attribute/Frontend/Grand.php | 6 + .../Address/Attribute/Frontend/Shipping.php | 6 + .../Address/Attribute/Frontend/Subtotal.php | 6 + .../Quote/Address/Attribute/Frontend/Tax.php | 6 + .../Model/Entity/Quote/Address/Collection.php | 6 + .../Sales/Model/Entity/Quote/Address/Item.php | 6 + .../Entity/Quote/Address/Item/Collection.php | 6 + .../Sales/Model/Entity/Quote/Address/Rate.php | 6 + .../Entity/Quote/Address/Rate/Collection.php | 6 + .../Sales/Model/Entity/Quote/Collection.php | 6 + .../Mage/Sales/Model/Entity/Quote/Item.php | 6 + .../Model/Entity/Quote/Item/Collection.php | 6 + .../Mage/Sales/Model/Entity/Quote/Payment.php | 6 + .../Model/Entity/Quote/Payment/Collection.php | 6 + .../Sales/Model/Entity/Sale/Collection.php | 6 + .../core/Mage/Sales/Model/Entity/Setup.php | 6 + .../core/Mage/Sales/Model/Mysql4/Abstract.php | 6 + .../core/Mage/Sales/Model/Mysql4/Order.php | 6 + .../Mage/Sales/Model/Mysql4/Order/Address.php | 6 + .../Model/Mysql4/Order/Address/Collection.php | 6 + .../Order/Attribute/Backend/Billing.php | 6 + .../Mysql4/Order/Attribute/Backend/Child.php | 6 + .../Mysql4/Order/Attribute/Backend/Parent.php | 6 + .../Order/Attribute/Backend/Shipping.php | 6 + .../Sales/Model/Mysql4/Order/Collection.php | 6 + .../Sales/Model/Mysql4/Order/Creditmemo.php | 6 + .../Creditmemo/Attribute/Backend/Child.php | 6 + .../Creditmemo/Attribute/Backend/Parent.php | 6 + .../Mysql4/Order/Creditmemo/Collection.php | 6 + .../Model/Mysql4/Order/Creditmemo/Comment.php | 6 + .../Order/Creditmemo/Comment/Collection.php | 6 + .../Model/Mysql4/Order/Creditmemo/Item.php | 6 + .../Order/Creditmemo/Item/Collection.php | 6 + .../Mage/Sales/Model/Mysql4/Order/Invoice.php | 6 + .../Order/Invoice/Attribute/Backend/Child.php | 6 + .../Order/Invoice/Attribute/Backend/Item.php | 6 + .../Order/Invoice/Attribute/Backend/Order.php | 6 + .../Invoice/Attribute/Backend/Parent.php | 6 + .../Model/Mysql4/Order/Invoice/Collection.php | 6 + .../Model/Mysql4/Order/Invoice/Comment.php | 6 + .../Order/Invoice/Comment/Collection.php | 6 + .../Sales/Model/Mysql4/Order/Invoice/Item.php | 6 + .../Mysql4/Order/Invoice/Item/Collection.php | 6 + .../Mage/Sales/Model/Mysql4/Order/Item.php | 6 + .../Model/Mysql4/Order/Item/Collection.php | 6 + .../Mage/Sales/Model/Mysql4/Order/Payment.php | 6 + .../Model/Mysql4/Order/Payment/Collection.php | 6 + .../Sales/Model/Mysql4/Order/Shipment.php | 6 + .../Shipment/Attribute/Backend/Child.php | 6 + .../Shipment/Attribute/Backend/Parent.php | 6 + .../Mysql4/Order/Shipment/Collection.php | 6 + .../Model/Mysql4/Order/Shipment/Comment.php | 6 + .../Order/Shipment/Comment/Collection.php | 6 + .../Model/Mysql4/Order/Shipment/Item.php | 6 + .../Mysql4/Order/Shipment/Item/Collection.php | 6 + .../Model/Mysql4/Order/Shipment/Track.php | 6 + .../Order/Shipment/Track/Collection.php | 6 + .../Model/Mysql4/Order/Status/History.php | 6 + .../Order/Status/History/Collection.php | 6 + .../Mage/Sales/Model/Mysql4/Order/Tax.php | 6 + .../Model/Mysql4/Order/Tax/Collection.php | 6 + .../core/Mage/Sales/Model/Mysql4/Quote.php | 24 +- .../Mage/Sales/Model/Mysql4/Quote/Address.php | 6 + .../Quote/Address/Attribute/Backend.php | 6 + .../Quote/Address/Attribute/Backend/Child.php | 6 + .../Address/Attribute/Backend/Parent.php | 6 + .../Address/Attribute/Backend/Region.php | 6 + .../Quote/Address/Attribute/Frontend.php | 6 + .../Attribute/Frontend/Custbalance.php | 6 + .../Address/Attribute/Frontend/Discount.php | 6 + .../Address/Attribute/Frontend/Grand.php | 6 + .../Address/Attribute/Frontend/Shipping.php | 6 + .../Address/Attribute/Frontend/Subtotal.php | 6 + .../Quote/Address/Attribute/Frontend/Tax.php | 6 + .../Model/Mysql4/Quote/Address/Collection.php | 6 + .../Sales/Model/Mysql4/Quote/Address/Item.php | 6 + .../Mysql4/Quote/Address/Item/Collection.php | 6 + .../Sales/Model/Mysql4/Quote/Address/Rate.php | 6 + .../Mysql4/Quote/Address/Rate/Collection.php | 6 + .../Sales/Model/Mysql4/Quote/Collection.php | 6 + .../Mage/Sales/Model/Mysql4/Quote/Item.php | 6 + .../Model/Mysql4/Quote/Item/Collection.php | 6 + .../Sales/Model/Mysql4/Quote/Item/Option.php | 6 + .../Mysql4/Quote/Item/Option/Collection.php | 6 + .../Mage/Sales/Model/Mysql4/Quote/Payment.php | 6 + .../Model/Mysql4/Quote/Payment/Collection.php | 6 + .../Sales/Model/Mysql4/Sale/Collection.php | 6 + .../core/Mage/Sales/Model/Mysql4/Setup.php | 6 + app/code/core/Mage/Sales/Model/Observer.php | 38 + app/code/core/Mage/Sales/Model/Order.php | 101 +- .../core/Mage/Sales/Model/Order/Address.php | 6 + app/code/core/Mage/Sales/Model/Order/Api.php | 6 + .../core/Mage/Sales/Model/Order/Config.php | 79 +- .../Mage/Sales/Model/Order/Creditmemo.php | 11 +- .../Sales/Model/Order/Creditmemo/Comment.php | 6 + .../Sales/Model/Order/Creditmemo/Config.php | 6 + .../Sales/Model/Order/Creditmemo/Item.php | 13 +- .../Model/Order/Creditmemo/Total/Abstract.php | 6 + .../Model/Order/Creditmemo/Total/Discount.php | 6 + .../Model/Order/Creditmemo/Total/Grand.php | 6 + .../Model/Order/Creditmemo/Total/Subtotal.php | 6 + .../Model/Order/Creditmemo/Total/Tax.php | 14 + .../core/Mage/Sales/Model/Order/Invoice.php | 11 +- .../Mage/Sales/Model/Order/Invoice/Api.php | 6 + .../Sales/Model/Order/Invoice/Comment.php | 6 + .../Mage/Sales/Model/Order/Invoice/Config.php | 6 + .../Mage/Sales/Model/Order/Invoice/Item.php | 13 +- .../Model/Order/Invoice/Total/Abstract.php | 6 + .../Model/Order/Invoice/Total/Discount.php | 6 + .../Sales/Model/Order/Invoice/Total/Grand.php | 6 + .../Model/Order/Invoice/Total/Shipping.php | 6 + .../Model/Order/Invoice/Total/Subtotal.php | 6 + .../Sales/Model/Order/Invoice/Total/Tax.php | 6 + app/code/core/Mage/Sales/Model/Order/Item.php | 58 +- .../core/Mage/Sales/Model/Order/Payment.php | 89 +- .../Mage/Sales/Model/Order/Pdf/Abstract.php | 94 +- .../Mage/Sales/Model/Order/Pdf/Creditmemo.php | 65 +- .../Mage/Sales/Model/Order/Pdf/Invoice.php | 32 +- .../Sales/Model/Order/Pdf/Items/Abstract.php | 24 +- .../Order/Pdf/Items/Creditmemo/Default.php | 75 +- .../Model/Order/Pdf/Items/Invoice/Default.php | 37 +- .../Order/Pdf/Items/Shipment/Default.php | 23 +- .../Mage/Sales/Model/Order/Pdf/Shipment.php | 12 +- .../core/Mage/Sales/Model/Order/Shipment.php | 14 +- .../Mage/Sales/Model/Order/Shipment/Api.php | 6 + .../Sales/Model/Order/Shipment/Comment.php | 6 + .../Mage/Sales/Model/Order/Shipment/Item.php | 6 + .../Mage/Sales/Model/Order/Shipment/Track.php | 6 + .../core/Mage/Sales/Model/Order/Status.php | 6 + .../Mage/Sales/Model/Order/Status/History.php | 6 + app/code/core/Mage/Sales/Model/Order/Tax.php | 6 + .../core/Mage/Sales/Model/Order/Total.php | 6 + app/code/core/Mage/Sales/Model/Quote.php | 52 +- .../core/Mage/Sales/Model/Quote/Address.php | 19 +- .../Mage/Sales/Model/Quote/Address/Item.php | 6 + .../Mage/Sales/Model/Quote/Address/Rate.php | 9 +- .../Mage/Sales/Model/Quote/Address/Total.php | 6 + .../Model/Quote/Address/Total/Abstract.php | 6 + .../Model/Quote/Address/Total/Custbalance.php | 6 + .../Model/Quote/Address/Total/Discount.php | 6 + .../Sales/Model/Quote/Address/Total/Grand.php | 6 + .../Model/Quote/Address/Total/Shipping.php | 12 +- .../Model/Quote/Address/Total/Subtotal.php | 6 + .../Sales/Model/Quote/Address/Total/Tax.php | 12 +- .../core/Mage/Sales/Model/Quote/Config.php | 6 + app/code/core/Mage/Sales/Model/Quote/Item.php | 31 +- .../Mage/Sales/Model/Quote/Item/Abstract.php | 46 +- .../Mage/Sales/Model/Quote/Item/Option.php | 6 + .../core/Mage/Sales/Model/Quote/Payment.php | 6 + .../Sales/controllers/OrderController.php | 206 +- app/code/core/Mage/Sales/etc/api.xml | 6 + app/code/core/Mage/Sales/etc/config.xml | 76 +- app/code/core/Mage/Sales/etc/system.xml | 37 +- .../sql/sales_setup/mysql4-install-0.7.0.php | 6 + .../sql/sales_setup/mysql4-install-0.8.11.php | 6 + .../sql/sales_setup/mysql4-install-0.9.0.php | 6 + .../mysql4-upgrade-0.6.2-0.7.0.php | 6 + .../mysql4-upgrade-0.7.0-0.7.1.php | 6 + .../mysql4-upgrade-0.7.1-0.7.2.php | 6 + .../mysql4-upgrade-0.7.2-0.7.3.php | 6 + .../mysql4-upgrade-0.7.9-0.7.10.php | 6 + .../mysql4-upgrade-0.8.0-0.8.1.php | 6 + .../mysql4-upgrade-0.8.1-0.8.2.php | 6 + .../mysql4-upgrade-0.8.11-0.8.12.php | 6 + .../mysql4-upgrade-0.8.12-0.8.13.php | 6 + .../mysql4-upgrade-0.8.13-0.8.14.php | 6 + .../mysql4-upgrade-0.8.14-0.8.15.php | 6 + .../mysql4-upgrade-0.8.15-0.8.16.php | 6 + .../mysql4-upgrade-0.8.16-0.8.17.php | 6 + .../mysql4-upgrade-0.8.17-0.8.18.php | 6 + .../mysql4-upgrade-0.8.18-0.8.19.php | 6 + .../mysql4-upgrade-0.8.19-0.8.20.php | 6 + .../mysql4-upgrade-0.8.2-0.8.3.php | 6 + .../mysql4-upgrade-0.8.20-0.8.21.php | 6 + .../mysql4-upgrade-0.8.21-0.8.22.php | 6 + .../mysql4-upgrade-0.8.22-0.8.23.php | 6 + .../mysql4-upgrade-0.8.23-0.8.24.php | 6 + .../mysql4-upgrade-0.8.24-0.8.25.php | 6 + .../mysql4-upgrade-0.8.25-0.8.26.php | 6 + .../mysql4-upgrade-0.8.26-0.8.27.php | 6 + .../mysql4-upgrade-0.8.27-0.8.28.php | 6 + .../mysql4-upgrade-0.8.28-0.8.29.php | 6 + .../mysql4-upgrade-0.8.29-0.9.0.php | 6 + .../mysql4-upgrade-0.8.3-0.8.4.php | 6 + .../mysql4-upgrade-0.8.6-0.8.7.php | 6 + .../mysql4-upgrade-0.8.7-0.8.8.php | 6 + .../mysql4-upgrade-0.8.8-0.8.9.php | 6 + .../mysql4-upgrade-0.9.0-0.9.1.php | 6 + .../mysql4-upgrade-0.9.1-0.9.2.php | 6 + .../mysql4-upgrade-0.9.10-0.9.11.php | 6 + .../mysql4-upgrade-0.9.11-0.9.12.php | 6 + .../mysql4-upgrade-0.9.12-0.9.13.php | 6 + .../mysql4-upgrade-0.9.13-0.9.14.php | 6 + .../mysql4-upgrade-0.9.14-0.9.15.php | 39 + .../mysql4-upgrade-0.9.15-0.9.16.php | 34 + .../mysql4-upgrade-0.9.16-0.9.17.php | 34 + .../mysql4-upgrade-0.9.17-0.9.18.php | 35 + .../mysql4-upgrade-0.9.18-0.9.19.php | 32 + .../mysql4-upgrade-0.9.19-0.9.20.php | 35 + .../mysql4-upgrade-0.9.2-0.9.3.php | 6 + .../mysql4-upgrade-0.9.3-0.9.4.php | 6 + .../mysql4-upgrade-0.9.4-0.9.5.php | 6 + .../mysql4-upgrade-0.9.5-0.9.6.php | 6 + .../mysql4-upgrade-0.9.6-0.9.7.php | 6 + .../mysql4-upgrade-0.9.7-0.9.8.php | 6 + .../mysql4-upgrade-0.9.8-0.9.9.php | 6 + .../mysql4-upgrade-0.9.9-0.9.10.php | 6 + app/code/core/Mage/SalesRule/Exception.php | 6 + app/code/core/Mage/SalesRule/Helper/Data.php | 6 + .../core/Mage/SalesRule/Model/Mysql4/Rule.php | 6 + .../Model/Mysql4/Rule/Collection.php | 6 + .../SalesRule/Model/Mysql4/Rule/Customer.php | 6 + .../Model/Mysql4/Rule/Customer/Collection.php | 6 + .../SalesRule/Model/Mysql4/Rule/Product.php | 6 + .../Model/Mysql4/Rule/Product/Collection.php | 6 + .../core/Mage/SalesRule/Model/Observer.php | 6 + app/code/core/Mage/SalesRule/Model/Rule.php | 6 + .../Model/Rule/Action/Collection.php | 6 + .../SalesRule/Model/Rule/Action/Product.php | 6 + .../Model/Rule/Condition/Address.php | 16 +- .../Model/Rule/Condition/Combine.php | 6 + .../Model/Rule/Condition/Product.php | 6 + .../Model/Rule/Condition/Product/Combine.php | 6 + .../Model/Rule/Condition/Product/Found.php | 6 + .../Rule/Condition/Product/Subselect.php | 49 +- .../Mage/SalesRule/Model/Rule/Customer.php | 6 + .../Mage/SalesRule/Model/Rule/Product.php | 6 + .../core/Mage/SalesRule/Model/Validator.php | 12 +- app/code/core/Mage/SalesRule/etc/config.xml | 6 + .../salesrule_setup/mysql4-install-0.7.0.php | 6 + .../mysql4-upgrade-0.7.0-0.7.1.php | 6 + .../mysql4-upgrade-0.7.1-0.7.2.php | 6 + .../mysql4-upgrade-0.7.2-0.7.3.php | 6 + .../mysql4-upgrade-0.7.3-0.7.4.php | 6 + .../mysql4-upgrade-0.7.4-0.7.5.php | 6 + .../mysql4-upgrade-0.7.5-0.7.6.php | 6 + app/code/core/Mage/Sendfriend/Block/Send.php | 6 + app/code/core/Mage/Sendfriend/Helper/Data.php | 6 + .../Sendfriend/Model/Mysql4/Sendfriend.php | 6 + .../Model/Mysql4/Sendfriend/Collection.php | 6 + .../Mage/Sendfriend/Model/Mysql4/Setup.php | 6 + .../core/Mage/Sendfriend/Model/Sendfriend.php | 6 + .../controllers/ProductController.php | 6 + app/code/core/Mage/Sendfriend/etc/config.xml | 6 + app/code/core/Mage/Sendfriend/etc/system.xml | 6 + .../sendfriend_setup/mysql4-install-0.7.0.php | 6 + .../Mage/Shipping/Block/Tracking/Ajax.php | 6 + .../Mage/Shipping/Block/Tracking/Popup.php | 6 + app/code/core/Mage/Shipping/Exception.php | 6 + app/code/core/Mage/Shipping/Helper/Data.php | 6 + .../Mage/Shipping/Model/Carrier/Abstract.php | 6 + .../Mage/Shipping/Model/Carrier/Flatrate.php | 6 + .../Shipping/Model/Carrier/Freeshipping.php | 38 +- .../Mage/Shipping/Model/Carrier/Interface.php | 6 + .../Mage/Shipping/Model/Carrier/Pickup.php | 6 + .../Mage/Shipping/Model/Carrier/Tablerate.php | 6 + app/code/core/Mage/Shipping/Model/Config.php | 6 + .../Model/Mysql4/Carrier/Tablerate.php | 6 + .../Mysql4/Carrier/Tablerate/Collection.php | 6 + .../Mage/Shipping/Model/Rate/Abstract.php | 6 + .../core/Mage/Shipping/Model/Rate/Request.php | 6 + .../core/Mage/Shipping/Model/Rate/Result.php | 33 + .../Shipping/Model/Rate/Result/Abstract.php | 6 + .../Mage/Shipping/Model/Rate/Result/Error.php | 6 + .../Shipping/Model/Rate/Result/Method.php | 6 + .../Mage/Shipping/Model/Rule/Abstract.php | 6 + .../Shipping/Model/Rule/Action/Abstract.php | 6 + .../Shipping/Model/Rule/Action/Carrier.php | 6 + .../Shipping/Model/Rule/Action/Method.php | 6 + .../Model/Rule/Condition/Abstract.php | 6 + .../Model/Rule/Condition/Dest/Country.php | 6 + .../Model/Rule/Condition/Dest/Region.php | 6 + .../Model/Rule/Condition/Dest/Zip.php | 6 + .../Model/Rule/Condition/Order/Subtotal.php | 6 + .../Model/Rule/Condition/Order/Totalqty.php | 6 + .../Model/Rule/Condition/Package/Weight.php | 6 + .../core/Mage/Shipping/Model/Shipping.php | 10 + .../Shipping/Model/Source/HandlingAction.php | 6 + .../Shipping/Model/Source/HandlingType.php | 6 + .../Mage/Shipping/Model/Tracking/Result.php | 6 + .../Model/Tracking/Result/Abstract.php | 6 + .../Shipping/Model/Tracking/Result/Error.php | 6 + .../Shipping/Model/Tracking/Result/Status.php | 6 + .../controllers/ShippingController.php | 6 + .../controllers/TrackingController.php | 6 + app/code/core/Mage/Shipping/etc/config.xml | 6 + app/code/core/Mage/Shipping/etc/system.xml | 6 + .../shipping_setup/mysql4-install-0.7.0.php | 6 + app/code/core/Mage/Sitemap/Helper/Data.php | 6 + .../Sitemap/Model/Mysql4/Catalog/Category.php | 6 + .../Sitemap/Model/Mysql4/Catalog/Product.php | 6 + .../Mage/Sitemap/Model/Mysql4/Cms/Page.php | 6 + .../Mage/Sitemap/Model/Mysql4/Sitemap.php | 6 + .../Model/Mysql4/Sitemap/Collection.php | 6 + app/code/core/Mage/Sitemap/Model/Observer.php | 6 + app/code/core/Mage/Sitemap/Model/Sitemap.php | 6 + app/code/core/Mage/Sitemap/etc/config.xml | 6 + app/code/core/Mage/Sitemap/etc/system.xml | 12 +- .../sitemap_setup/mysql4-install-0.7.0.php | 6 + .../mysql4-upgrade-0.7.0-0.7.1.php | 6 + .../mysql4-upgrade-0.7.1-0.7.2.php | 6 + app/code/core/Mage/Tag/Block/All.php | 6 + .../core/Mage/Tag/Block/Customer/Edit.php | 6 + .../core/Mage/Tag/Block/Customer/Recent.php | 6 + .../core/Mage/Tag/Block/Customer/Tags.php | 6 + .../core/Mage/Tag/Block/Customer/View.php | 6 + app/code/core/Mage/Tag/Block/Popular.php | 6 + app/code/core/Mage/Tag/Block/Product/List.php | 6 + .../core/Mage/Tag/Block/Product/Result.php | 6 + app/code/core/Mage/Tag/Helper/Data.php | 6 + .../Tag/Model/Entity/Customer/Collection.php | 6 + .../Tag/Model/Mysql4/Customer/Collection.php | 6 + .../Tag/Model/Mysql4/Popular/Collection.php | 6 + .../Tag/Model/Mysql4/Product/Collection.php | 6 + app/code/core/Mage/Tag/Model/Mysql4/Tag.php | 6 + .../Mage/Tag/Model/Mysql4/Tag/Collection.php | 6 + .../Mage/Tag/Model/Mysql4/Tag/Relation.php | 6 + app/code/core/Mage/Tag/Model/Session.php | 6 + app/code/core/Mage/Tag/Model/Tag.php | 6 + app/code/core/Mage/Tag/Model/Tag/Relation.php | 8 + .../Tag/controllers/CustomerController.php | 8 + .../Mage/Tag/controllers/IndexController.php | 14 +- .../Mage/Tag/controllers/ListController.php | 6 + .../Tag/controllers/ProductController.php | 6 + app/code/core/Mage/Tag/etc/config.xml | 8 +- .../sql/tag_setup/mysql4-install-0.7.0.php | 6 + .../tag_setup/mysql4-upgrade-0.7.0-0.7.1.php | 6 + .../Adminhtml/Frontend/Region/Updater.php | 6 + app/code/core/Mage/Tax/Exception.php | 6 + app/code/core/Mage/Tax/Helper/Data.php | 30 + app/code/core/Mage/Tax/Model/Calculation.php | 6 + .../core/Mage/Tax/Model/Calculation/Rate.php | 6 + .../Mage/Tax/Model/Calculation/Rate/Title.php | 6 + .../core/Mage/Tax/Model/Calculation/Rule.php | 6 + app/code/core/Mage/Tax/Model/Class.php | 6 + .../Mage/Tax/Model/Class/Source/Customer.php | 6 + .../Mage/Tax/Model/Class/Source/Product.php | 6 + app/code/core/Mage/Tax/Model/Config.php | 9 + .../Mage/Tax/Model/Mysql4/Calculation.php | 6 + .../Model/Mysql4/Calculation/Collection.php | 6 + .../Tax/Model/Mysql4/Calculation/Rate.php | 6 + .../Mysql4/Calculation/Rate/Collection.php | 6 + .../Model/Mysql4/Calculation/Rate/Title.php | 6 + .../Calculation/Rate/Title/Collection.php | 6 + .../Tax/Model/Mysql4/Calculation/Rule.php | 6 + .../Mysql4/Calculation/Rule/Collection.php | 6 + app/code/core/Mage/Tax/Model/Mysql4/Class.php | 6 + .../Tax/Model/Mysql4/Class/Collection.php | 6 + app/code/core/Mage/Tax/Model/Mysql4/Rate.php | 6 + .../Mage/Tax/Model/Mysql4/Rate/Collection.php | 6 + .../core/Mage/Tax/Model/Mysql4/Rate/Data.php | 6 + .../Tax/Model/Mysql4/Rate/Data/Collection.php | 6 + .../core/Mage/Tax/Model/Mysql4/Rate/Type.php | 6 + .../Tax/Model/Mysql4/Rate/Type/Collection.php | 6 + app/code/core/Mage/Tax/Model/Mysql4/Rule.php | 6 + .../Mage/Tax/Model/Mysql4/Rule/Collection.php | 6 + app/code/core/Mage/Tax/Model/Mysql4/Setup.php | 6 + app/code/core/Mage/Tax/Model/Observer.php | 9 + app/code/core/Mage/Tax/Model/Rate.php | 6 + app/code/core/Mage/Tax/Model/Rate/Data.php | 6 + app/code/core/Mage/Tax/Model/Rate/Type.php | 6 + .../core/Mage/Tax/Model/Rate/Type/Source.php | 6 + app/code/core/Mage/Tax/Model/Rule.php | 6 + .../System/Config/Source/Tax/Country.php | 6 + .../System/Config/Source/Tax/Display/Type.php | 6 + .../Model/System/Config/Source/Tax/Region.php | 6 + app/code/core/Mage/Tax/etc/config.xml | 8 +- app/code/core/Mage/Tax/etc/system.xml | 23 +- .../sql/tax_setup/mysql4-install-0.7.0.php | 6 + .../tax_setup/mysql4-upgrade-0.6.1-0.7.0.php | 6 + .../tax_setup/mysql4-upgrade-0.7.0-0.7.1.php | 6 + .../tax_setup/mysql4-upgrade-0.7.1-0.7.2.php | 6 + .../tax_setup/mysql4-upgrade-0.7.2-0.7.3.php | 6 + .../tax_setup/mysql4-upgrade-0.7.3-0.7.4.php | 6 + .../tax_setup/mysql4-upgrade-0.7.4-0.7.5.php | 6 + .../tax_setup/mysql4-upgrade-0.7.5-0.7.6.php | 6 + .../tax_setup/mysql4-upgrade-0.7.6-0.7.7.php | 6 + app/code/core/Mage/Usa/Helper/Data.php | 6 + .../Usa/Model/Shipping/Carrier/Abstract.php | 6 + .../Mage/Usa/Model/Shipping/Carrier/Dhl.php | 6 + .../Carrier/Dhl/Source/Dutypaymenttype.php | 6 + .../Carrier/Dhl/Source/Freemethod.php | 6 + .../Shipping/Carrier/Dhl/Source/Method.php | 6 + .../Carrier/Dhl/Source/Shipmenttype.php | 6 + .../Mage/Usa/Model/Shipping/Carrier/Fedex.php | 6 + .../Shipping/Carrier/Fedex/Source/Dropoff.php | 6 + .../Carrier/Fedex/Source/Freemethod.php | 6 + .../Shipping/Carrier/Fedex/Source/Method.php | 6 + .../Carrier/Fedex/Source/Packaging.php | 6 + .../Mage/Usa/Model/Shipping/Carrier/Ups.php | 198 +- .../Shipping/Carrier/Ups/Source/Container.php | 6 + .../Shipping/Carrier/Ups/Source/DestType.php | 6 + .../Carrier/Ups/Source/Freemethod.php | 6 + .../Shipping/Carrier/Ups/Source/Method.php | 6 + .../Carrier/Ups/Source/OriginShipment.php | 6 + .../Shipping/Carrier/Ups/Source/Pickup.php | 6 + .../Shipping/Carrier/Ups/Source/Type.php | 6 + .../Carrier/Ups/Source/Unitofmeasure.php | 6 + .../Mage/Usa/Model/Shipping/Carrier/Usps.php | 10 + .../Carrier/Usps/Source/Container.php | 6 + .../Carrier/Usps/Source/Freemethod.php | 6 + .../Carrier/Usps/Source/Machinable.php | 6 + .../Shipping/Carrier/Usps/Source/Method.php | 6 + .../Shipping/Carrier/Usps/Source/Size.php | 6 + app/code/core/Mage/Usa/Model/Tax/Uszip.php | 6 + app/code/core/Mage/Usa/etc/config.xml | 6 + app/code/core/Mage/Usa/etc/system.xml | 8 +- .../Mage/Wishlist/Block/Customer/Sharing.php | 6 + .../Mage/Wishlist/Block/Customer/Sidebar.php | 6 + .../Mage/Wishlist/Block/Customer/Wishlist.php | 6 + app/code/core/Mage/Wishlist/Block/Links.php | 6 + .../Mage/Wishlist/Block/Share/Email/Items.php | 6 + .../Mage/Wishlist/Block/Share/Email/Rss.php | 6 + .../Mage/Wishlist/Block/Share/Wishlist.php | 6 + app/code/core/Mage/Wishlist/Helper/Data.php | 24 +- app/code/core/Mage/Wishlist/Model/Item.php | 6 + .../core/Mage/Wishlist/Model/Mysql4/Item.php | 6 + .../Wishlist/Model/Mysql4/Item/Collection.php | 6 + .../Model/Mysql4/Product/Collection.php | 6 + .../Mage/Wishlist/Model/Mysql4/Wishlist.php | 6 + .../Model/Mysql4/Wishlist/Collection.php | 6 + .../core/Mage/Wishlist/Model/Observer.php | 6 + app/code/core/Mage/Wishlist/Model/Session.php | 6 + .../core/Mage/Wishlist/Model/Wishlist.php | 6 + .../Wishlist/controllers/IndexController.php | 6 + .../Wishlist/controllers/SharedController.php | 6 + app/code/core/Mage/Wishlist/etc/config.xml | 8 +- app/code/core/Mage/Wishlist/etc/system.xml | 6 + .../wishlist_setup/mysql4-install-0.7.0.php | 6 + .../mysql4-upgrade-0.7.0-0.7.1.php | 6 + .../mysql4-upgrade-0.7.1-0.7.2.php | 6 + app/code/core/Zend/Mime.php | 2 +- .../default/default/layout/bundle.xml | 6 + .../default/default/layout/catalog.xml | 6 + .../adminhtml/default/default/layout/main.xml | 13 + .../default/default/layout/sales.xml | 11 + .../default/template/api/roleinfo.phtml | 8 +- .../default/default/template/api/roles.phtml | 6 + .../default/template/api/rolesedit.phtml | 6 + .../default/template/api/rolesusers.phtml | 6 + .../default/template/api/userinfo.phtml | 8 +- .../default/template/api/usernroles.phtml | 6 + .../default/template/api/userroles.phtml | 6 + .../default/default/template/api/users.phtml | 6 + .../default/template/backup/left.phtml | 6 + .../default/template/backup/list.phtml | 6 + .../template/bundle/product/edit/bundle.phtml | 6 + .../bundle/product/edit/bundle/option.phtml | 16 +- .../product/edit/bundle/option/search.phtml | 6 + .../edit/bundle/option/selection.phtml | 52 +- .../creditmemo/create/items/renderer.phtml | 6 + .../creditmemo/view/items/renderer.phtml | 6 + .../sales/invoice/create/items/renderer.phtml | 6 + .../sales/invoice/view/items/renderer.phtml | 6 + .../sales/order/view/items/renderer.phtml | 18 +- .../shipment/create/items/renderer.phtml | 6 + .../sales/shipment/view/items/renderer.phtml | 6 + .../catalog/category/checkboxes/tree.phtml | 199 ++ .../template/catalog/category/edit.phtml | 181 +- .../template/catalog/category/edit/form.phtml | 199 ++ .../template/catalog/category/tree.phtml | 401 ++- .../form/renderer/fieldset/element.phtml | 11 +- .../default/template/catalog/product.phtml | 6 + .../catalog/product/attribute/js.phtml | 6 + .../product/attribute/new/created.phtml | 6 + .../catalog/product/attribute/options.phtml | 21 +- .../catalog/product/attribute/set/main.phtml | 10 +- .../attribute/set/main/tree/attribute.phtml | 6 + .../attribute/set/main/tree/group.phtml | 6 + .../product/attribute/set/toolbar/add.phtml | 8 +- .../product/attribute/set/toolbar/main.phtml | 6 + .../template/catalog/product/created.phtml | 6 + .../template/catalog/product/edit.phtml | 41 +- .../product/edit/action/attribute.phtml | 6 + .../product/edit/action/inventory.phtml | 26 +- .../product/edit/action/websites.phtml | 20 +- .../catalog/product/edit/categories.phtml | 13 +- .../catalog/product/edit/options.phtml | 6 + .../catalog/product/edit/options/option.phtml | 28 +- .../product/edit/options/type/date.phtml | 6 + .../product/edit/options/type/file.phtml | 6 + .../product/edit/options/type/select.phtml | 20 +- .../product/edit/options/type/text.phtml | 6 + .../catalog/product/edit/price/tier.phtml | 22 +- .../catalog/product/edit/super/config.phtml | 6 + .../catalog/product/edit/websites.phtml | 13 +- .../catalog/product/helper/gallery.phtml | 238 +- .../default/template/catalog/product/js.phtml | 8 + .../template/catalog/product/tab/alert.phtml | 6 + .../catalog/product/tab/inventory.phtml | 88 +- .../default/default/template/coming.phtml | 6 + .../template/customer/group/list.phtml | 19 +- .../default/template/customer/online.phtml | 6 + .../template/customer/tab/addresses.phtml | 49 +- .../default/template/customer/tab/cart.phtml | 6 + .../template/customer/tab/newsletter.phtml | 6 + .../default/template/customer/tab/view.phtml | 19 +- .../template/customer/tab/view/sales.phtml | 30 +- .../template/customer/tab/wishlist.phtml | 6 + .../default/template/dashboard/graph.phtml | 6 + .../default/template/dashboard/grid.phtml | 6 + .../default/template/dashboard/index.phtml | 6 + .../default/template/dashboard/salebar.phtml | 6 + .../default/template/dashboard/searches.phtml | 6 + .../template/dashboard/store/switcher.phtml | 6 + .../default/template/dashboard/totalbar.phtml | 6 + .../default/template/email/order/items.phtml | 6 + .../default/default/template/example.phtml | 9 +- .../template/extensions/console/form.phtml | 6 + .../template/extensions/custom/contents.phtml | 16 +- .../template/extensions/custom/depends.phtml | 24 +- .../template/extensions/custom/load.phtml | 35 + .../extensions/custom/maintainers.phtml | 12 +- .../template/extensions/custom/package.phtml | 24 +- .../template/extensions/custom/release.phtml | 6 + .../template/extensions/file/form.phtml | 6 + .../template/extensions/local/actions.phtml | 6 + .../template/extensions/local/changelog.phtml | 6 + .../template/extensions/local/contents.phtml | 6 + .../template/extensions/local/depends.phtml | 6 + .../template/extensions/local/package.phtml | 6 + .../template/extensions/local/upgrade.phtml | 6 + .../template/extensions/mass/install.phtml | 6 + .../template/extensions/mass/uninstall.phtml | 6 + .../template/extensions/mass/upgrade.phtml | 6 + .../template/extensions/remote/actions.phtml | 6 + .../extensions/remote/changelog.phtml | 6 + .../template/extensions/remote/package.phtml | 6 + .../default/template/forgotpassword.phtml | 6 + .../default/template/giftmessage/form.phtml | 6 + .../default/template/giftmessage/helper.phtml | 6 + .../default/default/template/login.phtml | 6 + .../default/template/media/editor.phtml | 6 + .../default/template/media/uploader.phtml | 6 + .../template/newsletter/problem/list.phtml | 6 + .../template/newsletter/queue/edit.phtml | 16 +- .../template/newsletter/queue/list.phtml | 6 + .../template/newsletter/subscriber/list.phtml | 6 + .../template/newsletter/template/edit.phtml | 24 +- .../template/newsletter/template/list.phtml | 6 + .../newsletter/template/preview.phtml | 6 + .../template/notification/toolbar.phtml | 49 +- .../template/notification/window.phtml | 6 + .../default/default/template/page.phtml | 6 + .../default/template/page/footer.phtml | 6 + .../default/template/page/header.phtml | 6 + .../default/template/page/js/translate.phtml | 6 + .../default/default/template/page/menu.phtml | 6 + .../default/template/payment/form/cc.phtml | 6 + .../template/payment/form/ccsave.phtml | 6 + .../template/payment/form/checkmo.phtml | 6 + .../template/payment/form/purchaseorder.phtml | 6 + .../default/template/payment/info/cc.phtml | 6 + .../template/payment/info/ccsave.phtml | 6 + .../template/payment/info/checkmo.phtml | 6 + .../template/payment/info/default.phtml | 6 + .../template/payment/info/pdf/cc.phtml | 6 + .../template/payment/info/pdf/ccsave.phtml | 6 + .../template/payment/info/pdf/checkmo.phtml | 6 + .../template/payment/info/pdf/default.phtml | 6 + .../payment/info/pdf/purchaseorder.phtml | 6 + .../template/payment/info/purchaseorder.phtml | 7 + .../template/paypal/express/info.phtml | 6 + .../template/paypal/express/pdf/info.phtml | 6 + .../template/paypaluk/direct/form.phtml | 12 +- .../template/paypaluk/direct/info.phtml | 6 + .../template/paypaluk/direct/pdf/info.phtml | 6 + .../template/paypaluk/express/info.phtml | 6 + .../template/paypaluk/express/pdf/info.phtml | 6 + .../template/permissions/roleinfo.phtml | 8 +- .../default/template/permissions/roles.phtml | 6 + .../template/permissions/rolesedit.phtml | 6 + .../template/permissions/rolesusers.phtml | 6 + .../template/permissions/userinfo.phtml | 8 +- .../template/permissions/usernroles.phtml | 6 + .../template/permissions/userroles.phtml | 6 + .../default/template/permissions/users.phtml | 6 + .../default/template/poll/answers/list.phtml | 45 +- .../default/default/template/popup.phtml | 59 +- .../default/template/promo/fieldset.phtml | 6 + .../default/default/template/promo/form.phtml | 6 + .../template/promo/widget/categories.phtml | 81 - .../default/template/rating/detailed.phtml | 6 + .../default/template/rating/options.phtml | 6 + .../template/rating/stars/detailed.phtml | 6 + .../template/rating/stars/summary.phtml | 6 + .../default/template/report/grid.phtml | 6 + .../template/report/store/switcher.phtml | 6 + .../default/template/report/wishlist.phtml | 6 + .../default/default/template/review/add.phtml | 6 + .../template/sales/items/column/name.phtml | 24 +- .../template/sales/items/column/qty.phtml | 6 + .../sales/items/renderer/default.phtml | 6 + .../template/sales/order/comments/view.phtml | 6 + .../sales/order/create/abstract.phtml | 10 +- .../order/create/billing/method/form.phtml | 6 + .../template/sales/order/create/comment.phtml | 10 +- .../sales/order/create/coupons/form.phtml | 6 + .../template/sales/order/create/data.phtml | 6 + .../template/sales/order/create/form.phtml | 6 + .../sales/order/create/form/account.phtml | 6 + .../sales/order/create/giftmessage.phtml | 33 +- .../template/sales/order/create/items.phtml | 6 + .../sales/order/create/items/grid.phtml | 48 +- .../template/sales/order/create/js.phtml | 6 + .../sales/order/create/newsletter/form.phtml | 6 + .../order/create/shipping/method/form.phtml | 10 +- .../template/sales/order/create/sidebar.phtml | 6 + .../sales/order/create/sidebar/items.phtml | 6 + .../sales/order/create/store/select.phtml | 8 +- .../template/sales/order/create/totals.phtml | 30 +- .../sales/order/creditmemo/create/form.phtml | 6 + .../sales/order/creditmemo/create/items.phtml | 18 +- .../create/items/renderer/configurable.phtml | 86 + .../create/items/renderer/default.phtml | 6 + .../order/creditmemo/create/totals.phtml | 8 +- .../sales/order/creditmemo/view/form.phtml | 6 + .../sales/order/creditmemo/view/items.phtml | 6 + .../view/items/renderer/configurable.phtml | 76 + .../view/items/renderer/default.phtml | 6 + .../sales/order/invoice/create/form.phtml | 8 +- .../sales/order/invoice/create/items.phtml | 14 +- .../create/items/renderer/configurable.phtml | 83 + .../create/items/renderer/default.phtml | 6 + .../sales/order/invoice/create/tracking.phtml | 20 +- .../sales/order/invoice/view/form.phtml | 7 + .../sales/order/invoice/view/items.phtml | 6 + .../view/items/renderer/configurable.phtml | 83 + .../invoice/view/items/renderer/default.phtml | 6 + .../sales/order/shipment/create/form.phtml | 6 + .../sales/order/shipment/create/items.phtml | 16 +- .../create/items/renderer/configurable.phtml | 46 + .../create/items/renderer/default.phtml | 21 +- .../order/shipment/create/tracking.phtml | 25 +- .../sales/order/shipment/tracking/info.phtml | 6 + .../sales/order/shipment/view/form.phtml | 6 + .../sales/order/shipment/view/items.phtml | 6 + .../view/items/renderer/configurable.phtml | 31 + .../view/items/renderer/default.phtml | 6 + .../sales/order/shipment/view/tracking.phtml | 6 + .../template/sales/order/totalbar.phtml | 6 + .../default/template/sales/order/totals.phtml | 6 + .../template/sales/order/view/form.phtml | 6 + .../sales/order/view/giftmessage.phtml | 12 +- .../template/sales/order/view/history.phtml | 10 +- .../template/sales/order/view/info.phtml | 34 +- .../template/sales/order/view/items.phtml | 6 + .../order/view/items/renderer/default.phtml | 6 + .../sales/order/view/tab/history.phtml | 6 + .../template/sales/order/view/tab/info.phtml | 8 +- .../template/sales/order/view/tracking.phtml | 6 + .../default/template/store/switcher.phtml | 6 + .../template/store/switcher/enhanced.phtml | 117 + .../template/system/autocomplete.phtml | 6 + .../default/template/system/cache/edit.phtml | 26 +- .../default/template/system/config/edit.phtml | 11 +- .../system/config/form/field/array.phtml | 28 +- .../default/template/system/config/js.phtml | 18 +- .../default/template/system/config/tabs.phtml | 15 +- .../template/system/convert/profile/run.phtml | 6 +- .../system/convert/profile/wizard.phtml | 8 +- .../system/currency/rate/matrix.phtml | 6 + .../template/system/currency/rates.phtml | 6 + .../default/template/system/design/edit.phtml | 8 +- .../template/system/design/index.phtml | 6 + .../template/system/email/template/edit.phtml | 10 +- .../template/system/email/template/list.phtml | 6 + .../system/email/template/preview.phtml | 6 + .../default/template/system/info.phtml | 6 + .../system/shipping/applicable_country.phtml | 13 +- .../template/system/shipping/ups.phtml | 10 +- .../template/system/store/delete_group.phtml | 8 +- .../template/system/store/delete_store.phtml | 8 +- .../system/store/delete_website.phtml | 8 +- .../default/default/template/tag/edit.phtml | 8 +- .../default/default/template/tag/index.phtml | 6 + .../template/tax/class/page/edit.phtml | 8 +- .../default/template/tax/importExport.phtml | 64 +- .../default/template/tax/rate/form.phtml | 10 +- .../default/template/tax/rate/title.phtml | 28 +- .../template/tax/toolbar/class/add.phtml | 6 + .../template/tax/toolbar/class/save.phtml | 8 +- .../template/tax/toolbar/rate/add.phtml | 6 + .../template/tax/toolbar/rate/save.phtml | 8 +- .../template/tax/toolbar/rule/add.phtml | 6 + .../template/tax/toolbar/rule/save.phtml | 8 +- .../default/template/urlrewrite/form.phtml | 6 + .../urlrewrite/product/categories.phtml | 131 +- .../default/template/widget/accordion.phtml | 6 + .../default/template/widget/breadcrumbs.phtml | 6 + .../default/template/widget/form.phtml | 6 + .../template/widget/form/container.phtml | 6 + .../template/widget/form/element.phtml | 246 +- .../widget/form/element/gallery.phtml | 15 +- .../widget/form/renderer/element.phtml | 6 + .../widget/form/renderer/fieldset.phtml | 25 +- .../form/renderer/fieldset/element.phtml | 68 +- .../default/template/widget/grid.phtml | 12 +- .../template/widget/grid/container.phtml | 6 + .../template/widget/grid/massaction.phtml | 6 + .../default/template/widget/tabs.phtml | 6 + .../default/template/widget/tabshoriz.phtml | 7 + .../default/template/widget/tabsleft.phtml | 6 + .../template/widget/view/container.phtml | 6 + .../default/default/layout/bundle.xml | 6 + .../default/default/layout/catalog.xml | 6 + .../default/default/layout/catalogsearch.xml | 12 + .../default/default/layout/checkout.xml | 6 + .../frontend/default/default/layout/cms.xml | 6 + .../default/default/layout/contacts.xml | 6 + .../frontend/default/default/layout/core.xml | 6 + .../default/default/layout/customer.xml | 6 + .../default/default/layout/directory.xml | 16 + .../default/default/layout/giftmessage.xml | 6 + .../default/layout/googleanalytics.xml | 6 + .../default/default/layout/googlecheckout.xml | 6 + .../default/default/layout/newsletter.xml | 6 + .../frontend/default/default/layout/page.xml | 7 + .../default/default/layout/paypal.xml | 6 + .../default/default/layout/paypaluk.xml | 6 + .../frontend/default/default/layout/poll.xml | 6 + .../default/default/layout/productalert.xml | 6 + .../default/default/layout/reports.xml | 6 + .../default/default/layout/review.xml | 7 + .../frontend/default/default/layout/rss.xml | 6 + .../frontend/default/default/layout/sales.xml | 6 + .../default/default/layout/sendfriend.xml | 6 + .../default/default/layout/shipping.xml | 6 + .../frontend/default/default/layout/tag.xml | 6 + .../default/default/layout/wishlist.xml | 6 + .../bundle/catalog/product/list/partof.phtml | 6 + .../bundle/catalog/product/price.phtml | 20 +- .../bundle/catalog/product/view/price.phtml | 10 +- .../catalog/product/view/tierprices.phtml | 6 + .../catalog/product/view/type/bundle.phtml | 10 +- .../view/type/bundle/option/checkbox.phtml | 10 +- .../view/type/bundle/option/multi.phtml | 6 + .../view/type/bundle/option/radio.phtml | 14 +- .../view/type/bundle/option/select.phtml | 8 +- .../product/view/type/bundle/options.phtml | 6 + .../order/items/creditmemo/default.phtml | 19 +- .../email/order/items/invoice/default.phtml | 19 +- .../email/order/items/order/default.phtml | 21 +- .../email/order/items/shipment/default.phtml | 10 +- .../order/creditmemo/items/renderer.phtml | 45 +- .../sales/order/invoice/items/renderer.phtml | 43 +- .../bundle/sales/order/items/renderer.phtml | 46 +- .../sales/order/shipment/items/renderer.phtml | 16 +- .../default/template/callouts/left_col.phtml | 24 +- .../default/template/callouts/right_col.phtml | 6 + .../template/catalog/category/page.phtml | 8 +- .../template/catalog/category/view.phtml | 8 + .../template/catalog/layer/filter.phtml | 6 + .../template/catalog/layer/state.phtml | 12 +- .../default/template/catalog/layer/view.phtml | 12 +- .../template/catalog/navigation/left.phtml | 6 + .../template/catalog/navigation/top.phtml | 6 + .../catalog/product/compare/list.phtml | 16 +- .../catalog/product/compare/sidebar.phtml | 6 + .../template/catalog/product/gallery.phtml | 9 +- .../template/catalog/product/list.phtml | 82 +- .../catalog/product/list/related.phtml | 6 + .../catalog/product/list/toolbar.phtml | 9 +- .../catalog/product/list/upsell.phtml | 6 + .../template/catalog/product/new.phtml | 76 +- .../template/catalog/product/price.phtml | 61 +- .../template/catalog/product/view.phtml | 10 +- .../catalog/product/view/additional.phtml | 6 + .../template/catalog/product/view/addto.phtml | 6 + .../catalog/product/view/addtocart.phtml | 6 + .../catalog/product/view/attributes.phtml | 8 +- .../catalog/product/view/description.phtml | 6 + .../template/catalog/product/view/media.phtml | 14 +- .../catalog/product/view/options.phtml | 20 +- .../product/view/options/type/date.phtml | 6 + .../product/view/options/type/file.phtml | 6 + .../product/view/options/type/select.phtml | 12 +- .../product/view/options/type/text.phtml | 10 +- .../product/view/options/wrapper.phtml | 20 +- .../product/view/options/wrapper/bottom.phtml | 8 +- .../template/catalog/product/view/price.phtml | 6 + .../catalog/product/view/price_clone.phtml | 6 + .../catalog/product/view/tierprices.phtml | 6 + .../product/view/type/configurable.phtml | 6 + .../catalog/product/view/type/grouped.phtml | 6 + .../view/type/options/configurable.phtml | 8 +- .../catalog/product/view/type/simple.phtml | 6 + .../catalog/product/view/type/virtual.phtml | 6 + .../template/catalog/seo/sitemap.phtml | 6 + .../catalog/seo/sitemap/container.phtml | 6 + .../catalogsearch/advanced/form.phtml | 19 +- .../catalogsearch/advanced/result.phtml | 11 +- .../template/catalogsearch/form.mini.phtml | 6 + .../template/catalogsearch/result.phtml | 11 +- .../default/template/catalogsearch/term.phtml | 6 + .../default/template/checkout/cart.phtml | 10 +- .../template/checkout/cart/coupon.phtml | 6 + .../template/checkout/cart/crosssell.phtml | 6 + .../template/checkout/cart/item/default.phtml | 6 + .../template/checkout/cart/noItems.phtml | 6 + .../checkout/cart/render/default.phtml | 6 + .../checkout/cart/render/simple.phtml | 6 + .../template/checkout/cart/shipping.phtml | 10 +- .../template/checkout/cart/sidebar.phtml | 11 +- .../checkout/cart/sidebar/default.phtml | 8 +- .../template/checkout/cart/totals.phtml | 8 +- .../default/template/checkout/links.phtml | 6 + .../multishipping/address/select.phtml | 8 +- .../checkout/multishipping/addresses.phtml | 6 + .../checkout/multishipping/agreements.phtml | 6 + .../checkout/multishipping/billing.phtml | 6 + .../multishipping/billing/items.phtml | 6 + .../checkout/multishipping/item/default.phtml | 6 + .../checkout/multishipping/link.phtml | 6 + .../checkout/multishipping/overview.phtml | 20 +- .../checkout/multishipping/shipping.phtml | 8 +- .../checkout/multishipping/state.phtml | 6 + .../checkout/multishipping/success.phtml | 6 + .../default/template/checkout/onepage.phtml | 6 + .../checkout/onepage/agreements.phtml | 6 + .../template/checkout/onepage/billing.phtml | 10 +- .../template/checkout/onepage/failure.phtml | 6 + .../template/checkout/onepage/link.phtml | 6 + .../template/checkout/onepage/login.phtml | 8 + .../template/checkout/onepage/payment.phtml | 7 +- .../checkout/onepage/payment/methods.phtml | 10 +- .../template/checkout/onepage/progress.phtml | 15 +- .../template/checkout/onepage/review.phtml | 11 +- .../checkout/onepage/review/info.phtml | 10 +- .../checkout/onepage/review/item.phtml | 6 + .../template/checkout/onepage/shipping.phtml | 10 +- .../checkout/onepage/shipping_method.phtml | 6 + .../onepage/shipping_method/additional.phtml | 6 + .../onepage/shipping_method/available.phtml | 10 +- .../default/template/checkout/success.phtml | 6 + .../default/template/checkout/total/tax.phtml | 2 +- .../default/template/cms/content.phtml | 6 + .../default/default/template/cms/meta.phtml | 6 + .../default/template/contacts/form.phtml | 6 + .../template/customer/account/dashboard.phtml | 6 + .../customer/account/dashboard/address.phtml | 6 + .../customer/account/dashboard/hello.phtml | 6 + .../customer/account/dashboard/info.phtml | 6 + .../account/dashboard/newsletter.phtml | 6 + .../customer/account/dashboard/sidebar.phtml | 6 + .../customer/account/navigation.phtml | 6 + .../default/template/customer/address.phtml | 8 +- .../template/customer/address/book.phtml | 8 + .../template/customer/address/edit.phtml | 6 + .../default/template/customer/balance.phtml | 6 + .../default/template/customer/dashboard.phtml | 9 +- .../template/customer/form/address.phtml | 6 + .../customer/form/changepassword.phtml | 6 + .../template/customer/form/confirmation.phtml | 18 +- .../default/template/customer/form/edit.phtml | 22 +- .../customer/form/forgotpassword.phtml | 26 +- .../template/customer/form/login.phtml | 7 + .../template/customer/form/mini.login.phtml | 6 + .../customer/form/mini.newsletter.phtml | 6 + .../template/customer/form/newsletter.phtml | 8 + .../template/customer/form/register.phtml | 26 +- .../default/template/customer/logout.phtml | 6 + .../template/customer/order/view.phtml | 161 +- .../default/template/customer/orders.phtml | 6 + .../template/customer/widget/dob.phtml | 59 +- .../template/customer/widget/name.phtml | 7 +- .../template/customer/widget/taxvat.phtml | 10 +- .../default/template/customer/wishlist.phtml | 12 +- .../default/template/directory/currency.phtml | 8 + .../template/directory/currency/switch.phtml | 6 + .../email/order/creditmemo/items.phtml | 23 +- .../template/email/order/invoice/items.phtml | 10 +- .../default/template/email/order/items.phtml | 12 +- .../order/items/creditmemo/default.phtml | 23 +- .../email/order/items/invoice/default.phtml | 23 +- .../email/order/items/order/default.phtml | 23 +- .../email/order/items/shipment/default.phtml | 12 +- .../template/email/order/shipment/items.phtml | 8 +- .../template/email/order/shipment/track.phtml | 6 + .../template/email/productalert/price.phtml | 8 +- .../template/email/productalert/stock.phtml | 8 +- .../default/template/giftmessage/form.phtml | 10 +- .../default/template/giftmessage/helper.phtml | 10 +- .../default/template/giftmessage/inline.phtml | 12 +- .../template/googlecheckout/form.phtml | 6 + .../template/googlecheckout/link.phtml | 6 + .../template/newsletter/subscribe.phtml | 12 +- .../default/template/page/1column.phtml | 11 +- .../default/template/page/2columns-left.phtml | 9 +- .../template/page/2columns-right.phtml | 7 + .../default/template/page/3columns.phtml | 9 +- .../default/template/page/dashboard.phtml | 9 +- .../template/page/html/breadcrumbs.phtml | 6 + .../default/template/page/html/footer.phtml | 6 + .../default/template/page/html/head.phtml | 29 +- .../default/template/page/html/header.phtml | 11 +- .../default/template/page/html/pager.phtml | 6 + .../template/page/html/top.links.phtml | 6 + .../default/template/page/html/wrapper.phtml | 6 + .../default/template/page/one-column.phtml | 9 +- .../default/default/template/page/print.phtml | 25 +- .../default/template/page/redirect.phtml | 6 + .../default/template/page/switch/flags.phtml | 6 + .../template/page/switch/languages.phtml | 6 + .../default/template/page/switch/stores.phtml | 6 + .../template/page/template/container.phtml | 6 + .../template/page/template/links.phtml | 6 + .../default/template/payment/form/cc.phtml | 6 + .../template/payment/form/ccsave.phtml | 6 + .../template/payment/form/checkmo.phtml | 6 + .../template/payment/form/purchaseorder.phtml | 6 + .../default/template/payment/info/cc.phtml | 6 + .../template/payment/info/ccsave.phtml | 6 + .../template/payment/info/checkmo.phtml | 6 + .../template/payment/info/default.phtml | 6 + .../template/payment/info/purchaseorder.phtml | 7 + .../template/paypal/express/form.phtml | 6 + .../template/paypal/express/info.phtml | 6 + .../template/paypal/express/review.phtml | 17 +- .../paypal/express/review/details.phtml | 6 + .../default/template/paypal/link.phtml | 6 + .../template/paypal/standard/form.phtml | 6 + .../template/paypaluk/direct/form.phtml | 8 + .../template/paypaluk/direct/info.phtml | 6 + .../template/paypaluk/express/form.phtml | 6 + .../template/paypaluk/express/info.phtml | 6 + .../template/paypaluk/express/review.phtml | 16 +- .../paypaluk/express/review/details.phtml | 10 +- .../default/template/paypaluk/link.phtml | 6 + .../default/template/poll/active.phtml | 8 + .../default/template/poll/result.phtml | 6 + .../default/template/productalert/price.phtml | 6 + .../default/template/productalert/stock.phtml | 6 + .../default/template/rating/detailed.phtml | 6 + .../reports/home_product_compared.phtml | 76 +- .../reports/home_product_viewed.phtml | 77 +- .../template/reports/product_compared.phtml | 10 +- .../template/reports/product_viewed.phtml | 6 + .../template/review/customer/list.phtml | 6 + .../template/review/customer/recent.phtml | 6 + .../template/review/customer/view.phtml | 6 + .../default/template/review/form.phtml | 6 + .../template/review/helper/summary.phtml | 6 + .../review/helper/summary_short.phtml | 6 + .../template/review/product/view/count.phtml | 6 + .../template/review/product/view/list.phtml | 6 + .../template/review/product/view/other.phtml | 6 + .../default/template/review/view.phtml | 6 + .../default/default/template/rss/list.phtml | 12 +- .../default/template/rss/order/details.phtml | 6 + .../template/sales/order/creditmemo.phtml | 8 + .../sales/order/creditmemo/items.phtml | 8 +- .../creditmemo/items/renderer/default.phtml | 40 +- .../template/sales/order/details.phtml | 6 + .../template/sales/order/history.phtml | 8 +- .../default/template/sales/order/info.phtml | 26 + .../template/sales/order/invoice.phtml | 8 + .../template/sales/order/invoice/items.phtml | 8 +- .../invoice/items/renderer/default.phtml | 45 +- .../default/template/sales/order/items.phtml | 21 +- .../sales/order/items/renderer/default.phtml | 47 +- .../default/template/sales/order/print.phtml | 8 +- .../sales/order/print/creditmemo.phtml | 6 + .../template/sales/order/print/invoice.phtml | 10 +- .../template/sales/order/print/shipment.phtml | 6 + .../template/sales/order/print/tax.phtml | 28 +- .../default/template/sales/order/recent.phtml | 9 +- .../template/sales/order/shipment.phtml | 8 + .../template/sales/order/shipment/items.phtml | 6 + .../shipment/items/renderer/default.phtml | 13 +- .../default/template/sales/order/tax.phtml | 28 +- .../template/sales/order/trackinginfo.phtml | 6 + .../default/template/sales/order/view.phtml | 15 +- .../template/sales/reorder/sidebar.phtml | 12 +- .../default/template/sendfriend/send.phtml | 10 +- .../template/shipping/tracking/popup.phtml | 6 + .../default/default/template/tag/cloud.phtml | 6 + .../default/template/tag/customer/edit.phtml | 6 + .../template/tag/customer/recent.phtml | 6 + .../default/template/tag/customer/tags.phtml | 6 + .../default/template/tag/customer/view.phtml | 8 +- .../default/default/template/tag/list.phtml | 8 + .../default/default/template/tag/mytags.phtml | 84 +- .../default/template/tag/popular.phtml | 6 + .../default/template/tag/product/result.phtml | 6 + .../default/default/template/tag/result.phtml | 6 + .../default/default/template/tag/search.phtml | 8 +- .../template/wishlist/email/items.phtml | 10 +- .../default/template/wishlist/email/rss.phtml | 6 + .../default/template/wishlist/shared.phtml | 6 + .../default/template/wishlist/sharing.phtml | 10 +- .../default/template/wishlist/sidebar.phtml | 6 + .../default/template/wishlist/view.phtml | 16 +- .../install/default/default/layout/main.xml | 6 + .../default/template/install/begin.phtml | 6 + .../default/template/install/config.phtml | 6 + .../template/install/create_admin.phtml | 6 + .../default/template/install/download.phtml | 6 + .../default/template/install/end.phtml | 6 + .../default/template/install/locale.phtml | 6 + .../default/template/install/state.phtml | 6 + .../default/default/template/page.phtml | 34 +- app/etc/config.xml | 9 + app/etc/local.xml.template | 6 + app/etc/modules/Mage_All.xml | 6 + app/etc/modules/Mage_Api.xml | 6 + app/etc/modules/Mage_Bundle.xml | 6 + app/locale/en_US/Mage_Rss.csv | 2 +- app/locale/en_US/Mage_Sales.csv | 4 +- app/locale/en_US/Mage_Tax.csv | 2 +- .../en_US/template/email/payment_failed.html | 14 +- .../template/email/sales/creditmemo_new.html | 2 + .../email/sales/creditmemo_new_guest.html | 2 + .../template/email/sales/invoice_new.html | 3 +- .../email/sales/invoice_new_guest.html | 2 + .../en_US/template/email/sales/order_new.html | 2 + .../template/email/sales/order_new_guest.html | 2 + .../template/email/sales/shipment_new.html | 2 + .../email/sales/shipment_new_guest.html | 2 + cron.php | 6 + downloader/Maged/Controller.php | 6 + downloader/Maged/Exception.php | 6 + downloader/Maged/Model.php | 6 + downloader/Maged/Model/Config.php | 6 + downloader/Maged/Model/Dowloader.php | 6 + downloader/Maged/Model/Pear.php | 6 + downloader/Maged/Model/Pear/Request.php | 6 + downloader/Maged/Model/Session.php | 6 + downloader/Maged/Pear.php | 6 + downloader/Maged/Pear/Frontend.php | 6 + downloader/Maged/Pear/Package.php | 6 + downloader/Maged/View.php | 6 + downloader/index.php | 6 + .../pearlib/php/PEAR/Installer/Role/Mage.php | 6 + .../php/PEAR/Installer/Role/Magecommunity.php | 6 + .../php/PEAR/Installer/Role/Magecore.php | 6 + .../php/PEAR/Installer/Role/Magedesign.php | 6 + .../php/PEAR/Installer/Role/Mageetc.php | 6 + .../php/PEAR/Installer/Role/Magelib.php | 6 + .../php/PEAR/Installer/Role/Magelocal.php | 6 + .../php/PEAR/Installer/Role/Magelocale.php | 6 + .../php/PEAR/Installer/Role/Magemedia.php | 6 + .../php/PEAR/Installer/Role/Mageskin.php | 6 + .../php/PEAR/Installer/Role/Magetest.php | 6 + .../php/PEAR/Installer/Role/Mageweb.php | 6 + downloader/skin/boxes.css | 1 + downloader/skin/install/boxes.css | 6 + downloader/skin/install/clears.css | 6 + downloader/skin/install/ie7minus.css | 6 + downloader/skin/install/iestyles.css | 6 + downloader/skin/install/reset.css | 6 + downloader/template/footer.phtml | 6 + downloader/template/header.phtml | 6 + downloader/template/index.phtml | 6 + downloader/template/install/download.phtml | 6 + downloader/template/install/footer.phtml | 6 + downloader/template/install/header.phtml | 6 + downloader/template/install/writable.phtml | 6 + downloader/template/login.phtml | 6 + downloader/template/messages.phtml | 6 + downloader/template/noroute.phtml | 6 + downloader/template/pear/dist.phtml | 6 + downloader/template/pear/iframe.phtml | 6 + downloader/template/pear/packages.phtml | 10 +- downloader/template/settings.phtml | 6 + downloader/template/writable.phtml | 6 + index.php | 6 + index.php.sample | 6 + install.php | 6 + js/index.php | 12 +- js/lib/boxover.js | 6 + js/lib/dropdown.js | 6 + js/lib/ds-sleight.js | 6 + js/lib/flex.js | 8 +- js/mage/adminhtml/accordion.js | 8 +- js/mage/adminhtml/events.js | 7 + js/mage/adminhtml/flexuploader.js | 15 +- js/mage/adminhtml/form.js | 34 +- js/mage/adminhtml/giftmessage.js | 6 + js/mage/adminhtml/grid.js | 40 +- js/mage/adminhtml/hash.js | 6 + js/mage/adminhtml/image.js | 33 +- js/mage/adminhtml/loader.js | 68 +- js/mage/adminhtml/product.js | 84 +- js/mage/adminhtml/rules.js | 12 +- js/mage/adminhtml/sales.js | 108 +- js/mage/adminhtml/scrollbar.js | 6 + js/mage/adminhtml/tabs.js | 26 +- js/mage/adminhtml/tools.js | 22 +- js/mage/adminhtml/uploader.js | 6 + js/mage/cookies.js | 6 + js/mage/translate.js | 14 +- js/mage/translate_inline.js | 6 + js/prototype/deprecation.js | 374 +++ js/prototype/prototype.js | 2960 +++++++++++------ js/prototype/validation.js | 38 +- js/varien/accordion.js | 24 +- js/varien/form.js | 16 +- js/varien/iehover-fix.js | 41 +- js/varien/js.js | 22 +- js/varien/menu.js | 6 + js/varien/payment.js | 6 + js/varien/product.js | 44 +- js/varien/telephone.js | 6 + lib/Varien/Convert.php | 6 + lib/Varien/Convert/Action.php | 6 + lib/Varien/Convert/Action/Abstract.php | 6 + lib/Varien/Convert/Action/Interface.php | 6 + lib/Varien/Convert/Adapter/Abstract.php | 6 + lib/Varien/Convert/Adapter/Db/Table.php | 6 + lib/Varien/Convert/Adapter/Http.php | 6 + lib/Varien/Convert/Adapter/Http/Curl.php | 6 + lib/Varien/Convert/Adapter/Interface.php | 6 + lib/Varien/Convert/Adapter/Io.php | 6 + lib/Varien/Convert/Adapter/Soap.php | 6 + lib/Varien/Convert/Adapter/Std.php | 6 + lib/Varien/Convert/Adapter/Zend/Cache.php | 6 + lib/Varien/Convert/Adapter/Zend/Db.php | 6 + lib/Varien/Convert/Container/Abstract.php | 6 + lib/Varien/Convert/Container/Collection.php | 6 + lib/Varien/Convert/Container/Generic.php | 6 + lib/Varien/Convert/Container/Interface.php | 6 + lib/Varien/Convert/Exception.php | 6 + lib/Varien/Convert/Mapper/Abstract.php | 6 + lib/Varien/Convert/Mapper/Column.php | 6 + lib/Varien/Convert/Mapper/Interface.php | 6 + lib/Varien/Convert/Parser/Abstract.php | 6 + lib/Varien/Convert/Parser/Csv.php | 6 + lib/Varien/Convert/Parser/Interface.php | 6 + lib/Varien/Convert/Parser/Serialize.php | 6 + lib/Varien/Convert/Parser/Xml/Excel.php | 6 + lib/Varien/Convert/Profile.php | 6 + lib/Varien/Convert/Profile/Abstract.php | 6 + lib/Varien/Convert/Profile/Collection.php | 6 + lib/Varien/Convert/Validator/Abstract.php | 6 + lib/Varien/Convert/Validator/Column.php | 6 + lib/Varien/Convert/Validator/Dryrun.php | 6 + lib/Varien/Convert/Validator/Interface.php | 6 + lib/Varien/Crypt.php | 6 + lib/Varien/Crypt/Abstract.php | 6 + lib/Varien/Crypt/Mcrypt.php | 8 +- lib/Varien/Data/Collection.php | 6 + lib/Varien/Data/Collection/Db.php | 64 +- lib/Varien/Data/Form.php | 6 + lib/Varien/Data/Form/Abstract.php | 6 + lib/Varien/Data/Form/Element/Abstract.php | 21 +- lib/Varien/Data/Form/Element/Button.php | 6 + lib/Varien/Data/Form/Element/Checkbox.php | 6 + lib/Varien/Data/Form/Element/Checkboxes.php | 6 + lib/Varien/Data/Form/Element/Collection.php | 6 + lib/Varien/Data/Form/Element/Column.php | 6 + lib/Varien/Data/Form/Element/Date.php | 11 +- lib/Varien/Data/Form/Element/Editor.php | 10 +- lib/Varien/Data/Form/Element/Fieldset.php | 6 + lib/Varien/Data/Form/Element/File.php | 6 + lib/Varien/Data/Form/Element/Gallery.php | 12 +- lib/Varien/Data/Form/Element/Hidden.php | 6 + lib/Varien/Data/Form/Element/Image.php | 18 +- lib/Varien/Data/Form/Element/Imagefile.php | 6 + lib/Varien/Data/Form/Element/Label.php | 6 + lib/Varien/Data/Form/Element/Multiline.php | 15 +- lib/Varien/Data/Form/Element/Multiselect.php | 6 + lib/Varien/Data/Form/Element/Note.php | 6 + lib/Varien/Data/Form/Element/Password.php | 6 + lib/Varien/Data/Form/Element/Radio.php | 6 + lib/Varien/Data/Form/Element/Radios.php | 14 +- .../Data/Form/Element/Renderer/Interface.php | 6 + lib/Varien/Data/Form/Element/Reset.php | 6 + lib/Varien/Data/Form/Element/Select.php | 10 + lib/Varien/Data/Form/Element/Submit.php | 6 + lib/Varien/Data/Form/Element/Text.php | 6 + lib/Varien/Data/Form/Element/Textarea.php | 10 +- lib/Varien/Data/Form/Element/Time.php | 6 + lib/Varien/Data/Tree.php | 6 + lib/Varien/Data/Tree/Db.php | 6 + lib/Varien/Data/Tree/Dbp.php | 159 +- lib/Varien/Data/Tree/Node.php | 6 + lib/Varien/Data/Tree/Node/Collection.php | 6 + lib/Varien/Db/Adapter/Mysqli.php | 6 + lib/Varien/Db/Adapter/Pdo/Mysql.php | 25 + lib/Varien/Db/Exception.php | 6 + lib/Varien/Db/Tree.php | 6 + lib/Varien/Db/Tree/Exception.php | 6 + lib/Varien/Db/Tree/Node.php | 6 + lib/Varien/Db/Tree/Node/Exception.php | 6 + lib/Varien/Db/Tree/NodeSet.php | 6 + lib/Varien/Db/Tree/NodeSet/Exception.php | 6 + lib/Varien/Event.php | 6 + lib/Varien/Event/Collection.php | 6 + lib/Varien/Event/Observer.php | 6 + lib/Varien/Event/Observer/Collection.php | 6 + lib/Varien/Event/Observer/Cron.php | 6 + lib/Varien/Event/Observer/Regex.php | 6 + lib/Varien/Exception.php | 6 + lib/Varien/File/Csv.php | 6 + lib/Varien/File/CsvMulty.php | 6 + lib/Varien/File/Uploader.php | 6 + lib/Varien/File/Uploader/Image.php | 6 + lib/Varien/Filter/Array.php | 6 + lib/Varien/Filter/Array/Grid.php | 6 + lib/Varien/Filter/Email.php | 6 + lib/Varien/Filter/Money.php | 6 + lib/Varien/Filter/Object.php | 6 + lib/Varien/Filter/Object/Grid.php | 6 + lib/Varien/Filter/Sprintf.php | 6 + lib/Varien/Filter/Template.php | 6 + lib/Varien/Filter/Template/Simple.php | 6 + .../Filter/Template/Tokenizer/Abstract.php | 6 + .../Filter/Template/Tokenizer/Parameter.php | 6 + .../Filter/Template/Tokenizer/Variable.php | 6 + lib/Varien/Http/Adapter/Curl.php | 6 + lib/Varien/Http/Client.php | 6 + lib/Varien/Image.php | 6 + lib/Varien/Image/Adapter.php | 6 + lib/Varien/Image/Adapter/Abstract.php | 6 + lib/Varien/Image/Adapter/Gd.php | 6 + lib/Varien/Image/Adapter/Gd2.php | 12 + lib/Varien/Image/Adapter/Imagemagic.php | 6 + lib/Varien/Image/Instruction.php | 6 + lib/Varien/Io/Abstract.php | 6 + lib/Varien/Io/Exception.php | 6 + lib/Varien/Io/File.php | 6 + lib/Varien/Io/Ftp.php | 6 + lib/Varien/Io/Interface.php | 6 + lib/Varien/Io/Sftp.php | 6 + lib/Varien/Object.php | 6 + lib/Varien/Object/Cache.php | 6 + lib/Varien/Profiler.php | 6 + lib/Varien/Simplexml/Config.php | 6 + .../Simplexml/Config/Cache/Abstract.php | 6 + lib/Varien/Simplexml/Config/Cache/File.php | 6 + lib/Varien/Simplexml/Element.php | 19 +- report/config.xml | 6 + report/index.php | 6 + skin/adminhtml/default/default/below_ie7.css | 32 +- skin/adminhtml/default/default/boxes.css | 600 ++-- skin/adminhtml/default/default/ie7.css | 6 + skin/adminhtml/default/default/iestyles.css | 34 +- .../default/images/add_btn_icon-disabled.gif | Bin 0 -> 234 bytes .../default/images/btn_bg-disabled.gif | Bin 0 -> 148 bytes skin/adminhtml/default/default/menu.css | 11 +- skin/adminhtml/default/default/reset.css | 25 +- skin/frontend/default/blue/css/boxes.css | 1555 +++++++++ skin/frontend/default/blue/css/clears.css | 67 + .../css/custom.css => blue/css/ie7.css} | 8 +- skin/frontend/default/blue/css/ie7minus.css | 54 + skin/frontend/default/blue/css/iestyles.css | 92 + skin/frontend/default/blue/css/menu.css | 68 + skin/frontend/default/blue/css/print.css | 93 + skin/frontend/default/blue/css/reset.css | 77 + skin/frontend/default/blue/css/styles.css | 89 + skin/frontend/default/blue/favicon.ico | Bin 0 -> 1150 bytes .../default/blue/images/account_box_bg.gif | Bin 0 -> 117 bytes .../blue/images/account_nav_head_bg.gif | Bin 0 -> 173 bytes .../blue/images/account_nav_link_bg.gif | Bin 0 -> 180 bytes .../default/blue/images/account_nav_on_bg.gif | Bin 0 -> 182 bytes .../blue/images/att_group_label_bg.gif | Bin 0 -> 50 bytes .../blue/images/att_group_last_row_bg.gif | Bin 0 -> 49 bytes .../blue/images/att_group_last_row_lab_bg.gif | Bin 0 -> 1631 bytes .../blue/images/att_group_last_row_odd_bg.gif | Bin 0 -> 49 bytes .../blue/images/attribute_set_toggler_bg.gif | Bin 0 -> 165 bytes .../blue/images/base_mini_actions_bg.gif | Bin 0 -> 63 bytes .../default/blue/images/base_mini_head_bg.gif | Bin 0 -> 96 bytes .../default/blue/images/base_mini_tabs_bg.gif | Bin 0 -> 149 bytes .../default/blue/images/basebox_head_bg.gif | Bin 0 -> 95 bytes .../blue/images/best_selling_tr_even_bg.gif | Bin 0 -> 49 bytes .../blue/images/best_selling_tr_odd_bg.gif | Bin 0 -> 49 bytes .../default/blue/images/bg_collapse.gif | Bin 0 -> 86 bytes .../default/blue/images/bg_tierico.gif | Bin 0 -> 547 bytes .../default/blue/images/bg_tierico1.gif | Bin 0 -> 160 bytes .../frontend/default/blue/images/bkg_body.gif | Bin 0 -> 378 bytes .../default/blue/images/bkg_body2.gif | Bin 0 -> 606 bytes skin/frontend/default/blue/images/bkg_btn.gif | Bin 0 -> 147 bytes .../blue/images/bkg_products-grid1.gif | Bin 0 -> 56 bytes .../blue/images/bkg_products-grid2.gif | Bin 0 -> 54 bytes .../blue/images/bkg_products-grid3.gif | Bin 0 -> 53 bytes .../default/blue/images/bkg_shadow-bottom.png | Bin 0 -> 563 bytes .../default/blue/images/bkg_shadow.png | Bin 0 -> 183 bytes skin/frontend/default/blue/images/body_bg.gif | Bin 0 -> 72 bytes .../blue/images/btn_google_checkout.gif | Bin 0 -> 2940 bytes .../default/blue/images/btn_mini_search.gif | Bin 0 -> 1335 bytes .../blue/images/btn_paypal_checkout.gif | Bin 0 -> 3062 bytes .../default/blue/images/btn_place_order.gif | Bin 0 -> 2341 bytes .../blue/images/btn_proceed_to_checkout.gif | Bin 0 -> 2894 bytes .../blue/images/btn_proceed_to_checkout.png | Bin 0 -> 2777 bytes .../images/btn_proceed_to_checkout_bg.gif | Bin 0 -> 2474 bytes .../images/btn_proceed_to_checkout_dis.gif | Bin 0 -> 3084 bytes .../images/btn_proceed_to_checkout_rad.gif | Bin 0 -> 1126 bytes .../default/blue/images/btn_trash.gif | Bin 0 -> 643 bytes .../default/blue/images/btn_window_close.gif | Bin 0 -> 226 bytes .../frontend/default/blue/images/calendar.gif | Bin 0 -> 391 bytes .../blue/images/cart_out_of_stock_bg.gif | Bin 0 -> 1406 bytes .../catalog/product/placeholder/image.jpg | Bin 0 -> 1957 bytes .../product/placeholder/small_image.jpg | Bin 0 -> 1067 bytes .../catalog/product/placeholder/thumbnail.jpg | Bin 0 -> 854 bytes .../default/blue/images/chart_remove.gif | Bin 0 -> 531 bytes .../images/checkout_progress_active_bg.gif | Bin 0 -> 52 bytes .../blue/images/checkout_progress_bg.gif | Bin 0 -> 325 bytes .../blue/images/checkout_progress_corner.gif | Bin 0 -> 324 bytes .../blue/images/compare_products_bg.gif | Bin 0 -> 50 bytes .../blue/images/comparison_table_label_bg.gif | Bin 0 -> 50 bytes .../images/currency_converter_head_bg.gif | Bin 0 -> 1021 bytes .../blue/images/currency_switcher_bg.gif | Bin 0 -> 2697 bytes .../blue/images/customer_reviews_pager_bg.gif | Bin 0 -> 2385 bytes skin/frontend/default/blue/images/cvv.gif | Bin 0 -> 18112 bytes skin/frontend/default/blue/images/cvv.jpg | Bin 0 -> 68060 bytes .../default/blue/images/data_table_th_bg.gif | Bin 0 -> 43 bytes .../default/blue/images/dotted_divider.gif | Bin 0 -> 43 bytes .../default/blue/images/error_msg_icon.gif | Bin 0 -> 1013 bytes .../default/blue/images/fam_book_open.png | Bin 0 -> 622 bytes .../default/blue/images/fam_world.png | Bin 0 -> 923 bytes .../default/blue/images/footer_bg.gif | Bin 0 -> 73 bytes .../blue/images/footer_container_bg.gif | Bin 0 -> 85 bytes .../blue/images/footer_info_separator.gif | Bin 0 -> 51 bytes .../blue/images/footer_informational_bg.gif | Bin 0 -> 155 bytes .../default/blue/images/footer_left.gif | Bin 0 -> 486 bytes .../blue/images/footer_legality_bg.gif | Bin 0 -> 92 bytes .../default/blue/images/footer_right.gif | Bin 0 -> 489 bytes .../default/blue/images/form_button.gif | Bin 0 -> 918 bytes .../default/blue/images/form_button_alt.gif | Bin 0 -> 918 bytes .../blue/images/free_shipping_callout.jpg | Bin 0 -> 14639 bytes .../blue/images/gift-message-close.gif | Bin 0 -> 122 bytes .../blue/images/gift-message-collapse.gif | Bin 0 -> 70 bytes .../blue/images/gift-message-expand.gif | Bin 0 -> 70 bytes .../frontend/default/blue/images/grid-cal.gif | Bin 0 -> 391 bytes .../default/blue/images/head_browse_by.gif | Bin 0 -> 580 bytes .../default/blue/images/head_my_account.gif | Bin 0 -> 2115 bytes .../default/blue/images/header_bg.gif | Bin 0 -> 471 bytes .../default/blue/images/header_nav_bg.gif | Bin 0 -> 49 bytes .../default/blue/images/header_top_bg.jpg | Bin 0 -> 32536 bytes .../blue/images/header_top_container_bg.jpg | Bin 0 -> 10157 bytes .../blue/images/header_top_container_bg2.jpg | Bin 0 -> 10535 bytes .../default/blue/images/home_left_callout.jpg | Bin 0 -> 11802 bytes .../default/blue/images/home_main_callout.jpg | Bin 0 -> 36053 bytes .../default/blue/images/i_nav-parent.gif | Bin 0 -> 67 bytes .../blue/images/icon_add_to_compare.gif | Bin 0 -> 619 bytes .../default/blue/images/icon_asterick.gif | Bin 0 -> 1019 bytes .../default/blue/images/icon_basket.gif | Bin 0 -> 604 bytes .../default/blue/images/icon_bell.gif | Bin 0 -> 1014 bytes .../default/blue/images/icon_big_rss.png | Bin 0 -> 791 bytes .../blue/images/icon_cart_item_remove.gif | Bin 0 -> 1402 bytes .../default/blue/images/icon_clip.gif | Bin 0 -> 560 bytes .../blue/images/icon_currency_switcher.gif | Bin 0 -> 1073 bytes .../default/blue/images/icon_daily_poll.gif | Bin 0 -> 1025 bytes .../default/blue/images/icon_feed.png | Bin 0 -> 530 bytes .../default/blue/images/icon_folder_table.gif | Bin 0 -> 1039 bytes .../default/blue/images/icon_group.gif | Bin 0 -> 1014 bytes .../default/blue/images/icon_lock.gif | Bin 0 -> 1053 bytes .../default/blue/images/icon_lorry.gif | Bin 0 -> 591 bytes .../default/blue/images/icon_ma_info.gif | Bin 0 -> 604 bytes .../default/blue/images/icon_ma_reviews.gif | Bin 0 -> 614 bytes .../default/blue/images/icon_ma_tags.gif | Bin 0 -> 594 bytes .../blue/images/icon_mini_cart_heading_bg.gif | Bin 0 -> 1001 bytes .../default/blue/images/icon_newspaper.gif | Bin 0 -> 606 bytes .../default/blue/images/icon_opc_back.gif | Bin 0 -> 131 bytes .../default/blue/images/icon_page_white.gif | Bin 0 -> 253 bytes .../blue/images/icon_page_white_text.gif | Bin 0 -> 379 bytes .../default/blue/images/icon_picture.gif | Bin 0 -> 996 bytes .../default/blue/images/icon_printer.gif | Bin 0 -> 1035 bytes .../frontend/default/blue/images/icon_rss.gif | Bin 0 -> 350 bytes .../blue/images/icon_special_price.gif | Bin 0 -> 289 bytes .../default/blue/images/icon_table.gif | Bin 0 -> 600 bytes .../default/blue/images/icon_tag_add.gif | Bin 0 -> 621 bytes .../default/blue/images/icon_tag_green.gif | Bin 0 -> 594 bytes .../default/blue/images/icon_world.gif | Bin 0 -> 1073 bytes .../blue/images/layered_nav_head_bg.gif | Bin 0 -> 1905 bytes .../layered_nav_narrowed_category_heading.gif | Bin 0 -> 43 bytes .../blue/images/layered_navigation_head.gif | Bin 0 -> 684 bytes .../default/blue/images/list_remove_btn.gif | Bin 0 -> 204 bytes .../default/blue/images/listing_type_grid.gif | Bin 0 -> 105 bytes .../default/blue/images/listing_type_list.gif | Bin 0 -> 99 bytes .../default/blue/images/login_box_bg.gif | Bin 0 -> 285 bytes .../blue/images/login_box_form_buttons_bg.gif | Bin 0 -> 49 bytes skin/frontend/default/blue/images/logo.gif | Bin 0 -> 3725 bytes .../default/blue/images/logo_email.gif | Bin 0 -> 3584 bytes .../default/blue/images/logo_print.gif | Bin 0 -> 3584 bytes .../default/blue/images/magnifier_handle.gif | Bin 0 -> 209 bytes skin/frontend/default/blue/images/main_bg.gif | Bin 0 -> 34183 bytes .../default/blue/images/main_container_bg.gif | Bin 0 -> 7629 bytes .../blue/images/media/404_callout1.jpg | Bin 0 -> 17781 bytes .../blue/images/media/404_callout2.jpg | Bin 0 -> 20904 bytes .../blue/images/media/about_us_img.jpg | Bin 0 -> 11123 bytes .../blue/images/media/best_selling_img01.jpg | Bin 0 -> 1817 bytes .../blue/images/media/best_selling_img02.jpg | Bin 0 -> 3118 bytes .../blue/images/media/best_selling_img03.jpg | Bin 0 -> 2516 bytes .../blue/images/media/best_selling_img04.jpg | Bin 0 -> 2455 bytes .../blue/images/media/best_selling_img05.jpg | Bin 0 -> 2799 bytes .../blue/images/media/best_selling_img06.jpg | Bin 0 -> 4898 bytes .../media/cell_phone_landing_banner1.jpg | Bin 0 -> 21259 bytes .../blue/images/media/col_left_callout.jpg | Bin 0 -> 18471 bytes .../blue/images/media/col_right_callout.jpg | Bin 0 -> 14703 bytes .../images/media/electronics_cellphones.jpg | Bin 0 -> 42440 bytes .../media/electronics_digitalcameras.jpg | Bin 0 -> 57481 bytes .../blue/images/media/electronics_laptops.jpg | Bin 0 -> 44643 bytes .../images/media/furniture_callout_spot.jpg | Bin 0 -> 31312 bytes .../blue/images/media/furnitures_bed_room.jpg | Bin 0 -> 2193 bytes .../images/media/furnitures_living_room.jpg | Bin 0 -> 2541 bytes .../media/head_electronics_cellphones.gif | Bin 0 -> 1039 bytes .../media/head_electronics_digicamera.gif | Bin 0 -> 1211 bytes .../images/media/head_electronics_laptops.gif | Bin 0 -> 949 bytes .../blue/images/media/laptop_callout_mid1.jpg | Bin 0 -> 12145 bytes .../blue/images/media/laptop_callout_mid2.jpg | Bin 0 -> 10540 bytes .../blue/images/media/laptop_callout_mid3.jpg | Bin 0 -> 11699 bytes .../blue/images/media/laptop_callout_spot.jpg | Bin 0 -> 30482 bytes .../images/media/shirts_landing_banner1.jpg | Bin 0 -> 27352 bytes .../blue/images/mini_cart_actions_bg.gif | Bin 0 -> 43 bytes .../default/blue/images/mini_cart_head_bg.gif | Bin 0 -> 95 bytes .../blue/images/mini_product_tags_head_bg.gif | Bin 0 -> 63 bytes .../default/blue/images/mini_search_bg.gif | Bin 0 -> 3442 bytes .../blue/images/mini_search_magnifier.gif | Bin 0 -> 609 bytes .../blue/images/multi_address_box_bg.gif | Bin 0 -> 149 bytes .../default/blue/images/narrow_by_bg.gif | Bin 0 -> 169 bytes .../default/blue/images/narrow_by_dd_bg.gif | Bin 0 -> 43 bytes .../default/blue/images/narrow_by_li_by.gif | Bin 0 -> 184 bytes .../default/blue/images/narrow_by_set.gif | Bin 0 -> 182 bytes .../blue/images/narrow_category_bg.gif | Bin 0 -> 149 bytes skin/frontend/default/blue/images/nav_bg.jpg | Bin 0 -> 5089 bytes .../default/blue/images/nav_divider.gif | Bin 0 -> 43 bytes .../default/blue/images/nav_li_bg.gif | Bin 0 -> 67 bytes .../default/blue/images/nav_link_bg.gif | Bin 0 -> 420 bytes .../default/blue/images/nav_link_over_bg.gif | Bin 0 -> 69 bytes .../frontend/default/blue/images/nav_ul_a.gif | Bin 0 -> 58 bytes .../default/blue/images/nav_ul_a_bg.gif | Bin 0 -> 43 bytes .../default/blue/images/nav_ul_a_over.gif | Bin 0 -> 58 bytes .../frontend/default/blue/images/no_image.jpg | Bin 0 -> 14035 bytes .../default/blue/images/note_msg_icon.gif | Bin 0 -> 1022 bytes .../default/blue/images/np_cart_thumb.gif | Bin 0 -> 1372 bytes .../default/blue/images/np_more_img.gif | Bin 0 -> 908 bytes .../default/blue/images/np_product_main.gif | Bin 0 -> 4683 bytes .../frontend/default/blue/images/np_thumb.gif | Bin 0 -> 1945 bytes .../default/blue/images/np_thumb2.gif | Bin 0 -> 1779 bytes .../default/blue/images/ol_count_bg.gif | Bin 0 -> 55 bytes .../default/blue/images/opc-ajax-loader.gif | Bin 0 -> 1849 bytes .../default/blue/images/opc_off_head_bg.gif | Bin 0 -> 49 bytes .../default/blue/images/opc_on_box_bg.gif | Bin 0 -> 63 bytes .../default/blue/images/pager_arrow_left.gif | Bin 0 -> 155 bytes .../default/blue/images/pager_arrow_right.gif | Bin 0 -> 155 bytes .../frontend/default/blue/images/pager_bg.gif | Bin 0 -> 150 bytes skin/frontend/default/blue/images/ph.gif | Bin 0 -> 43 bytes .../blue/images/ph_callout_left_rebel.jpg | Bin 0 -> 14035 bytes .../blue/images/ph_callout_left_top.gif | Bin 0 -> 29101 bytes .../blue/images/ph_callout_monitor.jpg | Bin 0 -> 7945 bytes .../blue/images/ph_category_landing.jpg | Bin 0 -> 103765 bytes .../default/blue/images/ph_product_thumb.jpg | Bin 0 -> 2684 bytes .../default/blue/images/ph_product_thumb2.jpg | Bin 0 -> 9832 bytes .../default/blue/images/ph_product_thumb3.jpg | Bin 0 -> 5975 bytes skin/frontend/default/blue/images/pipe.gif | Bin 0 -> 44 bytes .../default/blue/images/place_order_bg.gif | Bin 0 -> 4580 bytes .../blue/images/place_order_container_bg.gif | Bin 0 -> 1503 bytes .../default/blue/images/point-con.gif | Bin 0 -> 73 bytes .../blue/images/product_collateral_bg.gif | Bin 0 -> 63 bytes .../blue/images/product_essential_bg.gif | Bin 0 -> 10469 bytes .../blue/images/product_info_box_bg.gif | Bin 0 -> 7022 bytes .../blue/images/product_rating_blank_star.gif | Bin 0 -> 304 bytes .../blue/images/product_rating_full_star.gif | Bin 0 -> 306 bytes .../images/product_zoom_overlay_magnif.gif | Bin 0 -> 706 bytes .../default/blue/images/saved_head_bg.gif | Bin 0 -> 471 bytes .../default/blue/images/search_criteria.gif | Bin 0 -> 268 bytes .../blue/images/search_form_button.gif | Bin 0 -> 2017 bytes .../default/blue/images/separator.gif | Bin 0 -> 44 bytes .../blue/images/shipping_method_pointer.gif | Bin 0 -> 1144 bytes .../default/blue/images/shop_access_pipe.gif | Bin 0 -> 51 bytes .../default/blue/images/shop_by_bg.gif | Bin 0 -> 50 bytes .../default/blue/images/slider_bg.gif | Bin 0 -> 68 bytes .../blue/images/slider_btn_zoom_in.gif | Bin 0 -> 443 bytes .../blue/images/slider_btn_zoom_out.gif | Bin 0 -> 432 bytes .../default/blue/images/sort_asc_arrow.gif | Bin 0 -> 115 bytes .../default/blue/images/sort_desc_arrow.gif | Bin 0 -> 114 bytes skin/frontend/default/blue/images/spacer.gif | Bin 0 -> 43 bytes .../default/blue/images/success_msg_icon.gif | Bin 0 -> 1024 bytes .../default/blue/images/table_label_bg.gif | Bin 0 -> 50 bytes .../blue/images/table_label_right_bg.gif | Bin 0 -> 50 bytes .../default/blue/images/this_is_a_demo.gif | Bin 0 -> 2461 bytes .../blue/images/validation_advice_bg.gif | Bin 0 -> 134 bytes skin/frontend/default/blue/js/bundle.js | 150 + skin/frontend/default/blue/js/giftmessage.js | 128 + skin/frontend/default/blue/js/opcheckout.js | 772 +++++ skin/frontend/default/blue/js/paypal.js | 133 + skin/frontend/default/default/css/boxes.css | 357 +- .../default/default/css/boxes.css.theirs | 6 + skin/frontend/default/default/css/clears.css | 10 + skin/frontend/default/default/css/ie7.css | 6 + .../frontend/default/default/css/ie7minus.css | 20 +- .../frontend/default/default/css/iestyles.css | 26 +- skin/frontend/default/default/css/menu.css | 63 +- skin/frontend/default/default/css/print.css | 6 + skin/frontend/default/default/css/reset.css | 6 + skin/frontend/default/default/css/styles.css | 7 +- .../default/images/bkg_products-grid1.gif | Bin 0 -> 56 bytes .../default/images/bkg_products-grid2.gif | Bin 0 -> 54 bytes .../default/images/bkg_products-grid3.gif | Bin 0 -> 53 bytes .../default/default/js/giftmessage.js | 6 + .../frontend/default/default/js/opcheckout.js | 17 +- skin/frontend/default/default/js/paypal.js | 6 + skin/install/default/default/css/boxes.css | 6 + skin/install/default/default/css/clears.css | 6 + skin/install/default/default/css/custom.css | 6 + skin/install/default/default/css/ie7minus.css | 6 + skin/install/default/default/css/iestyles.css | 6 + skin/install/default/default/css/reset.css | 6 + 3843 files changed, 38877 insertions(+), 7411 deletions(-) create mode 100644 app/code/core/Mage/Adminhtml/Block/Catalog/Category/Abstract.php create mode 100644 app/code/core/Mage/Adminhtml/Block/Catalog/Category/Checkboxes/Tree.php create mode 100644 app/code/core/Mage/Adminhtml/Block/Catalog/Category/Edit/Form.php create mode 100644 app/code/core/Mage/Adminhtml/Block/Cms/Page/Grid/Renderer/Action.php create mode 100644 app/code/core/Mage/Adminhtml/Block/Extensions/Custom/Edit/Tab/Grid.php rename app/code/core/Mage/Adminhtml/Block/{Promo/Widget/Chooser/Categories.php => Extensions/Custom/Edit/Tab/Load.php} (50%) create mode 100644 app/code/core/Mage/Adminhtml/Block/Sales/Items/Renderer/Configurable.php create mode 100644 app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Notification.php create mode 100644 app/code/core/Mage/Adminhtml/Model/Extension/Collection.php create mode 100644 app/code/core/Mage/Adminhtml/Model/System/Config/Source/Payment/Allmethods.php create mode 100644 app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Allmethods.php create mode 100644 app/code/core/Mage/Api/etc/system.xml create mode 100644 app/code/core/Mage/Api/sql/api_setup/mysql4-upgrade-0.7.0-0.7.1.php create mode 100644 app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Link/Collection.php create mode 100644 app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.50-0.7.51.php create mode 100644 app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.51-0.7.52.php create mode 100644 app/code/core/Mage/CatalogIndex/Model/Catalog/Index/Flag.php create mode 100644 app/code/core/Mage/CatalogIndex/Model/Catalog/Index/Kill/Flag.php create mode 100644 app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.6-0.7.7.php create mode 100644 app/code/core/Mage/Checkout/Controller/Action.php create mode 100644 app/code/core/Mage/Core/Model/Flag.php create mode 100644 app/code/core/Mage/Core/Model/Mysql4/Flag.php create mode 100644 app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.10-0.8.11.php create mode 100644 app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.8-0.8.9.php create mode 100644 app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.9-0.8.10.php create mode 100644 app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.0-0.8.1.php create mode 100644 app/code/core/Mage/Review/sql/review_setup/mysql4-upgrade-0.7.1-0.7.2.php create mode 100644 app/code/core/Mage/Review/sql/review_setup/mysql4-upgrade-0.7.2-0.7.3.php create mode 100644 app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.14-0.9.15.php create mode 100644 app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.15-0.9.16.php create mode 100644 app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.16-0.9.17.php create mode 100644 app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.17-0.9.18.php create mode 100644 app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.18-0.9.19.php create mode 100644 app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.19-0.9.20.php create mode 100644 app/design/adminhtml/default/default/template/catalog/category/checkboxes/tree.phtml create mode 100644 app/design/adminhtml/default/default/template/catalog/category/edit/form.phtml create mode 100644 app/design/adminhtml/default/default/template/extensions/custom/load.phtml delete mode 100644 app/design/adminhtml/default/default/template/promo/widget/categories.phtml create mode 100644 app/design/adminhtml/default/default/template/sales/order/creditmemo/create/items/renderer/configurable.phtml create mode 100644 app/design/adminhtml/default/default/template/sales/order/creditmemo/view/items/renderer/configurable.phtml create mode 100644 app/design/adminhtml/default/default/template/sales/order/invoice/create/items/renderer/configurable.phtml create mode 100644 app/design/adminhtml/default/default/template/sales/order/invoice/view/items/renderer/configurable.phtml create mode 100644 app/design/adminhtml/default/default/template/sales/order/shipment/create/items/renderer/configurable.phtml create mode 100644 app/design/adminhtml/default/default/template/sales/order/shipment/view/items/renderer/configurable.phtml create mode 100644 app/design/adminhtml/default/default/template/store/switcher/enhanced.phtml create mode 100644 js/prototype/deprecation.js create mode 100644 skin/adminhtml/default/default/images/add_btn_icon-disabled.gif create mode 100644 skin/adminhtml/default/default/images/btn_bg-disabled.gif create mode 100644 skin/frontend/default/blue/css/boxes.css create mode 100644 skin/frontend/default/blue/css/clears.css rename skin/frontend/default/{default/css/custom.css => blue/css/ie7.css} (73%) create mode 100644 skin/frontend/default/blue/css/ie7minus.css create mode 100644 skin/frontend/default/blue/css/iestyles.css create mode 100644 skin/frontend/default/blue/css/menu.css create mode 100644 skin/frontend/default/blue/css/print.css create mode 100644 skin/frontend/default/blue/css/reset.css create mode 100644 skin/frontend/default/blue/css/styles.css create mode 100644 skin/frontend/default/blue/favicon.ico create mode 100644 skin/frontend/default/blue/images/account_box_bg.gif create mode 100644 skin/frontend/default/blue/images/account_nav_head_bg.gif create mode 100644 skin/frontend/default/blue/images/account_nav_link_bg.gif create mode 100644 skin/frontend/default/blue/images/account_nav_on_bg.gif create mode 100644 skin/frontend/default/blue/images/att_group_label_bg.gif create mode 100644 skin/frontend/default/blue/images/att_group_last_row_bg.gif create mode 100644 skin/frontend/default/blue/images/att_group_last_row_lab_bg.gif create mode 100644 skin/frontend/default/blue/images/att_group_last_row_odd_bg.gif create mode 100644 skin/frontend/default/blue/images/attribute_set_toggler_bg.gif create mode 100644 skin/frontend/default/blue/images/base_mini_actions_bg.gif create mode 100644 skin/frontend/default/blue/images/base_mini_head_bg.gif create mode 100644 skin/frontend/default/blue/images/base_mini_tabs_bg.gif create mode 100644 skin/frontend/default/blue/images/basebox_head_bg.gif create mode 100644 skin/frontend/default/blue/images/best_selling_tr_even_bg.gif create mode 100644 skin/frontend/default/blue/images/best_selling_tr_odd_bg.gif create mode 100644 skin/frontend/default/blue/images/bg_collapse.gif create mode 100644 skin/frontend/default/blue/images/bg_tierico.gif create mode 100644 skin/frontend/default/blue/images/bg_tierico1.gif create mode 100644 skin/frontend/default/blue/images/bkg_body.gif create mode 100644 skin/frontend/default/blue/images/bkg_body2.gif create mode 100644 skin/frontend/default/blue/images/bkg_btn.gif create mode 100644 skin/frontend/default/blue/images/bkg_products-grid1.gif create mode 100644 skin/frontend/default/blue/images/bkg_products-grid2.gif create mode 100644 skin/frontend/default/blue/images/bkg_products-grid3.gif create mode 100644 skin/frontend/default/blue/images/bkg_shadow-bottom.png create mode 100644 skin/frontend/default/blue/images/bkg_shadow.png create mode 100644 skin/frontend/default/blue/images/body_bg.gif create mode 100644 skin/frontend/default/blue/images/btn_google_checkout.gif create mode 100644 skin/frontend/default/blue/images/btn_mini_search.gif create mode 100644 skin/frontend/default/blue/images/btn_paypal_checkout.gif create mode 100644 skin/frontend/default/blue/images/btn_place_order.gif create mode 100644 skin/frontend/default/blue/images/btn_proceed_to_checkout.gif create mode 100644 skin/frontend/default/blue/images/btn_proceed_to_checkout.png create mode 100644 skin/frontend/default/blue/images/btn_proceed_to_checkout_bg.gif create mode 100644 skin/frontend/default/blue/images/btn_proceed_to_checkout_dis.gif create mode 100644 skin/frontend/default/blue/images/btn_proceed_to_checkout_rad.gif create mode 100644 skin/frontend/default/blue/images/btn_trash.gif create mode 100644 skin/frontend/default/blue/images/btn_window_close.gif create mode 100644 skin/frontend/default/blue/images/calendar.gif create mode 100644 skin/frontend/default/blue/images/cart_out_of_stock_bg.gif create mode 100644 skin/frontend/default/blue/images/catalog/product/placeholder/image.jpg create mode 100644 skin/frontend/default/blue/images/catalog/product/placeholder/small_image.jpg create mode 100644 skin/frontend/default/blue/images/catalog/product/placeholder/thumbnail.jpg create mode 100644 skin/frontend/default/blue/images/chart_remove.gif create mode 100644 skin/frontend/default/blue/images/checkout_progress_active_bg.gif create mode 100644 skin/frontend/default/blue/images/checkout_progress_bg.gif create mode 100644 skin/frontend/default/blue/images/checkout_progress_corner.gif create mode 100644 skin/frontend/default/blue/images/compare_products_bg.gif create mode 100644 skin/frontend/default/blue/images/comparison_table_label_bg.gif create mode 100644 skin/frontend/default/blue/images/currency_converter_head_bg.gif create mode 100644 skin/frontend/default/blue/images/currency_switcher_bg.gif create mode 100644 skin/frontend/default/blue/images/customer_reviews_pager_bg.gif create mode 100644 skin/frontend/default/blue/images/cvv.gif create mode 100644 skin/frontend/default/blue/images/cvv.jpg create mode 100644 skin/frontend/default/blue/images/data_table_th_bg.gif create mode 100644 skin/frontend/default/blue/images/dotted_divider.gif create mode 100644 skin/frontend/default/blue/images/error_msg_icon.gif create mode 100644 skin/frontend/default/blue/images/fam_book_open.png create mode 100644 skin/frontend/default/blue/images/fam_world.png create mode 100644 skin/frontend/default/blue/images/footer_bg.gif create mode 100644 skin/frontend/default/blue/images/footer_container_bg.gif create mode 100644 skin/frontend/default/blue/images/footer_info_separator.gif create mode 100644 skin/frontend/default/blue/images/footer_informational_bg.gif create mode 100644 skin/frontend/default/blue/images/footer_left.gif create mode 100644 skin/frontend/default/blue/images/footer_legality_bg.gif create mode 100644 skin/frontend/default/blue/images/footer_right.gif create mode 100644 skin/frontend/default/blue/images/form_button.gif create mode 100644 skin/frontend/default/blue/images/form_button_alt.gif create mode 100644 skin/frontend/default/blue/images/free_shipping_callout.jpg create mode 100644 skin/frontend/default/blue/images/gift-message-close.gif create mode 100644 skin/frontend/default/blue/images/gift-message-collapse.gif create mode 100644 skin/frontend/default/blue/images/gift-message-expand.gif create mode 100644 skin/frontend/default/blue/images/grid-cal.gif create mode 100644 skin/frontend/default/blue/images/head_browse_by.gif create mode 100644 skin/frontend/default/blue/images/head_my_account.gif create mode 100644 skin/frontend/default/blue/images/header_bg.gif create mode 100644 skin/frontend/default/blue/images/header_nav_bg.gif create mode 100644 skin/frontend/default/blue/images/header_top_bg.jpg create mode 100644 skin/frontend/default/blue/images/header_top_container_bg.jpg create mode 100644 skin/frontend/default/blue/images/header_top_container_bg2.jpg create mode 100644 skin/frontend/default/blue/images/home_left_callout.jpg create mode 100644 skin/frontend/default/blue/images/home_main_callout.jpg create mode 100644 skin/frontend/default/blue/images/i_nav-parent.gif create mode 100644 skin/frontend/default/blue/images/icon_add_to_compare.gif create mode 100644 skin/frontend/default/blue/images/icon_asterick.gif create mode 100644 skin/frontend/default/blue/images/icon_basket.gif create mode 100644 skin/frontend/default/blue/images/icon_bell.gif create mode 100644 skin/frontend/default/blue/images/icon_big_rss.png create mode 100644 skin/frontend/default/blue/images/icon_cart_item_remove.gif create mode 100644 skin/frontend/default/blue/images/icon_clip.gif create mode 100644 skin/frontend/default/blue/images/icon_currency_switcher.gif create mode 100644 skin/frontend/default/blue/images/icon_daily_poll.gif create mode 100644 skin/frontend/default/blue/images/icon_feed.png create mode 100644 skin/frontend/default/blue/images/icon_folder_table.gif create mode 100644 skin/frontend/default/blue/images/icon_group.gif create mode 100644 skin/frontend/default/blue/images/icon_lock.gif create mode 100644 skin/frontend/default/blue/images/icon_lorry.gif create mode 100644 skin/frontend/default/blue/images/icon_ma_info.gif create mode 100644 skin/frontend/default/blue/images/icon_ma_reviews.gif create mode 100644 skin/frontend/default/blue/images/icon_ma_tags.gif create mode 100644 skin/frontend/default/blue/images/icon_mini_cart_heading_bg.gif create mode 100644 skin/frontend/default/blue/images/icon_newspaper.gif create mode 100644 skin/frontend/default/blue/images/icon_opc_back.gif create mode 100644 skin/frontend/default/blue/images/icon_page_white.gif create mode 100644 skin/frontend/default/blue/images/icon_page_white_text.gif create mode 100644 skin/frontend/default/blue/images/icon_picture.gif create mode 100644 skin/frontend/default/blue/images/icon_printer.gif create mode 100644 skin/frontend/default/blue/images/icon_rss.gif create mode 100644 skin/frontend/default/blue/images/icon_special_price.gif create mode 100644 skin/frontend/default/blue/images/icon_table.gif create mode 100644 skin/frontend/default/blue/images/icon_tag_add.gif create mode 100644 skin/frontend/default/blue/images/icon_tag_green.gif create mode 100644 skin/frontend/default/blue/images/icon_world.gif create mode 100644 skin/frontend/default/blue/images/layered_nav_head_bg.gif create mode 100644 skin/frontend/default/blue/images/layered_nav_narrowed_category_heading.gif create mode 100644 skin/frontend/default/blue/images/layered_navigation_head.gif create mode 100644 skin/frontend/default/blue/images/list_remove_btn.gif create mode 100644 skin/frontend/default/blue/images/listing_type_grid.gif create mode 100644 skin/frontend/default/blue/images/listing_type_list.gif create mode 100644 skin/frontend/default/blue/images/login_box_bg.gif create mode 100644 skin/frontend/default/blue/images/login_box_form_buttons_bg.gif create mode 100644 skin/frontend/default/blue/images/logo.gif create mode 100644 skin/frontend/default/blue/images/logo_email.gif create mode 100644 skin/frontend/default/blue/images/logo_print.gif create mode 100644 skin/frontend/default/blue/images/magnifier_handle.gif create mode 100644 skin/frontend/default/blue/images/main_bg.gif create mode 100644 skin/frontend/default/blue/images/main_container_bg.gif create mode 100644 skin/frontend/default/blue/images/media/404_callout1.jpg create mode 100644 skin/frontend/default/blue/images/media/404_callout2.jpg create mode 100644 skin/frontend/default/blue/images/media/about_us_img.jpg create mode 100644 skin/frontend/default/blue/images/media/best_selling_img01.jpg create mode 100644 skin/frontend/default/blue/images/media/best_selling_img02.jpg create mode 100644 skin/frontend/default/blue/images/media/best_selling_img03.jpg create mode 100644 skin/frontend/default/blue/images/media/best_selling_img04.jpg create mode 100644 skin/frontend/default/blue/images/media/best_selling_img05.jpg create mode 100644 skin/frontend/default/blue/images/media/best_selling_img06.jpg create mode 100644 skin/frontend/default/blue/images/media/cell_phone_landing_banner1.jpg create mode 100644 skin/frontend/default/blue/images/media/col_left_callout.jpg create mode 100644 skin/frontend/default/blue/images/media/col_right_callout.jpg create mode 100644 skin/frontend/default/blue/images/media/electronics_cellphones.jpg create mode 100644 skin/frontend/default/blue/images/media/electronics_digitalcameras.jpg create mode 100644 skin/frontend/default/blue/images/media/electronics_laptops.jpg create mode 100644 skin/frontend/default/blue/images/media/furniture_callout_spot.jpg create mode 100644 skin/frontend/default/blue/images/media/furnitures_bed_room.jpg create mode 100644 skin/frontend/default/blue/images/media/furnitures_living_room.jpg create mode 100644 skin/frontend/default/blue/images/media/head_electronics_cellphones.gif create mode 100644 skin/frontend/default/blue/images/media/head_electronics_digicamera.gif create mode 100644 skin/frontend/default/blue/images/media/head_electronics_laptops.gif create mode 100644 skin/frontend/default/blue/images/media/laptop_callout_mid1.jpg create mode 100644 skin/frontend/default/blue/images/media/laptop_callout_mid2.jpg create mode 100644 skin/frontend/default/blue/images/media/laptop_callout_mid3.jpg create mode 100644 skin/frontend/default/blue/images/media/laptop_callout_spot.jpg create mode 100644 skin/frontend/default/blue/images/media/shirts_landing_banner1.jpg create mode 100644 skin/frontend/default/blue/images/mini_cart_actions_bg.gif create mode 100644 skin/frontend/default/blue/images/mini_cart_head_bg.gif create mode 100644 skin/frontend/default/blue/images/mini_product_tags_head_bg.gif create mode 100644 skin/frontend/default/blue/images/mini_search_bg.gif create mode 100644 skin/frontend/default/blue/images/mini_search_magnifier.gif create mode 100644 skin/frontend/default/blue/images/multi_address_box_bg.gif create mode 100644 skin/frontend/default/blue/images/narrow_by_bg.gif create mode 100644 skin/frontend/default/blue/images/narrow_by_dd_bg.gif create mode 100644 skin/frontend/default/blue/images/narrow_by_li_by.gif create mode 100644 skin/frontend/default/blue/images/narrow_by_set.gif create mode 100644 skin/frontend/default/blue/images/narrow_category_bg.gif create mode 100644 skin/frontend/default/blue/images/nav_bg.jpg create mode 100644 skin/frontend/default/blue/images/nav_divider.gif create mode 100644 skin/frontend/default/blue/images/nav_li_bg.gif create mode 100644 skin/frontend/default/blue/images/nav_link_bg.gif create mode 100644 skin/frontend/default/blue/images/nav_link_over_bg.gif create mode 100644 skin/frontend/default/blue/images/nav_ul_a.gif create mode 100644 skin/frontend/default/blue/images/nav_ul_a_bg.gif create mode 100644 skin/frontend/default/blue/images/nav_ul_a_over.gif create mode 100644 skin/frontend/default/blue/images/no_image.jpg create mode 100644 skin/frontend/default/blue/images/note_msg_icon.gif create mode 100644 skin/frontend/default/blue/images/np_cart_thumb.gif create mode 100644 skin/frontend/default/blue/images/np_more_img.gif create mode 100644 skin/frontend/default/blue/images/np_product_main.gif create mode 100644 skin/frontend/default/blue/images/np_thumb.gif create mode 100644 skin/frontend/default/blue/images/np_thumb2.gif create mode 100644 skin/frontend/default/blue/images/ol_count_bg.gif create mode 100644 skin/frontend/default/blue/images/opc-ajax-loader.gif create mode 100644 skin/frontend/default/blue/images/opc_off_head_bg.gif create mode 100644 skin/frontend/default/blue/images/opc_on_box_bg.gif create mode 100644 skin/frontend/default/blue/images/pager_arrow_left.gif create mode 100644 skin/frontend/default/blue/images/pager_arrow_right.gif create mode 100644 skin/frontend/default/blue/images/pager_bg.gif create mode 100644 skin/frontend/default/blue/images/ph.gif create mode 100644 skin/frontend/default/blue/images/ph_callout_left_rebel.jpg create mode 100644 skin/frontend/default/blue/images/ph_callout_left_top.gif create mode 100644 skin/frontend/default/blue/images/ph_callout_monitor.jpg create mode 100644 skin/frontend/default/blue/images/ph_category_landing.jpg create mode 100644 skin/frontend/default/blue/images/ph_product_thumb.jpg create mode 100644 skin/frontend/default/blue/images/ph_product_thumb2.jpg create mode 100644 skin/frontend/default/blue/images/ph_product_thumb3.jpg create mode 100644 skin/frontend/default/blue/images/pipe.gif create mode 100644 skin/frontend/default/blue/images/place_order_bg.gif create mode 100644 skin/frontend/default/blue/images/place_order_container_bg.gif create mode 100644 skin/frontend/default/blue/images/point-con.gif create mode 100644 skin/frontend/default/blue/images/product_collateral_bg.gif create mode 100644 skin/frontend/default/blue/images/product_essential_bg.gif create mode 100644 skin/frontend/default/blue/images/product_info_box_bg.gif create mode 100644 skin/frontend/default/blue/images/product_rating_blank_star.gif create mode 100644 skin/frontend/default/blue/images/product_rating_full_star.gif create mode 100644 skin/frontend/default/blue/images/product_zoom_overlay_magnif.gif create mode 100644 skin/frontend/default/blue/images/saved_head_bg.gif create mode 100644 skin/frontend/default/blue/images/search_criteria.gif create mode 100644 skin/frontend/default/blue/images/search_form_button.gif create mode 100644 skin/frontend/default/blue/images/separator.gif create mode 100644 skin/frontend/default/blue/images/shipping_method_pointer.gif create mode 100644 skin/frontend/default/blue/images/shop_access_pipe.gif create mode 100644 skin/frontend/default/blue/images/shop_by_bg.gif create mode 100644 skin/frontend/default/blue/images/slider_bg.gif create mode 100644 skin/frontend/default/blue/images/slider_btn_zoom_in.gif create mode 100644 skin/frontend/default/blue/images/slider_btn_zoom_out.gif create mode 100644 skin/frontend/default/blue/images/sort_asc_arrow.gif create mode 100644 skin/frontend/default/blue/images/sort_desc_arrow.gif create mode 100644 skin/frontend/default/blue/images/spacer.gif create mode 100644 skin/frontend/default/blue/images/success_msg_icon.gif create mode 100644 skin/frontend/default/blue/images/table_label_bg.gif create mode 100644 skin/frontend/default/blue/images/table_label_right_bg.gif create mode 100644 skin/frontend/default/blue/images/this_is_a_demo.gif create mode 100644 skin/frontend/default/blue/images/validation_advice_bg.gif create mode 100644 skin/frontend/default/blue/js/bundle.js create mode 100644 skin/frontend/default/blue/js/giftmessage.js create mode 100644 skin/frontend/default/blue/js/opcheckout.js create mode 100644 skin/frontend/default/blue/js/paypal.js create mode 100644 skin/frontend/default/default/images/bkg_products-grid1.gif create mode 100644 skin/frontend/default/default/images/bkg_products-grid2.gif create mode 100644 skin/frontend/default/default/images/bkg_products-grid3.gif diff --git a/404/index.php b/404/index.php index dfa6038d07..b25633390c 100644 --- a/404/index.php +++ b/404/index.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Core * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/STATUS.txt b/STATUS.txt index d9b200dbdd..ac41677749 100644 --- a/STATUS.txt +++ b/STATUS.txt @@ -2,291 +2,18 @@ This file tracks the status of Magento in the 1.1.x branch. FIXED BUGS: - #2222: Product Alerts thru Catalog Price Rules - #4346: make tax_class_id attribute applicable only to simple, configurable, virtual by default - #4369: When translate-inline mode is set to yes Sales Report page shows XHTML code - #4481: The logo image size displayed on PayPal checkout - #4513: Msg that product was removed from compare list is not displyed in My Account view - #4528: Shipping quotes in shopping cart page - #4637: txt change - admin forgot password - #4651: Google Sitemap wil not generate - #4703: Imported configurable products don't work - #4878: ID column should have range for search - #4953: The 'Minimum order amount' should apply after the coupon is applied - #5034: multiple store feature not working on the backend - #5050: Product Browsing / list.phtml doesnt support transparency - #5076: Check for duplicate email only after "Place Order" clicked, payment goes through, and checkout does not end - #5105: Error while removing products from websites - #5117 - removed type hinting from setGroup() - #5132: Grammatical error - #5133: Poor grammar - #5173: Czech Republic - part of EU - have missing currency - #5194: back links chaos in client dashboard - #5202: Attribute Label doesn't change on the frontend - #5207: Fix template\page\switch\flags.phtml - #5216: Wrong interface behavior/comment when traying to delete customer group that customers are assigned to - #5222: single address doubles in the dropdown menu in multi-shipping page checkout - #5223: 'Read Details' hyperlink is brought to magento community site in the same window - #5234: Some strings not working for translation / can not be translated - #5235: Company Address and Order Date not showing in Print Order - #5250: Magento (or underlying software) is damaging transparent images, replacing transparency with black - #5262: First Class International is not available as an option in USPS shipping configuration - #5265: Typo in Functionname - #5267: Free shipping - Minimum order amount bug with multiple currency - #5271: Mage_Reports config.xml - #5273: Hiding button containers does not seem to work on FF2 PC - #5278: Error message for 'Email to a friend' - #5320: Price alert is not sent to someone who signed up for 'Sign up for price alert' on the frontend - #5322: Advanced Search - Yes/No Attribute Issue - #5324: Payflow Pro Proxy for Godaddy.com - #5356: Import All Products: prices over 1000 are saved as 1 or 10 - #5364: Transactional Email templates - #5368: Global Customer Account and Cart - #5370: The exact amount paid can NOT be refunded - #5376: Custom options are not working in IE 6 - #5379: Shopping cart rule defective for payments - #5381: Invalid page view during order creation - #5387: Incorrect Wishlist Menu - #5397: Unable to reorder configurable product on front - #5398: Store's and store view's switcher works incorrect - #5419: Selecting Custom Option doesn't update product price at all - #5422: Keep the same size of popup window for images galery on Product Page while using Prev/Nex actions - #5423: Impossible to de-select non-required radio button custom option - #5432: Inconsistent SEO URL's - #5434: Undefined index error message when trying to add custom option in admin order - #5441: Configurable product image is always used in Cart regardless configuration - #5442: Adding related products to Cart doesn't work - #5452: Invalid data in Comment field - #5466: Payment method is disabled in admin checkout - #5467: After Error tab is not marking - #5478: Shipping address in onepage - #5479: catalog product image placeholder failed to load, if skin had no placeholder image. - #5483: Shorttag makes an error in admin. - #5491: Unable to cancel coupon code. - #5504: Cart price rules: Total Items Qty condition doesn't work - #5506: Cannot add SKU from products list in Condition and Action subselection if pagination options were used - #5512: Order number shold be a link - #5516: place order button kept disabled after error - #5517: "About Us", "Customer Service" error 404 page - #5540: Customers addresses can't be edited in admin. - #5570: Backoffice : create new order , problem with payment method under Windows - #5583: Product prices don't import properly - #5587: IE bug in decorateGeneric() - #5588: & encoding on Cart page - #5595: Checkboxes Form Element - #5599: IE 6, one of radio buttons should be marked by default - #5602: Import All Products profile throws error if store column is missing - #5608: Trouble after double adding product to s.cart - #5614: Short tag endif error - #5647: "Please select one of the options" alerts shown only for first item - #5652: Advanced Search listing: search form is displayed on 'Add to compare' action, when grid/list was changed - #5666: Expiration date of CC is not marked - #5685: Create shipment -> 'add tracking' doesn't work when creating Invoice in Admin - #5689: Customer Export - #5694: Unable to use capital letters in e-mail address - #5695: Fatal error after password recovery in the admin page - #5712: Paypal Standard Shipping and Tax Issue - #5714: magento crash when seting wrong package name - #5720: no product description in default theme. Also prevented bug in blank. - #5722: Error on Web Services -> Users - #5723: Text "View All" not localised in sidebar - #5728: Unnecessary rows it the Admin -> Reports -> Products-> Low stock - #5738: Unable to specify Special price to product for specific store view - #5742: link clickable after guest checkout - #5750: Products with required fields Custom Options should be invisible in some cases - #5754: 404 on both sides after trying to c - #5755: Invalid image place on front - #5772: add en_NZ to etc/config.xml - #5779: Broken view of long SKU in FF 2 - #5784: Broken previewing of large picture at the front end - #5789: Store switch doesn't add SID parameter to url - #5790: Defect - if Custom Option is chossen - Related Products Up-sells Cross-sells - #5807: Need to have some validation for product.create API call - #5812: invalid api path for both getspecialprice and setspecial price - #5819: Bundle item are not showing at the front end (hasOptions attribute saving for bundles and configurable products) - #5825: Autogenerated URL keys issue - #5833: Multistore: Call to a member function getStoreIds() - #5839: form integrity in gift messages in multicheckout - #5850: app/code/core/Mage/Media/Model/File/Image.php - image conversion fails with upper case image extensions - #5851: saveAs in app/code/core/Mage/Media/Model/File/Image.php fails to report correct error - #5856: Exception after in the shopping cart with 0.00 tax rate - #5873: Security Warning in Admin - #5875: Sitemap error - #5833: Multistore: Call to a member function getStoreIds() - #5881: catalogindex_reindex_all cron job fails - #5882: Session of Admin User persists even after user is deleted - #5891: Cannot add Custom Options in Safari 3x - #5911: Can't add (inch) symbol - #6066: Configurable products not reducing when purchased - #6072: Virtual products and Paypal Standard - #6120: People can order configurable products when they are out of stock - #6121: Payment screen does not work correctly using Modern theme - #6147: Cannot check out shopping cart that use Check / Money Order as payment option - #6269: Fatal Error with Multiple Websites - getStoreIds() - Fixed dynamic SKU & weight, fixed SKU for products with custom options, multiselect options - Fixed admin notifications URL - Fixed cache management issues - Fixed catalogindex refreshing for all stores - Fixed saving out of stock product state, fixed back to stock issue for composit items - Fixed loading the whole categories tree for each category item - Fixed getting address items for billing/shipping quote addresses - Fixed bug in Protx controller - Fixed base tax amount in orders, googlecheckout taxes, applying tax after discount, full tax info issues, admin tax info - Fixed flat order item attribute creation - Fixed shopping cart reports, sales reports collection - Fixed quote totals for shopping cart containing virtual products - Fixed sales order controllers and layout - Fixed PDF generation - Fixed dymanic bundle price calculation - Fixed incorrect country-region pairs saving - Fixed attribute label translation issue (exception on attribute save) - Fixed tier prices in grouped products - Fixed Core_Block_Abstract sorted children issue - Fixed category RSS block cache - Fixed getting product ids in catalogindex indexer, fixed grouped product save issue, grouped product price indexing, grouped/bundle product sorting by price - Fixed giftmessage module installation and upgrade - Fixed problem with admin router name change - Fixed configurable products (with a lot of attributes) admin edit form and frontend product view, fixed setting route name for non-default module (oscommerce/adminhtml_orders) - Fixed links to shipments, invoices and creditmemos in admin - Fixed virtual products taxes - Fixed google checkout with virtual items, made google checkout to work with 'shipping price includes tax' settings - Fixed configurable product price models - Fixed bundle price in wishlist - Fixed custom options validation - Fixed email templates (added custom options, bundle options) - Fixed onepage checkout payment information - Fixed email and cms templates store directive - Fixed mixed (virtual/not virtual) order creation - Fixed price calculation on product view page, displaying custom options price, javascript price updating and formatting, non-required options validation - Fixed error in crontab backend model for Currency, Sitemap, ProductAlert - Fixed displayin bundle products in related block - Fixed catalog breadcrumbs - Fixed multiple addresses checkout for bundles containing virtual items - Fixed converting quote address item into order item - Fixed importing customer addresses - Fixed customer email confirmation - Fixed tier price showing for dynamic bundles - Fixed Magento Connect Manager "Check for Updates" button URL update - Fixed abandoned carts report - Fixed upsell block items limit - Fixed multiselect and select bundle options validation - Fixed Webservices API customer_group.list method, moved repeating product load from Api to Resource, - Fixed create backup (fields having NULL values) - Fixed flat rate and free shipping for virtual products in cart - Fixed custom price tax calculation, added tax configuration 'apply tax on custom/original price', fixed tax info in orders in admin - Fixed sales report for bundles - Fixed base64 urls encoding - Fixed shipping tracking numbers displaying - Fixed shipping price displaying in admin order create form - Fixed salesrule/address validation object - Fixed zip-codes validation - Fixed google checkout button url that broke xhtml - Fixed url rewrites for products in anchor category (for product not assigned to it directly) - Fixed date filter in abandoned cart report - Fixed order base_shipping_tax_amount & shipping_tax_amount saving - Fixed customer shopping cart not displaying child items in admin - Fixed click action in abandoned carts report - Fixed displaing select options in Safari - Fixed radio/checkboxes lables text wrapping - Fixed onepage checkout login form submit with keyboard Enter key - Fixed bundle price calculation on product view page - Fixed usaging URL rewrites for category view (pager, layered navigation) - Fixed creating shipment - Fixed parent items logic in payment methods - Fixed arguments for event in salesrule_validator_process - Fixed inventory checking for bundle products - Fixed updating tier prices with webservices API - Fixed google checkout xml tax section generation - Fixed deleting bundle options - Fixed configurable product weight calculation in shopping cart and checkout - Fixed displaying of pure virtual orders in admin - Fixed fatal error when Soap extension is not installed - Fixed wrong SOAP content type - Fixed errors in invoice/packingslip PDF print-out (added missing fonts, fixed overlapping columns and text wrapping, displaying of non-latin1 texts) - Fixed non-working store switcher - Fixed paypal direct/express/standard errors and shipping calculation when only virtual products are in cart - Fixed internal redirects validation for secure URLs - Fixed configurable products stock deduction - Fixed minimal MySQL version checking in installation wizard - Fixed admin order refund - base tax amount was not stored after refund - Fixed single page checkout issues in modern theme - -CHANGES: +RESOLVED BUGS: - Added bundle product options rendering to shopping cart, updated bundle products pricing model - Added Mage_Core_Helper_String, replaced possible unsafe substr() and strlen() usage in the whole project - with Mage_Core_Helper_String calls - Added parent/chlid items support in shopping cart and in multishipping checkout - Made accordion blocks loaded by Ajax in admin/customer/edit/view page - Removed item type limit from items container block - Added Tax/VAT number configurable attribute to customer info - Changed tax calculation model call to singleton, moved tax logics from template to helper - Created catalogindex data retreivers, added tax calculations support in layered navigation - Added eav-attribute getIdByCode function - Added shipping tax settings into configuration - Added tax before discount attribute into order and quote items - Added 'Apply Discount On Prices Including Tax' configuration option - Added strikeiron tax description and calculation process to display in full tax info - Simplified custom options displaying in shopping cart, upgraded Mage_Core_Helper_String - Added user-agent detection by regexps and setting custom package or theme according to it - Added Admin tab in Advanced system config: select admin start page, set custom admin URL - Added 'Add Block Names to Hints' configuration option - Added SQL debugging option in code - Replaced product reviews summary helper with block/template, removed review helper calls from all templates packs, added possibility to rewrite review summary template in layout - Product compare block changed to use products attributes list from configuration - Removed superProduct methods - Added 'Placed from IP' to order info - Added shopping cart sidebar displaying configuration settings - Added calculatePrice call in product collection - Added scope check before saving attribute, in case it is used in configurable product - Added full tax info into customer order view - Added event in addressToOrderAddress() method - Created containers on product view page, moved custom options, configurable options and bundle options to containers, added product attribute to define the container that should be used, moved all products types options into separate templates in all themes - Added filter by products with required options to collection; - Moved checking of selected required options to product type instance - Added 'non-recursive' param to js/varien/js.js/decorateList() - Modified catalog product edit page categories tree (to load only assigned categories by default) - Added taxes on options, fixed js script to update price on product view page - Additional items can be added to upsell list through events - Fixed catalog/product/image helper and model, rewritten Varien image lib, made setBaseFile() independent from heading slash in filename, fixed image __destruct() issue - Added configuration option to remove space between currency sign and price value - Added optional parameter to control if span container is included or not for price - Added hasOptions() to products view blocks of each type, updated product view container template. - Moved product descriptions and additional data in separate blocks, moved "Add to cart" and "Add to wishlist / compare" to blocks - Simplified decorateTable(), decorateList() and decorateDataList() - - Added admin path (frontname) installation option - Added additional catalog tables to optimize layered navigation performance - Improved empty shopping cart performance for sidebar and remove shopping cart cache option - Improved compare list and compare list sidebar performance - Implemented AJAX loading for more product edit form tabs: categories, custom options, bundle items - Added ko_KR - "Korean (South Korea)" locale - Added subtotal attributes (with and without discount) to quote - Added option to create a shipment for fixed-price bundle with separate shipments - Added Content Height field to Terms & Conditions agreements - Created function prepareInvoice in order model, cleaned invoice creation code from duplications - Simplified product/view layout in all themes - Added unsetCallChild to block/abstract - Moved tier prices to blocks - Added clone price block for modern theme - Design updates, themes cleanup - - Implemented duplicating custom options when duplicating a product - Added missing demo notice in modern theme - Added validation "_isUrlInternal" to check all referer, redirect and success urls - Added availability to reset query params for url generation - Added priority (sort order) to promo/quote/grid - Added event salesrule_validator_process - Added hiding long options on orders, invoices, etc on frontend - Set svn:ignore on downloader/pearlib/cache - Added N/A label in shipments for virtual products in bundle - - iPhone theme updated for 1.1 - Upgraded core/helper/string for binary-safe string operations - Added html escaping in search queries in admin dashboard - Added displaying maximum allowed dataflow upload file size according to server settings + +IMPORTANT CHANGES: + + + +KNOWN ISSUES: + NOTES: diff --git a/app/Mage.php b/app/Mage.php index 41109910c5..6fb64b205c 100644 --- a/app/Mage.php +++ b/app/Mage.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Core * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) @@ -72,9 +78,26 @@ final class Mage { static private $_isDeveloperMode = false; + public static $headersSentThrowsException = true; + public static function getVersion() { - return '1.1.4'; + return '1.1.5'; + } + + /** + * Set all my static data to defaults + * + */ + public static function reset() + { + self::$_registry = array(); + self::$_app = null; + self::$_useCache = array(); + self::$_objects = null; + self::$_isDownloader = false; + self::$_isDeveloperMode = false; + // do not reset $headersSentThrowsException } /** @@ -82,10 +105,14 @@ public static function getVersion() * * @param string $key * @param mixed $value + * @param bool $graceful */ - public static function register($key, $value) + public static function register($key, $value, $graceful = false) { - if(isset(self::$_registry[$key])){ + if(isset(self::$_registry[$key])) { + if ($graceful) { + return; + } Mage::throwException('Mage registry key "'.$key.'" already exists'); } self::$_registry[$key] = $value; diff --git a/app/code/core/Mage/Admin/Model/Acl.php b/app/code/core/Mage/Admin/Model/Acl.php index 46339035ea..a77de9d3e0 100644 --- a/app/code/core/Mage/Admin/Model/Acl.php +++ b/app/code/core/Mage/Admin/Model/Acl.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Admin * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Admin/Model/Acl/Assert/Ip.php b/app/code/core/Mage/Admin/Model/Acl/Assert/Ip.php index 7a01fd29ec..8692684196 100644 --- a/app/code/core/Mage/Admin/Model/Acl/Assert/Ip.php +++ b/app/code/core/Mage/Admin/Model/Acl/Assert/Ip.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Admin * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Admin/Model/Acl/Assert/Time.php b/app/code/core/Mage/Admin/Model/Acl/Assert/Time.php index bd3b93876c..6fb67c5879 100644 --- a/app/code/core/Mage/Admin/Model/Acl/Assert/Time.php +++ b/app/code/core/Mage/Admin/Model/Acl/Assert/Time.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Admin * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Admin/Model/Acl/Resource.php b/app/code/core/Mage/Admin/Model/Acl/Resource.php index 9f6407f7e7..c0221e6af7 100644 --- a/app/code/core/Mage/Admin/Model/Acl/Resource.php +++ b/app/code/core/Mage/Admin/Model/Acl/Resource.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Admin * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Admin/Model/Acl/Role.php b/app/code/core/Mage/Admin/Model/Acl/Role.php index 0e6a31794a..5806bc1a6c 100644 --- a/app/code/core/Mage/Admin/Model/Acl/Role.php +++ b/app/code/core/Mage/Admin/Model/Acl/Role.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Admin * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Admin/Model/Acl/Role/Generic.php b/app/code/core/Mage/Admin/Model/Acl/Role/Generic.php index 16afc8911a..86ab04091b 100644 --- a/app/code/core/Mage/Admin/Model/Acl/Role/Generic.php +++ b/app/code/core/Mage/Admin/Model/Acl/Role/Generic.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Admin * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Admin/Model/Acl/Role/Group.php b/app/code/core/Mage/Admin/Model/Acl/Role/Group.php index 88584b865b..257acea935 100644 --- a/app/code/core/Mage/Admin/Model/Acl/Role/Group.php +++ b/app/code/core/Mage/Admin/Model/Acl/Role/Group.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Admin * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Admin/Model/Acl/Role/Registry.php b/app/code/core/Mage/Admin/Model/Acl/Role/Registry.php index 79b1e6b396..3bfad4e095 100644 --- a/app/code/core/Mage/Admin/Model/Acl/Role/Registry.php +++ b/app/code/core/Mage/Admin/Model/Acl/Role/Registry.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Admin * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Admin/Model/Acl/Role/User.php b/app/code/core/Mage/Admin/Model/Acl/Role/User.php index 32dd9980bb..707f778180 100644 --- a/app/code/core/Mage/Admin/Model/Acl/Role/User.php +++ b/app/code/core/Mage/Admin/Model/Acl/Role/User.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Admin * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Admin/Model/Config.php b/app/code/core/Mage/Admin/Model/Config.php index 950288d89e..8681c43321 100644 --- a/app/code/core/Mage/Admin/Model/Config.php +++ b/app/code/core/Mage/Admin/Model/Config.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Admin * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Admin/Model/Mysql4/Acl.php b/app/code/core/Mage/Admin/Model/Mysql4/Acl.php index 4a9c45088b..96a7065d4e 100644 --- a/app/code/core/Mage/Admin/Model/Mysql4/Acl.php +++ b/app/code/core/Mage/Admin/Model/Mysql4/Acl.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Admin * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Admin/Model/Mysql4/Acl/Role.php b/app/code/core/Mage/Admin/Model/Mysql4/Acl/Role.php index 43dea5d213..d2b11bef5f 100644 --- a/app/code/core/Mage/Admin/Model/Mysql4/Acl/Role.php +++ b/app/code/core/Mage/Admin/Model/Mysql4/Acl/Role.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Admin * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Admin/Model/Mysql4/Acl/Role/Collection.php b/app/code/core/Mage/Admin/Model/Mysql4/Acl/Role/Collection.php index 7187df2c8c..c278ae181a 100644 --- a/app/code/core/Mage/Admin/Model/Mysql4/Acl/Role/Collection.php +++ b/app/code/core/Mage/Admin/Model/Mysql4/Acl/Role/Collection.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Admin * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Admin/Model/Mysql4/Permissions/Collection.php b/app/code/core/Mage/Admin/Model/Mysql4/Permissions/Collection.php index d019f25044..28787e916d 100644 --- a/app/code/core/Mage/Admin/Model/Mysql4/Permissions/Collection.php +++ b/app/code/core/Mage/Admin/Model/Mysql4/Permissions/Collection.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Permissions * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Admin/Model/Mysql4/Role.php b/app/code/core/Mage/Admin/Model/Mysql4/Role.php index 03c155c1ca..35885b2c81 100644 --- a/app/code/core/Mage/Admin/Model/Mysql4/Role.php +++ b/app/code/core/Mage/Admin/Model/Mysql4/Role.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Permissions * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Admin/Model/Mysql4/Role/Collection.php b/app/code/core/Mage/Admin/Model/Mysql4/Role/Collection.php index 653a0cf128..765743abbe 100644 --- a/app/code/core/Mage/Admin/Model/Mysql4/Role/Collection.php +++ b/app/code/core/Mage/Admin/Model/Mysql4/Role/Collection.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Permissions * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Admin/Model/Mysql4/Roles.php b/app/code/core/Mage/Admin/Model/Mysql4/Roles.php index 18d959e860..4160cf8db3 100644 --- a/app/code/core/Mage/Admin/Model/Mysql4/Roles.php +++ b/app/code/core/Mage/Admin/Model/Mysql4/Roles.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Permissions * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Admin/Model/Mysql4/Roles/Collection.php b/app/code/core/Mage/Admin/Model/Mysql4/Roles/Collection.php index 6da559a966..d2641a4813 100644 --- a/app/code/core/Mage/Admin/Model/Mysql4/Roles/Collection.php +++ b/app/code/core/Mage/Admin/Model/Mysql4/Roles/Collection.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Permissions * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Admin/Model/Mysql4/Roles/User/Collection.php b/app/code/core/Mage/Admin/Model/Mysql4/Roles/User/Collection.php index 9004bbbf27..5cd3e18da0 100644 --- a/app/code/core/Mage/Admin/Model/Mysql4/Roles/User/Collection.php +++ b/app/code/core/Mage/Admin/Model/Mysql4/Roles/User/Collection.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Permissions * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Admin/Model/Mysql4/Rules.php b/app/code/core/Mage/Admin/Model/Mysql4/Rules.php index c3655a42a7..7bf87e1fc4 100644 --- a/app/code/core/Mage/Admin/Model/Mysql4/Rules.php +++ b/app/code/core/Mage/Admin/Model/Mysql4/Rules.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Permissions * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Admin/Model/Mysql4/Rules/Collection.php b/app/code/core/Mage/Admin/Model/Mysql4/Rules/Collection.php index 3b0e3f184a..484147ca24 100644 --- a/app/code/core/Mage/Admin/Model/Mysql4/Rules/Collection.php +++ b/app/code/core/Mage/Admin/Model/Mysql4/Rules/Collection.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Permissions * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Admin/Model/Mysql4/User.php b/app/code/core/Mage/Admin/Model/Mysql4/User.php index 2f985b2fb1..6f75d6089b 100644 --- a/app/code/core/Mage/Admin/Model/Mysql4/User.php +++ b/app/code/core/Mage/Admin/Model/Mysql4/User.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Admin * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) @@ -205,7 +211,8 @@ public function add(Mage_Core_Model_Abstract $user) { if ($user->getId() > 0) { $role = Mage::getModel('admin/role')->load($user->getRoleId()); } else { - $role = array('tree_level' => 0); + $role = new Varien_Object(); + $role->setTreeLevel(0); } $dbh->insert($this->getTable('admin/role'), array( 'parent_id' => $user->getRoleId(), diff --git a/app/code/core/Mage/Admin/Model/Mysql4/User/Collection.php b/app/code/core/Mage/Admin/Model/Mysql4/User/Collection.php index 1de904a5bb..8a1d0d920e 100644 --- a/app/code/core/Mage/Admin/Model/Mysql4/User/Collection.php +++ b/app/code/core/Mage/Admin/Model/Mysql4/User/Collection.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Permissions * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Admin/Model/Observer.php b/app/code/core/Mage/Admin/Model/Observer.php index aa206f3559..6565c54508 100644 --- a/app/code/core/Mage/Admin/Model/Observer.php +++ b/app/code/core/Mage/Admin/Model/Observer.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Admin * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) @@ -34,7 +40,7 @@ public function actionPreDispatchAdmin($event) $request = Mage::app()->getRequest(); $user = $session->getUser(); - if ($request->getActionName() == 'forgotpassword') { + if ($request->getActionName() == 'forgotpassword' || $request->getActionName() == 'logout') { $request->setDispatched(true); } else { diff --git a/app/code/core/Mage/Admin/Model/Role.php b/app/code/core/Mage/Admin/Model/Role.php index bbef5da283..13ca2cf0ec 100644 --- a/app/code/core/Mage/Admin/Model/Role.php +++ b/app/code/core/Mage/Admin/Model/Role.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Permissions * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Admin/Model/Roles.php b/app/code/core/Mage/Admin/Model/Roles.php index 8966df1187..35f1839b8c 100644 --- a/app/code/core/Mage/Admin/Model/Roles.php +++ b/app/code/core/Mage/Admin/Model/Roles.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Permissions * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Admin/Model/Rules.php b/app/code/core/Mage/Admin/Model/Rules.php index 0aebff5c02..5708897a6d 100644 --- a/app/code/core/Mage/Admin/Model/Rules.php +++ b/app/code/core/Mage/Admin/Model/Rules.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Permissions * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Admin/Model/Session.php b/app/code/core/Mage/Admin/Model/Session.php index fbeb05ad58..145fe76888 100644 --- a/app/code/core/Mage/Admin/Model/Session.php +++ b/app/code/core/Mage/Admin/Model/Session.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Admin * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Admin/Model/User.php b/app/code/core/Mage/Admin/Model/User.php index a0095b988f..f648a091b6 100644 --- a/app/code/core/Mage/Admin/Model/User.php +++ b/app/code/core/Mage/Admin/Model/User.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Permissions * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Admin/etc/admin.xml b/app/code/core/Mage/Admin/etc/admin.xml index 17868936c0..d9cb550329 100644 --- a/app/code/core/Mage/Admin/etc/admin.xml +++ b/app/code/core/Mage/Admin/etc/admin.xml @@ -13,6 +13,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Admin * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Admin/etc/config.xml b/app/code/core/Mage/Admin/etc/config.xml index e269195f3f..3e04ded56b 100644 --- a/app/code/core/Mage/Admin/etc/config.xml +++ b/app/code/core/Mage/Admin/etc/config.xml @@ -13,6 +13,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Admin * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Admin/sql/admin_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/Admin/sql/admin_setup/mysql4-install-0.7.0.php index 4851cb2b9e..00302615f2 100644 --- a/app/code/core/Mage/Admin/sql/admin_setup/mysql4-install-0.7.0.php +++ b/app/code/core/Mage/Admin/sql/admin_setup/mysql4-install-0.7.0.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Admin * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Admin/sql/admin_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/Admin/sql/admin_setup/mysql4-upgrade-0.7.0-0.7.1.php index 6a364f093f..027e968c5d 100644 --- a/app/code/core/Mage/Admin/sql/admin_setup/mysql4-upgrade-0.7.0-0.7.1.php +++ b/app/code/core/Mage/Admin/sql/admin_setup/mysql4-upgrade-0.7.0-0.7.1.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Admin * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/AdminNotification/Helper/Data.php b/app/code/core/Mage/AdminNotification/Helper/Data.php index c8c2386cf0..22896e2e53 100644 --- a/app/code/core/Mage/AdminNotification/Helper/Data.php +++ b/app/code/core/Mage/AdminNotification/Helper/Data.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_AdminNotification * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/AdminNotification/Model/Feed.php b/app/code/core/Mage/AdminNotification/Model/Feed.php index ad14c748c1..b87ffbcd65 100644 --- a/app/code/core/Mage/AdminNotification/Model/Feed.php +++ b/app/code/core/Mage/AdminNotification/Model/Feed.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_AdminNotification * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/AdminNotification/Model/Inbox.php b/app/code/core/Mage/AdminNotification/Model/Inbox.php index 97882b5252..06d7a317b5 100644 --- a/app/code/core/Mage/AdminNotification/Model/Inbox.php +++ b/app/code/core/Mage/AdminNotification/Model/Inbox.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_AdminNotification * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/AdminNotification/Model/Mysql4/Inbox.php b/app/code/core/Mage/AdminNotification/Model/Mysql4/Inbox.php index a67bbd302f..4989f63810 100644 --- a/app/code/core/Mage/AdminNotification/Model/Mysql4/Inbox.php +++ b/app/code/core/Mage/AdminNotification/Model/Mysql4/Inbox.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_AdminNotification * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/AdminNotification/Model/Mysql4/Inbox/Collection.php b/app/code/core/Mage/AdminNotification/Model/Mysql4/Inbox/Collection.php index 4de6daf91b..7eb3a58d3b 100644 --- a/app/code/core/Mage/AdminNotification/Model/Mysql4/Inbox/Collection.php +++ b/app/code/core/Mage/AdminNotification/Model/Mysql4/Inbox/Collection.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_AdminNotification * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/AdminNotification/Model/Observer.php b/app/code/core/Mage/AdminNotification/Model/Observer.php index b117fed2ef..fb56f37380 100644 --- a/app/code/core/Mage/AdminNotification/Model/Observer.php +++ b/app/code/core/Mage/AdminNotification/Model/Observer.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_AdminNotification * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/AdminNotification/etc/config.xml b/app/code/core/Mage/AdminNotification/etc/config.xml index cbdc2151ea..12e8790168 100644 --- a/app/code/core/Mage/AdminNotification/etc/config.xml +++ b/app/code/core/Mage/AdminNotification/etc/config.xml @@ -13,6 +13,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_ProductAlert * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/AdminNotification/etc/system.xml b/app/code/core/Mage/AdminNotification/etc/system.xml index 96fb1c1c56..692ee5cc68 100644 --- a/app/code/core/Mage/AdminNotification/etc/system.xml +++ b/app/code/core/Mage/AdminNotification/etc/system.xml @@ -13,6 +13,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_ProductAlert * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) @@ -52,7 +58,7 @@ label - adminhtml/system_config_form_field_datetime + adminhtml/system_config_form_field_notification 3 1 0 diff --git a/app/code/core/Mage/AdminNotification/sql/adminnotification_setup/mysql4-install-1.0.0.php b/app/code/core/Mage/AdminNotification/sql/adminnotification_setup/mysql4-install-1.0.0.php index 988e0f5f20..087dcf6998 100644 --- a/app/code/core/Mage/AdminNotification/sql/adminnotification_setup/mysql4-install-1.0.0.php +++ b/app/code/core/Mage/AdminNotification/sql/adminnotification_setup/mysql4-install-1.0.0.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_AdminNotification * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Abstract.php b/app/code/core/Mage/Adminhtml/Block/Abstract.php index 50fd270159..d06e6f5350 100644 --- a/app/code/core/Mage/Adminhtml/Block/Abstract.php +++ b/app/code/core/Mage/Adminhtml/Block/Abstract.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Api/Buttons.php b/app/code/core/Mage/Adminhtml/Block/Api/Buttons.php index 0bd30cab1e..03dc67f641 100644 --- a/app/code/core/Mage/Adminhtml/Block/Api/Buttons.php +++ b/app/code/core/Mage/Adminhtml/Block/Api/Buttons.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Api/Editroles.php b/app/code/core/Mage/Adminhtml/Block/Api/Editroles.php index 60c92f2edd..a2f9853258 100644 --- a/app/code/core/Mage/Adminhtml/Block/Api/Editroles.php +++ b/app/code/core/Mage/Adminhtml/Block/Api/Editroles.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Api/Edituser.php b/app/code/core/Mage/Adminhtml/Block/Api/Edituser.php index 3059cdbcfe..85d6491f9a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Api/Edituser.php +++ b/app/code/core/Mage/Adminhtml/Block/Api/Edituser.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Api/Grid/Role.php b/app/code/core/Mage/Adminhtml/Block/Api/Grid/Role.php index 077be70d67..c6e3adc42e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Api/Grid/Role.php +++ b/app/code/core/Mage/Adminhtml/Block/Api/Grid/Role.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Api/Role.php b/app/code/core/Mage/Adminhtml/Block/Api/Role.php index 1055d00bf7..10bfbdcf92 100644 --- a/app/code/core/Mage/Adminhtml/Block/Api/Role.php +++ b/app/code/core/Mage/Adminhtml/Block/Api/Role.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Api/Role/Grid/User.php b/app/code/core/Mage/Adminhtml/Block/Api/Role/Grid/User.php index c00dd8b500..e4ae7ae1ae 100644 --- a/app/code/core/Mage/Adminhtml/Block/Api/Role/Grid/User.php +++ b/app/code/core/Mage/Adminhtml/Block/Api/Role/Grid/User.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Api/Roles.php b/app/code/core/Mage/Adminhtml/Block/Api/Roles.php index cf5ebf307f..b08a7aee46 100644 --- a/app/code/core/Mage/Adminhtml/Block/Api/Roles.php +++ b/app/code/core/Mage/Adminhtml/Block/Api/Roles.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Api/Tab/Roleinfo.php b/app/code/core/Mage/Adminhtml/Block/Api/Tab/Roleinfo.php index e168f8dc0c..6bdec27640 100644 --- a/app/code/core/Mage/Adminhtml/Block/Api/Tab/Roleinfo.php +++ b/app/code/core/Mage/Adminhtml/Block/Api/Tab/Roleinfo.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Api/Tab/Rolesedit.php b/app/code/core/Mage/Adminhtml/Block/Api/Tab/Rolesedit.php index 071f22efdc..51e7fa02e9 100644 --- a/app/code/core/Mage/Adminhtml/Block/Api/Tab/Rolesedit.php +++ b/app/code/core/Mage/Adminhtml/Block/Api/Tab/Rolesedit.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Api/Tab/Rolesusers.php b/app/code/core/Mage/Adminhtml/Block/Api/Tab/Rolesusers.php index 8ac123c48e..75a785592e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Api/Tab/Rolesusers.php +++ b/app/code/core/Mage/Adminhtml/Block/Api/Tab/Rolesusers.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Api/Tab/Userroles.php b/app/code/core/Mage/Adminhtml/Block/Api/Tab/Userroles.php index bdb593687f..84d2b08e41 100644 --- a/app/code/core/Mage/Adminhtml/Block/Api/Tab/Userroles.php +++ b/app/code/core/Mage/Adminhtml/Block/Api/Tab/Userroles.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Api/User.php b/app/code/core/Mage/Adminhtml/Block/Api/User.php index 4f4f5a27f1..7c675a900e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Api/User.php +++ b/app/code/core/Mage/Adminhtml/Block/Api/User.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Api/User/Edit.php b/app/code/core/Mage/Adminhtml/Block/Api/User/Edit.php index 8337f6934e..8a7ae901f3 100644 --- a/app/code/core/Mage/Adminhtml/Block/Api/User/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Api/User/Edit.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Form.php index b03be1c14b..e707236c72 100644 --- a/app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Form.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Tab/Main.php b/app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Tab/Main.php index dab72e5643..b02f24424c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Tab/Main.php +++ b/app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Tab/Main.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Tab/Roles.php b/app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Tab/Roles.php index c9ac41e756..cfd1335730 100644 --- a/app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Tab/Roles.php +++ b/app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Tab/Roles.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Tabs.php b/app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Tabs.php index 6003d93f65..853d5ad314 100644 --- a/app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Tabs.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Api/User/Grid.php b/app/code/core/Mage/Adminhtml/Block/Api/User/Grid.php index 7fe5b4fad0..f138debdba 100644 --- a/app/code/core/Mage/Adminhtml/Block/Api/User/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Api/User/Grid.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Api/Users.php b/app/code/core/Mage/Adminhtml/Block/Api/Users.php index a1b6250e0b..2e76d89602 100644 --- a/app/code/core/Mage/Adminhtml/Block/Api/Users.php +++ b/app/code/core/Mage/Adminhtml/Block/Api/Users.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Backup.php b/app/code/core/Mage/Adminhtml/Block/Backup.php index 093041f688..1411a4cfc4 100644 --- a/app/code/core/Mage/Adminhtml/Block/Backup.php +++ b/app/code/core/Mage/Adminhtml/Block/Backup.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Backup/Grid.php b/app/code/core/Mage/Adminhtml/Block/Backup/Grid.php index 41324be43c..e576b926a1 100644 --- a/app/code/core/Mage/Adminhtml/Block/Backup/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Backup/Grid.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Backup/Grid/Filter/Type.php b/app/code/core/Mage/Adminhtml/Block/Backup/Grid/Filter/Type.php index 3759d3935b..19dd9f93e9 100644 --- a/app/code/core/Mage/Adminhtml/Block/Backup/Grid/Filter/Type.php +++ b/app/code/core/Mage/Adminhtml/Block/Backup/Grid/Filter/Type.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Backup/Grid/Renderer/Type.php b/app/code/core/Mage/Adminhtml/Block/Backup/Grid/Renderer/Type.php index e612064594..e35e289978 100644 --- a/app/code/core/Mage/Adminhtml/Block/Backup/Grid/Renderer/Type.php +++ b/app/code/core/Mage/Adminhtml/Block/Backup/Grid/Renderer/Type.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog.php b/app/code/core/Mage/Adminhtml/Block/Catalog.php index 9dbbec05bf..0399b0a34e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Abstract.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Abstract.php new file mode 100644 index 0000000000..47743cdb42 --- /dev/null +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Abstract.php @@ -0,0 +1,184 @@ + + */ +class Mage_Adminhtml_Block_Catalog_Category_Abstract extends Mage_Adminhtml_Block_Template +{ + + public function __construct() + { + parent::__construct(); + } + + public function getCategory() + { + return Mage::registry('category'); + } + + public function getCategoryId() + { + if ($this->getCategory()) { + return $this->getCategory()->getId(); + } + return Mage_Catalog_Model_Category::TREE_ROOT_ID; + } + + public function getCategoryName() + { + return $this->getCategory()->getName(); + } + + public function getCategoryPath() + { + if ($this->getCategory()) { + return $this->getCategory()->getPath(); + } + return Mage_Catalog_Model_Category::TREE_ROOT_ID; + } + + public function hasStoreRootCategory() + { + $root = $this->getRoot(); + if ($root && $root->getId()) { + return true; + } + return false; + } + + public function getStore() + { + $storeId = (int) $this->getRequest()->getParam('store'); + return Mage::app()->getStore($storeId); + } + + public function getRoot($parentNodeCategory=null, $recursionLevel=3) + { + if (!is_null($parentNodeCategory) && $parentNodeCategory->getId()) { + return $this->getNode($parentNodeCategory, $recursionLevel); + } + $root = Mage::registry('root'); + if (is_null($root)) { + $storeId = (int) $this->getRequest()->getParam('store'); + + if ($storeId) { + $store = Mage::app()->getStore($storeId); + $rootId = $store->getRootCategoryId(); + } + else { + $rootId = Mage_Catalog_Model_Category::TREE_ROOT_ID; + } + + $tree = Mage::getResourceSingleton('catalog/category_tree') + ->load($rootId, $recursionLevel); + + if ($this->getCategory()) { + $tree->loadEnsuredNodes($this->getCategory(), $tree->getNodeById($rootId)); + } + + $tree->addCollectionData($this->getCategoryCollection()); + + $root = $tree->getNodeById($rootId); + + if ($root && $rootId != Mage_Catalog_Model_Category::TREE_ROOT_ID) { + $root->setIsVisible(true); + } + elseif($root && $root->getId() == Mage_Catalog_Model_Category::TREE_ROOT_ID) { + $root->setName(Mage::helper('catalog')->__('Root')); + } + + Mage::register('root', $root); + } + + return $root; + } + + /** + * Get and register categories root by specified categories IDs + * + * IDs can be arbitrary set of any categories ids. + * Tree with minimal required nodes (all parents and neighbours) will be built. + * If ids are empty, default tree with depth = 2 will be returned. + * + * @param array $ids + */ + public function getRootByIds($ids) + { + $root = Mage::registry('root'); + if (null === $root) { + $tree = Mage::getResourceSingleton('catalog/category_tree') + ->loadByIds($ids); + $rootId = Mage_Catalog_Model_Category::TREE_ROOT_ID; + $root = $tree->getNodeById($rootId); + if ($root && $rootId != Mage_Catalog_Model_Category::TREE_ROOT_ID) { + $root->setIsVisible(true); + } + elseif($root && $root->getId() == Mage_Catalog_Model_Category::TREE_ROOT_ID) { + $root->setName(Mage::helper('catalog')->__('Root')); + } + Mage::register('root', $root); + } + return $root; + } + + public function getNode($parentNodeCategory, $recursionLevel=2) + { + $tree = Mage::getResourceModel('catalog/category_tree'); + + $nodeId = $parentNodeCategory->getId(); + $parentId = $parentNodeCategory->getParentId(); + + $node = $tree->loadNode($nodeId); + $node->loadChildren($recursionLevel); + + if ($node && $nodeId != Mage_Catalog_Model_Category::TREE_ROOT_ID) { + $node->setIsVisible(true); + } elseif($node && $node->getId() == Mage_Catalog_Model_Category::TREE_ROOT_ID) { + $node->setName(Mage::helper('catalog')->__('Root')); + } + + $tree->addCollectionData($this->getCategoryCollection()); + + return $node; + } + + public function getSaveUrl(array $args = array()) + { + $params = array('_current'=>true); + $params = array_merge($params, $args); + return $this->getUrl('*/*/save', $params); + } + + public function getEditUrl() + { + return $this->getUrl("*/catalog_category/edit", array('_current'=>true, 'store'=>null, '_query'=>false, 'id'=>null, 'parent'=>null)); + } +} \ No newline at end of file diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Checkboxes/Tree.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Checkboxes/Tree.php new file mode 100644 index 0000000000..b484f5a3fd --- /dev/null +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Checkboxes/Tree.php @@ -0,0 +1,98 @@ + + */ +class Mage_Adminhtml_Block_Catalog_Category_Checkboxes_Tree extends Mage_Adminhtml_Block_Catalog_Category_Tree +{ + protected $_selectedIds = array(); + + protected function _prepareLayout() + { + $this->setTemplate('catalog/category/checkboxes/tree.phtml'); + } + + public function getCategoryIds() + { + return $this->_selectedIds; + } + + public function setCategoryIds($ids) + { + if (empty($ids)) { + $ids = array(); + } + elseif (!is_array($ids)) { + $ids = array((int)$ids); + } + $this->_selectedIds = $ids; + return $this; + } + + protected function _getNodeJson($node, $level = 1) + { + $item = array(); + $item['text']= $this->htmlEscape($node->getName()); + + if ($this->_withProductCount) { + $item['text'].= ' ('.$node->getProductCount().')'; + } + $item['id'] = $node->getId(); + $item['path'] = $node->getData('path'); + $item['cls'] = 'folder ' . ($node->getIsActive() ? 'active-category' : 'no-active-category'); + $item['allowDrop'] = false; + $item['allowDrag'] = false; + + if ($node->hasChildren()) { + $item['children'] = array(); + foreach ($node->getChildren() as $child) { + $item['children'][] = $this->_getNodeJson($child, $level + 1); + } + } + + if (empty($item['children']) && (int)$node->getChildrenCount() > 0) { + $item['children'] = array(); + } + + if (!empty($item['children'])) { + $item['expanded'] = true; + } + + if (in_array($node->getId(), $this->getCategoryIds())) { + $item['checked'] = true; + } + + return $item; + } + + public function getRoot($parentNodeCategory=null, $recursionLevel=3) + { + return $this->getRootByIds($this->getCategoryIds()); + } +} diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Edit.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Edit.php index 31195fea22..392acddd06 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Edit.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) @@ -19,136 +25,21 @@ */ /** - * Category edit block + * Category container block * * @category Mage * @package Mage_Adminhtml * @author Magento Core Team */ -class Mage_Adminhtml_Block_Catalog_Category_Edit extends Mage_Adminhtml_Block_Template +class Mage_Adminhtml_Block_Catalog_Category_Edit extends Mage_Adminhtml_Block_Widget_Form_Container { public function __construct() { + $this->_objectId = 'entity_id'; + $this->_controller = 'catalog_category'; + $this->_mode = 'edit'; + parent::__construct(); $this->setTemplate('catalog/category/edit.phtml'); } - - protected function _prepareLayout() - { - $this->setChild('tabs', - $this->getLayout()->createBlock('adminhtml/catalog_category_tabs', 'tabs') - ); - - $this->setChild('save_button', - $this->getLayout()->createBlock('adminhtml/widget_button') - ->setData(array( - 'label' => Mage::helper('catalog')->__('Save Category'), - 'onclick' => 'categoryForm.submit()', - 'class' => 'save' - )) - ); - - $this->setChild('delete_button', - $this->getLayout()->createBlock('adminhtml/widget_button') - ->setData(array( - 'label' => Mage::helper('catalog')->__('Delete Category'), - 'onclick' => 'categoryDelete()', - 'class' => 'delete' - )) - ); - - $this->setChild('reset_button', - $this->getLayout()->createBlock('adminhtml/widget_button') - ->setData(array( - 'label' => Mage::helper('catalog')->__('Reset'), - 'onclick' => "setLocation('".$this->getUrl('*/*/*', array('_current'=>true))."')" - )) - ); - return parent::_prepareLayout(); - } - - public function hasStoreRootCategory() - { - $root = $this->getLayout()->getBlock('category.tree')->getRoot(); - if ($root && $root->getId()) { - return true; - } - return false; - } - - public function getStoreConfigurationUrl() - { - $storeId = (int) $this->getRequest()->getParam('store'); - $params = array(); -// $params = array('section'=>'catalog'); - if ($storeId) { - $store = Mage::app()->getStore($storeId); - $params['website'] = $store->getWebsite()->getCode(); - $params['store'] = $store->getCode(); - } - return $this->getUrl('*/system_store', $params); - } - - public function getSaveUrl() - { - return $this->getUrl('*/*/save', array('_current'=>true)); - } - - public function getCategoryId() - { - return Mage::registry('category')->getId(); - } - - public function getCategoryName() - { - return Mage::registry('category')->getName(); - } - - public function getDeleteButtonHtml() - { - return $this->getChildHtml('delete_button'); - } - - public function getSaveButtonHtml() - { - if ($this->hasStoreRootCategory()) { - return $this->getChildHtml('save_button'); - } - return ''; - } - - public function getResetButtonHtml() - { - if ($this->hasStoreRootCategory()) { - return $this->getChildHtml('reset_button'); - } - return ''; - } - - public function getTabsHtml() - { - return $this->getChildHtml('tabs'); - } - - public function getHeader() - { - if ($this->hasStoreRootCategory()) { - return $this->getCategoryId() ? $this->getCategoryName() : Mage::helper('catalog')->__('New Category'); - } - return Mage::helper('catalog')->__('Set Root Category For Store'); - } - - public function getDeleteUrl() - { - return $this->getUrl('*/*/delete', array('_current'=>true)); - } - - public function getProductsJson() - { - $products = Mage::registry('category')->getProductsPosition(); - if (!empty($products)) { - return Zend_Json::encode($products); - } - return '{}'; - } } diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Edit/Form.php new file mode 100644 index 0000000000..eec0ad7b72 --- /dev/null +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Edit/Form.php @@ -0,0 +1,143 @@ + + */ +class Mage_Adminhtml_Block_Catalog_Category_Edit_Form extends Mage_Adminhtml_Block_Catalog_Category_Abstract +{ + public function __construct() + { + parent::__construct(); + $this->setTemplate('catalog/category/edit/form.phtml'); + } + + protected function _prepareLayout() + { + $this->setChild('tabs', + $this->getLayout()->createBlock('adminhtml/catalog_category_tabs', 'tabs') + ); + + $this->setChild('save_button', + $this->getLayout()->createBlock('adminhtml/widget_button') + ->setData(array( + 'label' => Mage::helper('catalog')->__('Save Category'), + 'onclick' => "categorySubmit('".$this->getSaveUrl()."',true)", + 'class' => 'save' + )) + ); + + $this->setChild('delete_button', + $this->getLayout()->createBlock('adminhtml/widget_button') + ->setData(array( + 'label' => Mage::helper('catalog')->__('Delete Category'), + 'onclick' => "categoryDelete('".$this->getUrl('*/*/delete', array('_current'=>true))."',true)", + 'class' => 'delete' + )) + ); + + $this->setChild('reset_button', + $this->getLayout()->createBlock('adminhtml/widget_button') + ->setData(array( + 'label' => Mage::helper('catalog')->__('Reset'), + 'onclick' => "categoryReset('".$this->getUrl('*/*/edit', array('_current'=>true))."',true)" + )) + ); + return parent::_prepareLayout(); + } + + public function getStoreConfigurationUrl() + { + $storeId = (int) $this->getRequest()->getParam('store'); + $params = array(); +// $params = array('section'=>'catalog'); + if ($storeId) { + $store = Mage::app()->getStore($storeId); + $params['website'] = $store->getWebsite()->getCode(); + $params['store'] = $store->getCode(); + } + return $this->getUrl('*/system_store', $params); + } + + public function getDeleteButtonHtml() + { + return $this->getChildHtml('delete_button'); + } + + public function getSaveButtonHtml() + { + if ($this->hasStoreRootCategory()) { + return $this->getChildHtml('save_button'); + } + return ''; + } + + public function getResetButtonHtml() + { + if ($this->hasStoreRootCategory()) { + return $this->getChildHtml('reset_button'); + } + return ''; + } + + public function getTabsHtml() + { + return $this->getChildHtml('tabs'); + } + + public function getHeader() + { + if ($this->hasStoreRootCategory()) { + return $this->getCategoryId() ? $this->getCategoryName() : Mage::helper('catalog')->__('New Category'); + } + return Mage::helper('catalog')->__('Set Root Category For Store'); + } + + public function getDeleteUrl(array $args = array()) + { + $params = array('_current'=>true); + $params = array_merge($params, $args); + return $this->getUrl('*/*/delete', $params); + } + + public function getProductsJson() + { + $products = $this->getCategory()->getProductsPosition(); + if (!empty($products)) { + return Zend_Json::encode($products); + } + return '{}'; + } + + public function isAjax() + { + return Mage::app()->getRequest()->isXmlHttpRequest() || Mage::app()->getRequest()->getParam('isAjax'); + } +} diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Image.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Image.php index 3f9f385f2a..c91166b007 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Image.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Image.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/Design.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/Design.php index 8781d530c7..9ed58df323 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/Design.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/Design.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/Feature.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/Feature.php index 2d6dba10b5..030dd2ff60 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/Feature.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/Feature.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/General.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/General.php index c797847f74..eebfeec1a7 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/General.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/General.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) @@ -46,28 +52,50 @@ public function getCategory() public function _prepareLayout() { - parent::_prepareLayout(); + parent::_prepareLayout(); $form = new Varien_Data_Form(); $form->setHtmlIdPrefix('_general'); $form->setDataObject($this->getCategory()); $fieldset = $form->addFieldset('base_fieldset', array('legend'=>Mage::helper('catalog')->__('General Information'))); - $this->_setFieldset($this->getCategory()->getAttributes(true), $fieldset); - if (!$this->getCategory()->getId()) { - $fieldset->addField('path', 'select', array( +// $fieldset->addField('path', 'select', array( +// 'name' => 'path', +// 'label' => Mage::helper('catalog')->__('Parent Category'), +// 'value' => base64_decode($this->getRequest()->getParam('parent')), +// 'values'=> $this->_getParentCategoryOptions(), +// //'required' => true, +// //'class' => 'required-entry' +// ), +// 'name' +// ); + if ($this->getRequest()->getParam('parent')) { + $fieldset->addField('path', 'hidden', array( + 'name' => 'path', + 'value' => $this->getRequest()->getParam('parent') + )); + } else { + $storeId = (int) $this->getRequest()->getParam('store'); + $fieldset->addField('path', 'hidden', array( + 'name' => 'path', + 'value' => 1 + )); + } + } else { + $fieldset->addField('id', 'hidden', array( + 'name' => 'id', + 'value' => $this->getCategory()->getId() + )); + $fieldset->addField('path', 'hidden', array( 'name' => 'path', - 'label' => Mage::helper('catalog')->__('Parent Category'), - 'value' => base64_decode($this->getRequest()->getParam('parent')), - 'values'=> $this->_getParentCategoryOptions(), - //'required' => true, - //'class' => 'required-entry' - ), - 'name' - ); + 'value' => $this->getCategory()->getPath() + )); } - else { + + $this->_setFieldset($this->getCategory()->getAttributes(true), $fieldset); + + if ($this->getCategory()->getId()) { if ($this->getCategory()->getLevel() == 1) { $fieldset->removeField('url_key'); $fieldset->addField('url_key', 'hidden', array( @@ -93,7 +121,7 @@ protected function _getAdditionalElementTypes() protected function _getParentCategoryOptions($node=null, &$options=array()) { if (is_null($node)) { - $node = $this->getLayout()->getBlock('category.tree')->getRoot(); + $node = $this->getRoot(); } if ($node) { diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/Product.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/Product.php index a7890a1037..fa85b20815 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/Product.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/Product.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) @@ -96,7 +102,7 @@ protected function _prepareColumns() $this->addColumn('id', array( 'header' => Mage::helper('catalog')->__('ID'), 'sortable' => true, - 'width' => '60px', + 'width' => '60', 'index' => 'entity_id' )); $this->addColumn('name', array( @@ -105,7 +111,7 @@ protected function _prepareColumns() )); $this->addColumn('sku', array( 'header' => Mage::helper('catalog')->__('SKU'), - 'width' => '80px', + 'width' => '80', 'index' => 'sku' )); $this->addColumn('price', array( @@ -116,7 +122,7 @@ protected function _prepareColumns() )); $this->addColumn('position', array( 'header' => Mage::helper('catalog')->__('Position'), - 'width' => '70px', + 'width' => '70', 'type' => 'number', 'index' => 'position', 'editable' => true diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tabs.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tabs.php index 0580008cbd..2800b2483a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tabs.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tree.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tree.php index 17c07d14b8..61e7c12946 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tree.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tree.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) @@ -26,7 +32,7 @@ * @package Mage_Adminhtml * @author Magento Core Team */ -class Mage_Adminhtml_Block_Catalog_Category_Tree extends Mage_Adminhtml_Block_Template +class Mage_Adminhtml_Block_Catalog_Category_Tree extends Mage_Adminhtml_Block_Catalog_Category_Abstract { protected $_withProductCount; @@ -35,35 +41,46 @@ public function __construct() { parent::__construct(); $this->setTemplate('catalog/category/tree.phtml'); + $this->setUseAjax(true); $this->_withProductCount = true; } protected function _prepareLayout() { - $url = $this->getUrl('*/*/add', array( + $addUrl = $this->getUrl("*/*/add", array( '_current'=>true, - 'parent'=>base64_encode($this->getCategoryPath()), 'id'=>null, )); - $this->setChild('add_button', + + $this->setChild('add_sub_button', $this->getLayout()->createBlock('adminhtml/widget_button') ->setData(array( - 'label' => Mage::helper('catalog')->__('Add New'), - 'onclick' => "setLocation('".$url."')", - 'class' => 'add' + 'label' => Mage::helper('catalog')->__('Add Subcategory'), + 'onclick' => "addNew('".$addUrl."', false)", + 'class' => 'add' + )) + ); + + $this->setChild('add_root_button', + $this->getLayout()->createBlock('adminhtml/widget_button') + ->setData(array( + 'label' => Mage::helper('catalog')->__('Add Root Category'), + 'onclick' => "addNew('".$addUrl."', true)", + 'class' => 'add' )) ); $this->setChild('store_switcher', $this->getLayout()->createBlock('adminhtml/store_switcher') - ->setSwitchUrl($this->getUrl('*/*/*', array('_current'=>true, '_query'=>false,'store'=>null))) + ->setSwitchUrl($this->getUrl('*/*/*', array('_current'=>true, '_query'=>false, 'store'=>null))) + ->setTemplate('store/switcher/enhanced.phtml') ); return parent::_prepareLayout(); } protected function _getDefaultStoreId() { - return Mage_Catalog_Model_Abstract::DEFAULT_STORE_ID;; + return Mage_Catalog_Model_Abstract::DEFAULT_STORE_ID; } public function getCategoryCollection() @@ -85,38 +102,43 @@ public function getCategoryCollection() return $collection; } - public function getAddButtonHtml() + public function getAddRootButtonHtml() { - return $this->getChildHtml('add_button'); + return $this->getChildHtml('add_root_button'); } - public function getStoreSwitcherHtml() + public function getAddSubButtonHtml() { - if (Mage::app()->isSingleStoreMode()) { - return ''; - } - return $this->getChildHtml('store_switcher'); + return $this->getChildHtml('add_sub_button'); } - public function getCategory() + public function getExpandButtonHtml() { - return Mage::registry('category'); + return $this->getChildHtml('expand_button'); } - public function getCategoryId() + public function getCollapseButtonHtml() { - if ($this->getCategory()) { - return $this->getCategory()->getId(); + return $this->getChildHtml('collapse_button'); + } + + public function getStoreSwitcherHtml() + { + if (Mage::app()->isSingleStoreMode()) { + return ''; } - return 1; + return $this->getChildHtml('store_switcher'); } - public function getCategoryPath() + public function getLoadTreeUrl($expanded=null) { - if ($this->getCategory()) { - return $this->getCategory()->getPath(); + $params = array('_current'=>true, 'id'=>null,'store'=>null); + if ( + (is_null($expanded) && Mage::getSingleton('admin/session')->getIsTreeWasExpanded()) + || $expanded == true) { + $params['expand_all'] = true; } - return 1; + return $this->getUrl('*/*/categoriesJson', $params); } public function getNodesUrl() @@ -124,9 +146,14 @@ public function getNodesUrl() return $this->getUrl('*/catalog_category/jsonTree'); } - public function getEditUrl() + public function getSwitchTreeUrl() + { + return $this->getUrl("*/catalog_category/tree", array('_current'=>true, 'store'=>null, '_query'=>false, 'id'=>null, 'parent'=>null)); + } + + public function getIsWasExpanded() { - return $this->getUrl('*/catalog_category/edit', array('_current'=>true, '_query'=>false, 'id'=>null, 'parent'=>null)); + return Mage::getSingleton('admin/session')->getIsTreeWasExpanded(); } public function getMoveUrl() @@ -134,41 +161,16 @@ public function getMoveUrl() return $this->getUrl('*/catalog_category/move', array('store'=>$this->getRequest()->getParam('store'))); } - public function getRoot() + public function getTree($parenNodeCategory=null) { - $root = $this->getData('root'); - if (is_null($root)) { - $storeId = (int) $this->getRequest()->getParam('store'); - - if ($storeId) { - $store = Mage::app()->getStore($storeId); - $rootId = $store->getRootCategoryId(); - } - else { - $rootId = 1; - } - - $tree = Mage::getResourceSingleton('catalog/category_tree') - ->load(); - $root = $tree->getNodeById($rootId); - - if ($root && $rootId != 1) { - $root->setIsVisible(true); - } - elseif($root && $root->getId() == 1) { - $root->setName(Mage::helper('catalog')->__('Root')); - } - - $tree->addCollectionData($this->getCategoryCollection()); - $this->setData('root', $root); - } - - return $root; + $rootArray = $this->_getNodeJson($this->getRoot($parenNodeCategory)); + $tree = isset($rootArray['children']) ? $rootArray['children'] : array(); + return $tree; } - public function getTreeJson() + public function getTreeJson($parenNodeCategory=null) { - $rootArray = $this->_getNodeJson($this->getRoot()); + $rootArray = $this->_getNodeJson($this->getRoot($parenNodeCategory)); $json = Zend_Json::encode(isset($rootArray['children']) ? $rootArray['children'] : array()); return $json; } @@ -190,6 +192,7 @@ protected function _getNodeJson($node, $level=0) { $item = array(); $item['text']= $this->htmlEscape($node->getName()); + if ($this->_withProductCount) { $item['text'].= ' ('.$node->getProductCount().')'; } @@ -198,17 +201,46 @@ protected function _getNodeJson($node, $level=0) $rootForStores = in_array($node->getEntityId(), $this->getRootIds()); $item['id'] = $node->getId(); + $item['store'] = (int) $this->getStore()->getId(); + $item['path'] = $node->getData('path'); + $item['cls'] = 'folder ' . ($node->getIsActive() ? 'active-category' : 'no-active-category'); //$item['allowDrop'] = ($level<3) ? true : false; $item['allowDrop'] = true; // disallow drag if it's first level and category is root of a store $item['allowDrag'] = ($node->getLevel()==1 && $rootForStores) ? false : true; + + if ((int)$node->getChildrenCount()>0) { + $item['children'] = array(); + } + + $isParent = $this->_isParentSelectedCategory($node); + if ($node->hasChildren()) { $item['children'] = array(); - foreach ($node->getChildren() as $child) { - $item['children'][] = $this->_getNodeJson($child, $level+1); + if (!($this->getUseAjax() && $node->getLevel() > 1 && !$isParent)) { + foreach ($node->getChildren() as $child) { + $item['children'][] = $this->_getNodeJson($child, $level+1); + } } } + + if ($isParent || $node->getLevel() < 2) { + $item['expanded'] = true; + } + return $item; } + + protected function _isParentSelectedCategory($node) + { + if ($node && $this->getCategory()) { + $pathIds = $this->getCategory()->getPathIds(); + if (in_array($node->getId(), $pathIds)) { + return true; + } + } + + return false; + } } \ No newline at end of file diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Form.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Form.php index 95cdccf673..eefe25719f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Form.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Form/Renderer/Fieldset/Element.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Form/Renderer/Fieldset/Element.php index e21fa54f30..180b6f3b1c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Form/Renderer/Fieldset/Element.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Form/Renderer/Fieldset/Element.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product.php index 135e70c9a0..9499888834 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute.php index 0fd72aeac8..fc3ebbf054 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit.php index 8ffbdabd71..99a17a57d8 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Form.php index 2024a6d6a6..198cd17156 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Form.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/Front.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/Front.php index e7aedbb36e..2c4ff9ac01 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/Front.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/Front.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/Main.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/Main.php index ff083a06fe..b920c90a76 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/Main.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/Main.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) @@ -85,7 +91,7 @@ protected function _prepareForm() Mage_Catalog_Model_Resource_Eav_Attribute::SCOPE_GLOBAL =>Mage::helper('catalog')->__('Global'), ); - if ($model->getAttributeCode() == 'status') { + if ($model->getAttributeCode() == 'status' || $model->getAttributeCode() == 'tax_class_id') { unset($scopes[Mage_Catalog_Model_Resource_Eav_Attribute::SCOPE_STORE]); } diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/Options.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/Options.php index 04096c325b..0e3d17b042 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/Options.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/Options.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) @@ -103,7 +109,7 @@ public function getOptionValues() $values = array(); $optionCollection = Mage::getResourceModel('eav/entity_attribute_option_collection') ->setAttributeFilter($this->getAttributeObject()->getId()) - ->setPositionOrder('desc') + ->setPositionOrder('desc', true) ->load(); foreach ($optionCollection as $option) { @@ -144,7 +150,7 @@ public function getLabelValues() $frontendLabel = array_shift($frontendLabel); } $translations = Mage::getModel('core/translate_string') - ->load($frontendLabel) + ->load(Mage_Catalog_Model_Entity_Attribute::MODULE_NAME.Mage_Core_Model_Translate::SCOPE_SEPARATOR.$frontendLabel) ->getStoreTranslations(); foreach ($this->getStores() as $store) { if ($store->getId() != 0) { diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/System.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/System.php index 739bc4f372..a1e6f3de18 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/System.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/System.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tabs.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tabs.php index 7823438a9a..acab190774 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tabs.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Grid.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Grid.php index 173acd984b..6b7a39d803 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Grid.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/New/Product/Attributes.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/New/Product/Attributes.php index 29b4ce2a3b..7e4390d892 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/New/Product/Attributes.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/New/Product/Attributes.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/New/Product/Created.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/New/Product/Created.php index f371ca2860..f84cde7fd0 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/New/Product/Created.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/New/Product/Created.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Grid.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Grid.php index 99da037c89..9bd38243a3 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Grid.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main.php index fe34f11420..948ec0bd23 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formattribute.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formattribute.php index 7a2c830449..aff457d440 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formattribute.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formattribute.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formgroup.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formgroup.php index df5fe986d9..7f9411c6fd 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formgroup.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formgroup.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formset.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formset.php index 6ac20c94cb..ea29de7b9e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formset.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formset.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Tree/Attribute.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Tree/Attribute.php index bac26e6a4d..d52c643767 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Tree/Attribute.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Tree/Attribute.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Tree/Group.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Tree/Group.php index cad8b9afaf..df6d29eebd 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Tree/Group.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Tree/Group.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Add.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Add.php index 887cd916e2..0b9d73974a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Add.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Add.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Main.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Main.php index 879b5627f0..1fb503d4ec 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Main.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Main.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Main/Filter.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Main/Filter.php index b56708efbe..7ee8344d0c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Main/Filter.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Main/Filter.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Created.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Created.php index b31f4b0fc1..4c9bd3c33b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Created.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Created.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit.php index caa6d90545..ff148e0a08 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute.php index cf6228eee6..07d1a92077 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tab/Attributes.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tab/Attributes.php index 58c2ff8892..496caf8894 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tab/Attributes.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tab/Attributes.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tab/Inventory.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tab/Inventory.php index 84b0985193..7480e3b676 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tab/Inventory.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tab/Inventory.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tab/Websites.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tab/Websites.php index 2d49bcac01..c622a8c406 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tab/Websites.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tab/Websites.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tabs.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tabs.php index fd408be40e..dce36cf38b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tabs.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Ajax/Serializer.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Ajax/Serializer.php index 458adcf0ec..7200b4bbd8 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Ajax/Serializer.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Ajax/Serializer.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Alerts.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Alerts.php index 483dec0407..5acc966091 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Alerts.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Alerts.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Alerts/Price.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Alerts/Price.php index 9194e80eb7..2adbe6148d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Alerts/Price.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Alerts/Price.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Alerts/Stock.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Alerts/Stock.php index ceb1c50e63..adf1bbb187 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Alerts/Stock.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Alerts/Stock.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Attributes.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Attributes.php index 3481a39685..2e21f9c9a5 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Attributes.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Attributes.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Attributes/Create.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Attributes/Create.php index c06a0be258..eb3c27244c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Attributes/Create.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Attributes/Create.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Categories.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Categories.php index a31b570435..a6a41c3060 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Categories.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Categories.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) @@ -75,9 +81,9 @@ protected function _getNodeJson($node, $level=1) $item['expanded'] = true; } - if ($node->getLevel() > 1 && !$isParent && isset($item['children'])) { - $item['children'] = array(); - } +// if ($node->getLevel() > 1 && !$isParent && isset($item['children'])) { +// $item['children'] = array(); +// } if (in_array($node->getId(), $this->getCategoryIds())) { @@ -115,7 +121,8 @@ protected function _getSelectedNodes() public function getCategoryChildrenJson($categoryId) { - $node = $this->getRoot()->getTree()->getNodeById($categoryId); + $category = Mage::getModel('catalog/category')->load($categoryId); + $node = $this->getRoot($category, 1)->getTree()->getNodeById($categoryId); if (!$node || !$node->hasChildren()) { return '[]'; @@ -129,7 +136,7 @@ public function getCategoryChildrenJson($categoryId) return Zend_Json::encode($children); } - public function getLoadTreeUrl() + public function getLoadTreeUrl($expanded=null) { return $this->getUrl('*/*/categoriesJson', array('_current'=>true)); } diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Crosssell.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Crosssell.php index 97ea0d8535..f045e2196f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Crosssell.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Crosssell.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Inventory.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Inventory.php index 77d1c610b4..a64a6bbe7a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Inventory.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Inventory.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options.php index 9de7c23d0a..1b93c2ba30 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Option.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Option.php index 665b6858c1..2deb620758 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Option.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Option.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) @@ -52,12 +58,12 @@ public function getItemCount() public function setItemCount($itemCount) { - $this->_itemCount = max($this->itemCount, $itemCount); + $this->_itemCount = max($this->_itemCount, $itemCount); return $this; } /** - * Enter description here... + * Get Product * * @return Mage_Catalog_Model_Product */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Abstract.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Abstract.php index 6a6c7546fb..3fb72af344 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Abstract.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Abstract.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Date.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Date.php index 9d727ea91e..d5043f3b4f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Date.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Date.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/File.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/File.php index 3ea41da6ec..9956b386fb 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/File.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/File.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Select.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Select.php index b2726c31ec..d332c1891f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Select.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Select.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Text.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Text.php index 3aacf3b8a3..dcd780087b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Text.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Text.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price.php index 1b8d7ecdc4..f731371939 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Tier.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Tier.php index b549bc221a..10f9199c1d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Tier.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Tier.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Related.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Related.php index 52c7c02d08..864ad4e5db 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Related.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Related.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Settings.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Settings.php index a650992553..6e4a120f51 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Settings.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Settings.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config.php index f344db8a7b..a55c308b17 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid.php index 56d2160298..5e2de89caf 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid/Filter/Inventory.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid/Filter/Inventory.php index 39b6739657..732a343b8e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid/Filter/Inventory.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid/Filter/Inventory.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid/Renderer/Checkbox.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid/Renderer/Checkbox.php index 9caf56a868..ab1c58aff6 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid/Renderer/Checkbox.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid/Renderer/Checkbox.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid/Renderer/Inventory.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid/Renderer/Inventory.php index ea684675ce..55186536e1 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid/Renderer/Inventory.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid/Renderer/Inventory.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Simple.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Simple.php index 27d09a2161..23b4ff2d14 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Simple.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Simple.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) @@ -81,7 +87,7 @@ protected function _prepareForm() $element->setAfterElementHtml( ' ' + . 'onclick="toggleValueElements(this, this.parentNode)" checked="checked" /> ' . '' @@ -102,7 +108,7 @@ protected function _prepareForm() $fieldset->addField( 'simple_product_' . $attributeCode, 'select', array( 'label' => $attribute->getFrontend()->getLabel(), 'name' => $attributeCode, - 'values' => $attribute->getSource()->getAllOptions(), + 'values' => $attribute->getSource()->getAllOptions(true, true), 'required' => true, 'class' => 'validate-configurable', 'onchange' => 'superProduct.showPricing(this, \'' . $attributeCode . '\')' diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Group.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Group.php index 1477a3a108..f0f2a647ff 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Group.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Group.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Settings.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Settings.php index 6bdbb9a069..e4c689fd71 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Settings.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Settings.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Tag.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Tag.php index da4d89e5e4..f46288f744 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Tag.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Tag.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Tag/Customer.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Tag/Customer.php index cabc9102b2..2688a679dc 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Tag/Customer.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Tag/Customer.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Upsell.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Upsell.php index 8c6ef735da..6b6c1c6c00 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Upsell.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Upsell.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Websites.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Websites.php index 78566289e2..70eb44890a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Websites.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Websites.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tabs.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tabs.php index 1beba63512..a851bc6112 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tabs.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tabs/Configurable.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tabs/Configurable.php index 91de246ece..8a890445d9 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tabs/Configurable.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tabs/Configurable.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tabs/Grouped.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tabs/Grouped.php index 4bd90a40f0..565f663691 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tabs/Grouped.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tabs/Grouped.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Frontend/Product/Watermark.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Frontend/Product/Watermark.php index f48c446894..6a41e86f73 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Frontend/Product/Watermark.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Frontend/Product/Watermark.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) @@ -84,9 +90,9 @@ protected function _getHeaderHtml($element) $html.= ''.$element->getLegend().''; // field label column - $html.= ''; + $html.= '
'; if (!$default) { - $html.= ''; + $html.= ''; } $html.= ''; diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Grid.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Grid.php index 8737c3deb5..8c0b81ad1c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Grid.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Apply.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Apply.php index bc5df6b4f9..569afad02e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Apply.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Apply.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Boolean.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Boolean.php index 9eccf72247..bb35cac0ab 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Boolean.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Boolean.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery.php index 08aa212bc9..660f6f6952 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery/Content.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery/Content.php index d3f57819a8..83b36bc35c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery/Content.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery/Content.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Image.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Image.php index 9c31fe20a9..1b4930870d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Image.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Image.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Price.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Price.php index 0d314fee52..ed38eea03b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Price.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Price.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Set/Main.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Set/Main.php index 2d6dba10b5..030dd2ff60 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Set/Main.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Set/Main.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Set/Toolbar/Main.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Set/Toolbar/Main.php index 2d6dba10b5..030dd2ff60 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Set/Toolbar/Main.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Set/Toolbar/Main.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Search.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Search.php index 3e3360b5de..afebc174ce 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Search.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Search.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Search/Edit.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Search/Edit.php index d2229967b5..4a6b553894 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Search/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Search/Edit.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Search/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Search/Edit/Form.php index 2948571748..0d5df85539 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Search/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Search/Edit/Form.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) @@ -87,14 +93,14 @@ protected function _prepareForm() 'name' => 'synonim_for', 'label' => Mage::helper('catalog')->__('Synonym For'), 'title' => Mage::helper('catalog')->__('Synonym For'), - 'after_element_html' => '' . Mage::helper('catalog')->__('(Will make search for the query above return results for this search.)') . '', + 'after_element_html' => '

' . Mage::helper('catalog')->__('(Will make search for the query above return results for this search.)') . '

', )); $fieldset->addField('redirect', 'text', array( 'name' => 'redirect', 'label' => Mage::helper('catalog')->__('Redirect URL'), 'title' => Mage::helper('catalog')->__('Redirect URL'), - 'after_element_html' => '' . Mage::helper('catalog')->__('ex. http://domain.com') . '', + 'after_element_html' => '

' . Mage::helper('catalog')->__('ex. http://domain.com') . '

', )); $fieldset->addField('display_in_terms', 'select', array( diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Search/Grid.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Search/Grid.php index 6c12222f06..8559e78f85 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Search/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Search/Grid.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Checkout/Agreement.php b/app/code/core/Mage/Adminhtml/Block/Checkout/Agreement.php index a8a3c50be3..a47ef56ff8 100644 --- a/app/code/core/Mage/Adminhtml/Block/Checkout/Agreement.php +++ b/app/code/core/Mage/Adminhtml/Block/Checkout/Agreement.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Checkout/Agreement/Edit.php b/app/code/core/Mage/Adminhtml/Block/Checkout/Agreement/Edit.php index b1f724dcdb..ceec4039cc 100644 --- a/app/code/core/Mage/Adminhtml/Block/Checkout/Agreement/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Checkout/Agreement/Edit.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Checkout/Agreement/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Checkout/Agreement/Edit/Form.php index e68238a0a4..2fb08ea896 100644 --- a/app/code/core/Mage/Adminhtml/Block/Checkout/Agreement/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Checkout/Agreement/Edit/Form.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) @@ -54,22 +60,23 @@ protected function _prepareForm() )); $fieldset = $form->addFieldset('base_fieldset', array( - 'legend' => Mage::helper('checkout')->__('Terms and Conditions Information') + 'legend' => Mage::helper('checkout')->__('Terms and Conditions Information'), + 'class' => 'fieldset-wide', )); if ($model->getId()) { - $fieldset->addField('agreement_id', 'hidden', array( + $fieldset->addField('agreement_id', 'hidden', array( 'name' => 'agreement_id', )); } - $fieldset->addField('name', 'text', array( + $fieldset->addField('name', 'text', array( 'name' => 'name', 'label' => Mage::helper('checkout')->__('Condition Name'), 'title' => Mage::helper('checkout')->__('Condition Name'), 'required' => true, )); - $fieldset->addField('is_active', 'select', array( + $fieldset->addField('is_active', 'select', array( 'label' => Mage::helper('checkout')->__('Status'), 'title' => Mage::helper('checkout')->__('Status'), 'name' => 'is_active', @@ -81,7 +88,7 @@ protected function _prepareForm() )); if (!Mage::app()->isSingleStoreMode()) { - $fieldset->addField('store_id', 'multiselect', array( + $fieldset->addField('store_id', 'multiselect', array( 'name' => 'stores[]', 'label' => Mage::helper('checkout')->__('Store View'), 'title' => Mage::helper('checkout')->__('Store View'), @@ -101,15 +108,17 @@ protected function _prepareForm() 'name' => 'checkbox_text', 'label' => Mage::helper('checkout')->__('Checkbox text'), 'title' => Mage::helper('checkout')->__('Checkbox text'), + 'rows' => '5', + 'cols' => '30', 'wysiwyg' => false, 'required' => true, )); - $fieldset->addField('content', 'editor', array( + $fieldset->addField('content', 'editor', array( 'name' => 'content', 'label' => Mage::helper('checkout')->__('Content'), 'title' => Mage::helper('checkout')->__('Content'), - 'style' => 'width: 98%; height: 600px;', + 'style' => 'height:24em;', 'wysiwyg' => false, 'required' => true, )); diff --git a/app/code/core/Mage/Adminhtml/Block/Checkout/Agreement/Grid.php b/app/code/core/Mage/Adminhtml/Block/Checkout/Agreement/Grid.php index cbf4c01ec2..0f4bdfcfa1 100644 --- a/app/code/core/Mage/Adminhtml/Block/Checkout/Agreement/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Checkout/Agreement/Grid.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Block.php b/app/code/core/Mage/Adminhtml/Block/Cms/Block.php index 39d5810b42..2d382ccce5 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cms/Block.php +++ b/app/code/core/Mage/Adminhtml/Block/Cms/Block.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Block/Edit.php b/app/code/core/Mage/Adminhtml/Block/Cms/Block/Edit.php index deaf716380..2a403d8877 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cms/Block/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Cms/Block/Edit.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Block/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Cms/Block/Edit/Form.php index 986da1d49a..3c162c8fc2 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cms/Block/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Cms/Block/Edit/Form.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) @@ -47,7 +53,7 @@ protected function _prepareForm() $form->setHtmlIdPrefix('block_'); - $fieldset = $form->addFieldset('base_fieldset', array('legend'=>Mage::helper('cms')->__('General Information'))); + $fieldset = $form->addFieldset('base_fieldset', array('legend'=>Mage::helper('cms')->__('General Information'), 'class' => 'fieldset-wide')); if ($model->getBlockId()) { $fieldset->addField('block_id', 'hidden', array( @@ -105,7 +111,7 @@ protected function _prepareForm() 'name' => 'content', 'label' => Mage::helper('cms')->__('Content'), 'title' => Mage::helper('cms')->__('Content'), - 'style' => 'width: 98%; height: 600px;', + 'style' => 'height:36em', 'wysiwyg' => false, 'required' => true, )); diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Block/Grid.php b/app/code/core/Mage/Adminhtml/Block/Cms/Block/Grid.php index 76b35729df..16d4116576 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cms/Block/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Cms/Block/Grid.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Page.php b/app/code/core/Mage/Adminhtml/Block/Cms/Page.php index d7d284fcf3..81af057660 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cms/Page.php +++ b/app/code/core/Mage/Adminhtml/Block/Cms/Page.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit.php b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit.php index 56e0cee26b..7f96bebac9 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Form.php index f5b4bce095..cfd1046f77 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Form.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Design.php b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Design.php index a9d8e44c74..1d8cea708c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Design.php +++ b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Design.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) @@ -34,23 +40,23 @@ public function _prepareForm() $model = Mage::registry('cms_page'); $fieldset = $form->addFieldset('design_fieldset', array( - 'legend'=>Mage::helper('cms')->__('Custom Design'), - 'class'=>'cms-edit-form', + 'legend' => Mage::helper('cms')->__('Custom Design'), + 'class' => 'fieldset-wide', )); - $fieldset->addField('custom_theme', 'select', array( + $fieldset->addField('custom_theme', 'select', array( 'name' => 'custom_theme', 'label' => Mage::helper('cms')->__('Custom Theme'), - 'values' => Mage::getModel('core/design_source_design')->getAllOptions(), + 'values' => Mage::getModel('core/design_source_design')->getAllOptions(), )); - $fieldset->addField('custom_theme_from', 'date', array( + $fieldset->addField('custom_theme_from', 'date', array( 'name' => 'custom_theme_from', 'label' => Mage::helper('cms')->__('Custom Theme From'), 'image' => $this->getSkinUrl('images/grid-cal.gif'), )); - $fieldset->addField('custom_theme_to', 'date', array( + $fieldset->addField('custom_theme_to', 'date', array( 'name' => 'custom_theme_to', 'label' => Mage::helper('cms')->__('Custom Theme To'), 'image' => $this->getSkinUrl('images/grid-cal.gif'), @@ -58,9 +64,9 @@ public function _prepareForm() $layouts = array(); foreach (Mage::getConfig()->getNode('global/cms/layouts')->children() as $layoutName=>$layoutConfig) { - $layouts[$layoutName] = (string)$layoutConfig->label; + $layouts[$layoutName] = (string)$layoutConfig->label; } - $fieldset->addField('root_template', 'select', array( + $fieldset->addField('root_template', 'select', array( 'name' => 'root_template', 'label' => Mage::helper('cms')->__('Layout'), 'required' => true, @@ -70,7 +76,7 @@ public function _prepareForm() $fieldset->addField('layout_update_xml', 'editor', array( 'name' => 'layout_update_xml', 'label' => Mage::helper('cms')->__('Layout Update XML'), - 'style' => 'width:98%; height:300px;' + 'style' => 'height:24em;' )); $form->setValues($model->getData()); diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Main.php b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Main.php index 6920b0faf2..aa584e3dff 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Main.php +++ b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Main.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) @@ -37,7 +43,7 @@ protected function _prepareForm() $form->setHtmlIdPrefix('page_'); - $fieldset = $form->addFieldset('base_fieldset', array('legend'=>Mage::helper('cms')->__('General Information'),'class'=>'cms-edit-form')); + $fieldset = $form->addFieldset('base_fieldset', array('legend'=>Mage::helper('cms')->__('General Information'),'class'=>'fieldset-wide')); if ($model->getPageId()) { $fieldset->addField('page_id', 'hidden', array( @@ -58,7 +64,7 @@ protected function _prepareForm() 'title' => Mage::helper('cms')->__('SEF URL Identifier'), 'required' => true, 'class' => 'validate-identifier', - 'after_element_html' => '' . Mage::helper('cms')->__('(eg: domain.com/identifier)') . '', + 'after_element_html' => '

' . Mage::helper('cms')->__('(eg: domain.com/identifier)') . '

', )); /** @@ -96,7 +102,7 @@ protected function _prepareForm() 'name' => 'content', 'label' => Mage::helper('cms')->__('Content'), 'title' => Mage::helper('cms')->__('Content'), - 'style' => 'width:98%; height:600px;', + 'style' => 'height:36em;', 'wysiwyg' => false, 'required' => true, )); diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Meta.php b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Meta.php index 0efee0acc3..d4eab819a2 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Meta.php +++ b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Meta.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) @@ -40,20 +46,18 @@ protected function _prepareForm() $model = Mage::registry('cms_page'); - $fieldset = $form->addFieldset('meta_fieldset', array('legend' => Mage::helper('cms')->__('Meta Data'))); + $fieldset = $form->addFieldset('meta_fieldset', array('legend' => Mage::helper('cms')->__('Meta Data'), 'class' => 'fieldset-wide')); $fieldset->addField('meta_keywords', 'editor', array( 'name' => 'meta_keywords', 'label' => Mage::helper('cms')->__('Keywords'), 'title' => Mage::helper('cms')->__('Meta Keywords'), - 'style' => 'width: 520px;', )); $fieldset->addField('meta_description', 'editor', array( 'name' => 'meta_description', 'label' => Mage::helper('cms')->__('Description'), 'title' => Mage::helper('cms')->__('Meta Description'), - 'style' => 'width: 520px;', )); $form->setValues($model->getData()); diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tabs.php b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tabs.php index 4b0c99b4e2..e91aeeb9f2 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tabs.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Grid.php b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Grid.php index cc191f7977..51cbab82f1 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Grid.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) @@ -117,12 +123,7 @@ protected function _prepareColumns() 'width' => 10, 'sortable' => false, 'filter' => false, - 'type' => 'action', - 'actions' => array(array( - 'url' => $baseUrl . '$identifier?store=$store_code', - 'caption' => Mage::helper('cms')->__('Preview'), - 'target' => '_blank', - )) + 'renderer' => 'adminhtml/cms_page_grid_renderer_action', )); return parent::_prepareColumns(); diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Grid/Renderer/Action.php b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Grid/Renderer/Action.php new file mode 100644 index 0000000000..ef2bce1bf8 --- /dev/null +++ b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Grid/Renderer/Action.php @@ -0,0 +1,35 @@ +setStore($row->getData('_first_store_id')); + $href = $urlModel->getUrl('', array('_current'=>false)) . "{$row->getIdentifier()}?___store={$row->getStoreCode()}"; + return ''.$this->__('Preview').''; + } +} \ No newline at end of file diff --git a/app/code/core/Mage/Adminhtml/Block/Customer.php b/app/code/core/Mage/Adminhtml/Block/Customer.php index 3055b91408..cbca1dc261 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit.php index bbc11acd16..8bb1ff2dec 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Form.php index f57715e085..f6410ba03a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Form.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Renderer/Newpass.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Renderer/Newpass.php index 46512dcaa3..15f2189a88 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Renderer/Newpass.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Renderer/Newpass.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) @@ -40,8 +46,8 @@ public function render(Varien_Data_Form_Element_Abstract $element) $html.= ''."\n"; $html.= ''; $html.= ''; - $html.= ''; + $html.= ''; $html.= ''."\n"; return $html; diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Renderer/Region.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Renderer/Region.php index fe92342837..0cb24e3f9a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Renderer/Region.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Renderer/Region.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Account.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Account.php index d203fd6023..72cf6dd1f6 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Account.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Account.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Addresses.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Addresses.php index 72a76607ff..b58b1a399c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Addresses.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Addresses.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Cart.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Cart.php index de38518cf8..c06da85b84 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Cart.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Cart.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Carts.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Carts.php index d87fa526fb..2b15db400b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Carts.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Carts.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter.php index 9fe48b02d3..a05ea901e0 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid.php index 4b4a5f41d6..4cca970d04 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid/Filter/Status.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid/Filter/Status.php index ea669e0cb7..7c84fa7bbe 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid/Filter/Status.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid/Filter/Status.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid/Renderer/Action.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid/Renderer/Action.php index 61d9d70d30..b371bae18b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid/Renderer/Action.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid/Renderer/Action.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid/Renderer/Status.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid/Renderer/Status.php index 257abda878..9d47072842 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid/Renderer/Status.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid/Renderer/Status.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Orders.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Orders.php index 3477145cef..fba34fbf29 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Orders.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Orders.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Reviews.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Reviews.php index ff5805e5c5..8f86490bd3 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Reviews.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Reviews.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Tag.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Tag.php index b54982fd6b..cb4e209494 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Tag.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Tag.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Tags.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Tags.php index 449f8a723a..0154878dcf 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Tags.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Tags.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View.php index 3c239d9630..fc8761d9dc 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Cart.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Cart.php index 14dcfbb5fa..ffc5f075c8 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Cart.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Cart.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Orders.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Orders.php index 9fee499ae5..4811650052 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Orders.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Orders.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Sales.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Sales.php index ab9a5d4298..fef3a425b9 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Sales.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Sales.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Wishlist.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Wishlist.php index ec77368763..72a4cb0599 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Wishlist.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Wishlist.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Wishlist.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Wishlist.php index ad0db9b311..07d5fbb2e7 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Wishlist.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Wishlist.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Wishlist/Grid/Renderer/Description.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Wishlist/Grid/Renderer/Description.php index aa35a5f677..db8ce654aa 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Wishlist/Grid/Renderer/Description.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Wishlist/Grid/Renderer/Description.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tabs.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tabs.php index ff2ce24a11..142de13698 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tabs.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Grid.php b/app/code/core/Mage/Adminhtml/Block/Customer/Grid.php index 833eb769c5..380ce00c24 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Grid.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Grid/Filter/Country.php b/app/code/core/Mage/Adminhtml/Block/Customer/Grid/Filter/Country.php index 0e9d6e0ea1..6bf5192fa5 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Grid/Filter/Country.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Grid/Filter/Country.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Group.php b/app/code/core/Mage/Adminhtml/Block/Customer/Group.php index 193dd2fafe..e0206fee5d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Group.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Group.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Group/Edit.php b/app/code/core/Mage/Adminhtml/Block/Customer/Group/Edit.php index fe134b71f9..cb782d308f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Group/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Group/Edit.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Group/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Customer/Group/Edit/Form.php index 610538b648..8c1e8c2eb6 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Group/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Group/Edit/Form.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Group/Grid.php b/app/code/core/Mage/Adminhtml/Block/Customer/Group/Grid.php index 850f53a21f..fd34e7f4b8 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Group/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Group/Grid.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Online.php b/app/code/core/Mage/Adminhtml/Block/Customer/Online.php index 0b675dc3c6..8edaeaaa16 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Online.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Online.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Online/Filter.php b/app/code/core/Mage/Adminhtml/Block/Customer/Online/Filter.php index 1de780ad3d..e5f60660b1 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Online/Filter.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Online/Filter.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid.php b/app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid.php index 5a55d7ca39..95294f69b3 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid/Renderer/Ip.php b/app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid/Renderer/Ip.php index 4d4a558f8b..6d8d9a49b0 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid/Renderer/Ip.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid/Renderer/Ip.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid/Renderer/Type.php b/app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid/Renderer/Type.php index e53b863fe1..0ff14ba1ec 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid/Renderer/Type.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid/Renderer/Type.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid/Renderer/Url.php b/app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid/Renderer/Url.php index 13cf6abf34..6fa186ac8d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid/Renderer/Url.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid/Renderer/Url.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Dashboard.php b/app/code/core/Mage/Adminhtml/Block/Dashboard.php index 347f26bd7f..3851b87bb7 100644 --- a/app/code/core/Mage/Adminhtml/Block/Dashboard.php +++ b/app/code/core/Mage/Adminhtml/Block/Dashboard.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Dashboard/Abstract.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Abstract.php index 1a903cd9ec..ad466af345 100644 --- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Abstract.php +++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Abstract.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Dashboard/Bar.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Bar.php index 273a1fbb04..b37d2ca96a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Bar.php +++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Bar.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Dashboard/Diagrams.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Diagrams.php index ef1cfc6bf7..49100c3e70 100644 --- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Diagrams.php +++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Diagrams.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Dashboard/Graph.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Graph.php index 8b120c0ce8..f1e7a0c6fe 100644 --- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Graph.php +++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Graph.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Dashboard/Grid.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Grid.php index a4e8ce3446..2cd8e61b88 100644 --- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Grid.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Dashboard/Grids.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Grids.php index 06b46b6e40..19aa66e056 100644 --- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Grids.php +++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Grids.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Dashboard/Orders/Grid.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Orders/Grid.php index faca14af09..ee43926ddf 100644 --- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Orders/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Orders/Grid.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Dashboard/Sales.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Sales.php index 5e072aaa03..aa049e741e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Sales.php +++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Sales.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Dashboard/Searches/Last.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Searches/Last.php index 394a46dae8..cbec3abb48 100644 --- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Searches/Last.php +++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Searches/Last.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Dashboard/Searches/Renderer/Searchquery.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Searches/Renderer/Searchquery.php index cacf5f2daa..f033eddcdb 100644 --- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Searches/Renderer/Searchquery.php +++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Searches/Renderer/Searchquery.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Dashboard/Searches/Top.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Searches/Top.php index 12e621ae77..e2816b63f2 100644 --- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Searches/Top.php +++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Searches/Top.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Amounts.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Amounts.php index c7d8bf629a..accdc8a902 100644 --- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Amounts.php +++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Amounts.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Customers/Most.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Customers/Most.php index f5e055b35f..7eea7144b3 100644 --- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Customers/Most.php +++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Customers/Most.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Customers/Newest.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Customers/Newest.php index b5ced43a1d..4b13db7ec9 100644 --- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Customers/Newest.php +++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Customers/Newest.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Orders.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Orders.php index 4160fa8ae6..e5e74494e2 100644 --- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Orders.php +++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Orders.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Products/Ordered.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Products/Ordered.php index 2e691ebfa2..5b1d07faa5 100644 --- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Products/Ordered.php +++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Products/Ordered.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Products/Viewed.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Products/Viewed.php index d2af776eff..15d9a84e9c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Products/Viewed.php +++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Products/Viewed.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Dashboard/Totals.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Totals.php index cd05dd230e..97e940347d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Totals.php +++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Totals.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Extensions/Config/Edit.php b/app/code/core/Mage/Adminhtml/Block/Extensions/Config/Edit.php index e1c8750ba0..c84befc7f3 100644 --- a/app/code/core/Mage/Adminhtml/Block/Extensions/Config/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Extensions/Config/Edit.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Extensions/Config/Form.php b/app/code/core/Mage/Adminhtml/Block/Extensions/Config/Form.php index 4979022a5f..6dcd932d40 100644 --- a/app/code/core/Mage/Adminhtml/Block/Extensions/Config/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Extensions/Config/Form.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Extensions/Console/Edit.php b/app/code/core/Mage/Adminhtml/Block/Extensions/Console/Edit.php index eeae2545bf..bc05dfdd7f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Extensions/Console/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Extensions/Console/Edit.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Extensions/Console/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Extensions/Console/Edit/Form.php index 3293345f37..cec609fee2 100644 --- a/app/code/core/Mage/Adminhtml/Block/Extensions/Console/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Extensions/Console/Edit/Form.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Extensions/Custom/Edit.php b/app/code/core/Mage/Adminhtml/Block/Extensions/Custom/Edit.php index 32e48b782b..590a9dcb08 100644 --- a/app/code/core/Mage/Adminhtml/Block/Extensions/Custom/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Extensions/Custom/Edit.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) @@ -43,10 +49,10 @@ public function __construct() 'class'=>'save', 'onclick'=>"createPackage()", )); - $this->_addButton('load', array( - 'label'=>Mage::helper('adminhtml')->__('Load'), - 'title'=>Mage::helper('adminhtml')->__('Load previously created custom local package information'), - 'onclick'=>"loadPackage()", + $this->_addButton('save_as', array( + 'label'=>Mage::helper('adminhtml')->__('Save As...'), + 'title'=>Mage::helper('adminhtml')->__('Save package with custom package file name'), + 'onclick'=>'saveAsPackage()' )); } diff --git a/app/code/core/Mage/Adminhtml/Block/Extensions/Custom/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Extensions/Custom/Edit/Form.php index 630383da8f..f108c3e462 100644 --- a/app/code/core/Mage/Adminhtml/Block/Extensions/Custom/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Extensions/Custom/Edit/Form.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Extensions/Custom/Edit/Tab/Abstract.php b/app/code/core/Mage/Adminhtml/Block/Extensions/Custom/Edit/Tab/Abstract.php index 7097076efa..577be09e01 100644 --- a/app/code/core/Mage/Adminhtml/Block/Extensions/Custom/Edit/Tab/Abstract.php +++ b/app/code/core/Mage/Adminhtml/Block/Extensions/Custom/Edit/Tab/Abstract.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Extensions/Custom/Edit/Tab/Contents.php b/app/code/core/Mage/Adminhtml/Block/Extensions/Custom/Edit/Tab/Contents.php index 620c142db8..54a6512410 100644 --- a/app/code/core/Mage/Adminhtml/Block/Extensions/Custom/Edit/Tab/Contents.php +++ b/app/code/core/Mage/Adminhtml/Block/Extensions/Custom/Edit/Tab/Contents.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Extensions/Custom/Edit/Tab/Depends.php b/app/code/core/Mage/Adminhtml/Block/Extensions/Custom/Edit/Tab/Depends.php index 01fff8f455..513934b988 100644 --- a/app/code/core/Mage/Adminhtml/Block/Extensions/Custom/Edit/Tab/Depends.php +++ b/app/code/core/Mage/Adminhtml/Block/Extensions/Custom/Edit/Tab/Depends.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Extensions/Custom/Edit/Tab/Grid.php b/app/code/core/Mage/Adminhtml/Block/Extensions/Custom/Edit/Tab/Grid.php new file mode 100644 index 0000000000..aef3f3189a --- /dev/null +++ b/app/code/core/Mage/Adminhtml/Block/Extensions/Custom/Edit/Tab/Grid.php @@ -0,0 +1,76 @@ + + */ +class Mage_Adminhtml_Block_Extensions_Custom_Edit_Tab_Grid + extends Mage_Adminhtml_Block_Widget_Grid +{ + public function __construct() + { + parent::__construct(); + $this->setId('extensions_custom_edit_grid'); + $this->setUseAjax(true); + } + + protected function _prepareCollection() + { + // take a look at Mage_Adminhtml_Model_Extension_Collection_Abstract + $collection = Mage::getSingleton('adminhtml/extension_collection'); + $this->setCollection($collection); + return parent::_prepareCollection(); + } + + protected function _prepareColumns() + { + $baseUrl = $this->getUrl(); + + $this->addColumn('filename', array( + 'header' => Mage::helper('adminhtml')->__('Package'), + 'index' => 'filename', + )); + + return parent::_prepareColumns(); + } + + public function getCurrentUrl($params=array()) + { + return $this->getUrl('*/*/grid', array('_current'=>true)); + } + + public function getRowUrl($row) + { + return $this->getUrl('*/*/load', array( + 'id' => $row->getFilenameId(), + )); + } + +} diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Widget/Chooser/Categories.php b/app/code/core/Mage/Adminhtml/Block/Extensions/Custom/Edit/Tab/Load.php similarity index 50% rename from app/code/core/Mage/Adminhtml/Block/Promo/Widget/Chooser/Categories.php rename to app/code/core/Mage/Adminhtml/Block/Extensions/Custom/Edit/Tab/Load.php index e2be856d46..80f68ac14c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Widget/Chooser/Categories.php +++ b/app/code/core/Mage/Adminhtml/Block/Extensions/Custom/Edit/Tab/Load.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) @@ -19,41 +25,24 @@ */ /** - * Product categories tab + * Convert profile edit tab * * @category Mage * @package Mage_Adminhtml * @author Magento Core Team */ -class Mage_Adminhtml_Block_Promo_Widget_Chooser_Categories extends Mage_Adminhtml_Block_Catalog_Category_Tree +class Mage_Adminhtml_Block_Extensions_Custom_Edit_Tab_Load + extends Mage_Adminhtml_Block_Abstract { - protected $_categoryIds; - - protected function _prepareLayout() - { - $this->setTemplate('promo/widget/categories.phtml'); - } - - protected function getCategoryIds() + public function __construct() { - return $this->getRequest()->getParam('selected', array()); + parent::__construct(); + $this->setTemplate('extensions/custom/load.phtml'); } - public function getRootNode() + public function getPackageGridHtml() { - $root = parent::getRoot(); - if ($root && in_array($root->getId(), $this->getCategoryIds())) { - $root->setChecked(true); - } - return $root; + return $this->getLayout()->createBlock('adminhtml/extensions_custom_edit_tab_grid')->toHtml(); } - protected function _getNodeJson($node, $level=1) - { - $item = parent::_getNodeJson($node, $level); - if (in_array($node->getId(), $this->getCategoryIds())) { - $item['checked'] = true; - } - return $item; - } } diff --git a/app/code/core/Mage/Adminhtml/Block/Extensions/Custom/Edit/Tab/Maintainers.php b/app/code/core/Mage/Adminhtml/Block/Extensions/Custom/Edit/Tab/Maintainers.php index 3aaa5669b9..e87cd28832 100644 --- a/app/code/core/Mage/Adminhtml/Block/Extensions/Custom/Edit/Tab/Maintainers.php +++ b/app/code/core/Mage/Adminhtml/Block/Extensions/Custom/Edit/Tab/Maintainers.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Extensions/Custom/Edit/Tab/Package.php b/app/code/core/Mage/Adminhtml/Block/Extensions/Custom/Edit/Tab/Package.php index 84924d2a0f..767930e44a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Extensions/Custom/Edit/Tab/Package.php +++ b/app/code/core/Mage/Adminhtml/Block/Extensions/Custom/Edit/Tab/Package.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) @@ -42,6 +48,19 @@ public function initForm() $fieldset = $form->addFieldset('package_fieldset', array('legend'=>Mage::helper('adminhtml')->__('Package'))); + if ($this->getData('name') != $this->getData('file_name')) { + $this->setData('file_name_disabled', $this->getData('file_name')); + $fieldset->addField('file_name_disabled', 'text', array( + 'name' => 'file_name_disabled', + 'label' => Mage::helper('adminhtml')->__('Package File Name'), + 'disabled' => 'disabled', + )); + } + + $fieldset->addField('file_name', 'hidden', array( + 'name' => 'file_name', + )); + $fieldset->addField('name', 'text', array( 'name' => 'name', 'label' => Mage::helper('adminhtml')->__('Name'), diff --git a/app/code/core/Mage/Adminhtml/Block/Extensions/Custom/Edit/Tab/Release.php b/app/code/core/Mage/Adminhtml/Block/Extensions/Custom/Edit/Tab/Release.php index 72bf6a7a69..dc2ff97549 100644 --- a/app/code/core/Mage/Adminhtml/Block/Extensions/Custom/Edit/Tab/Release.php +++ b/app/code/core/Mage/Adminhtml/Block/Extensions/Custom/Edit/Tab/Release.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Extensions/Custom/Edit/Tabs.php b/app/code/core/Mage/Adminhtml/Block/Extensions/Custom/Edit/Tabs.php index e048774cdb..f4d8ec7c7e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Extensions/Custom/Edit/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/Extensions/Custom/Edit/Tabs.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) @@ -63,6 +69,12 @@ protected function _beforeToHtml() 'content' => $this->_getTabHtml('contents'), )); + $this->addTab('load', array( + 'label' => Mage::helper('adminhtml')->__('Load local Package'), + 'class' => 'ajax', + 'url' => $this->getUrl('*/*/loadtab', array('_current' => true)), + )); + return parent::_beforeToHtml(); } diff --git a/app/code/core/Mage/Adminhtml/Block/Extensions/File/Form.php b/app/code/core/Mage/Adminhtml/Block/Extensions/File/Form.php index 7aa23dc227..e2ee282146 100644 --- a/app/code/core/Mage/Adminhtml/Block/Extensions/File/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Extensions/File/Form.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Extensions/Local.php b/app/code/core/Mage/Adminhtml/Block/Extensions/Local.php index cef641e32e..0a78007c27 100644 --- a/app/code/core/Mage/Adminhtml/Block/Extensions/Local.php +++ b/app/code/core/Mage/Adminhtml/Block/Extensions/Local.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Extensions/Local/Edit.php b/app/code/core/Mage/Adminhtml/Block/Extensions/Local/Edit.php index 27222a4f28..a7876bc62d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Extensions/Local/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Extensions/Local/Edit.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Extensions/Local/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Extensions/Local/Edit/Form.php index 8786c32bfa..6f9a92655e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Extensions/Local/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Extensions/Local/Edit/Form.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Extensions/Local/Edit/Tab/Abstract.php b/app/code/core/Mage/Adminhtml/Block/Extensions/Local/Edit/Tab/Abstract.php index 187e9ed4c9..d9869b620d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Extensions/Local/Edit/Tab/Abstract.php +++ b/app/code/core/Mage/Adminhtml/Block/Extensions/Local/Edit/Tab/Abstract.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Extensions/Local/Edit/Tab/Actions.php b/app/code/core/Mage/Adminhtml/Block/Extensions/Local/Edit/Tab/Actions.php index 187bf1accd..691c5afc7d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Extensions/Local/Edit/Tab/Actions.php +++ b/app/code/core/Mage/Adminhtml/Block/Extensions/Local/Edit/Tab/Actions.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Extensions/Local/Edit/Tab/Changelog.php b/app/code/core/Mage/Adminhtml/Block/Extensions/Local/Edit/Tab/Changelog.php index e9d987f5bd..eafbc3b5ca 100644 --- a/app/code/core/Mage/Adminhtml/Block/Extensions/Local/Edit/Tab/Changelog.php +++ b/app/code/core/Mage/Adminhtml/Block/Extensions/Local/Edit/Tab/Changelog.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Extensions/Local/Edit/Tab/Contents.php b/app/code/core/Mage/Adminhtml/Block/Extensions/Local/Edit/Tab/Contents.php index f4afcaf5db..90da1c62eb 100644 --- a/app/code/core/Mage/Adminhtml/Block/Extensions/Local/Edit/Tab/Contents.php +++ b/app/code/core/Mage/Adminhtml/Block/Extensions/Local/Edit/Tab/Contents.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Extensions/Local/Edit/Tab/Depends.php b/app/code/core/Mage/Adminhtml/Block/Extensions/Local/Edit/Tab/Depends.php index 7b33c7c969..5f740583cc 100644 --- a/app/code/core/Mage/Adminhtml/Block/Extensions/Local/Edit/Tab/Depends.php +++ b/app/code/core/Mage/Adminhtml/Block/Extensions/Local/Edit/Tab/Depends.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Extensions/Local/Edit/Tab/Package.php b/app/code/core/Mage/Adminhtml/Block/Extensions/Local/Edit/Tab/Package.php index a8608f55d9..7737e43adb 100644 --- a/app/code/core/Mage/Adminhtml/Block/Extensions/Local/Edit/Tab/Package.php +++ b/app/code/core/Mage/Adminhtml/Block/Extensions/Local/Edit/Tab/Package.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Extensions/Local/Edit/Tabs.php b/app/code/core/Mage/Adminhtml/Block/Extensions/Local/Edit/Tabs.php index 80422d83ce..6058ac8c7a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Extensions/Local/Edit/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/Extensions/Local/Edit/Tabs.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Extensions/Local/Grid.php b/app/code/core/Mage/Adminhtml/Block/Extensions/Local/Grid.php index c731f569b8..90acbc302a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Extensions/Local/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Extensions/Local/Grid.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Extensions/Local/Grid/Renderer/Action.php b/app/code/core/Mage/Adminhtml/Block/Extensions/Local/Grid/Renderer/Action.php index bb748438eb..873c13a9d2 100644 --- a/app/code/core/Mage/Adminhtml/Block/Extensions/Local/Grid/Renderer/Action.php +++ b/app/code/core/Mage/Adminhtml/Block/Extensions/Local/Grid/Renderer/Action.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Extensions/Local/Upgrade.php b/app/code/core/Mage/Adminhtml/Block/Extensions/Local/Upgrade.php index 5948da4f58..870849f43e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Extensions/Local/Upgrade.php +++ b/app/code/core/Mage/Adminhtml/Block/Extensions/Local/Upgrade.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Extensions/Mass/Install.php b/app/code/core/Mage/Adminhtml/Block/Extensions/Mass/Install.php index b936a41887..128fe3bda9 100644 --- a/app/code/core/Mage/Adminhtml/Block/Extensions/Mass/Install.php +++ b/app/code/core/Mage/Adminhtml/Block/Extensions/Mass/Install.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Extensions/Mass/Uninstall.php b/app/code/core/Mage/Adminhtml/Block/Extensions/Mass/Uninstall.php index 5a7d1c1f4b..0b91e8ad42 100644 --- a/app/code/core/Mage/Adminhtml/Block/Extensions/Mass/Uninstall.php +++ b/app/code/core/Mage/Adminhtml/Block/Extensions/Mass/Uninstall.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Extensions/Mass/Upgrade.php b/app/code/core/Mage/Adminhtml/Block/Extensions/Mass/Upgrade.php index 5b53234c23..605fa98e54 100644 --- a/app/code/core/Mage/Adminhtml/Block/Extensions/Mass/Upgrade.php +++ b/app/code/core/Mage/Adminhtml/Block/Extensions/Mass/Upgrade.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Extensions/Remote.php b/app/code/core/Mage/Adminhtml/Block/Extensions/Remote.php index 05f54b80e1..b730e84f23 100644 --- a/app/code/core/Mage/Adminhtml/Block/Extensions/Remote.php +++ b/app/code/core/Mage/Adminhtml/Block/Extensions/Remote.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Extensions/Remote/Edit.php b/app/code/core/Mage/Adminhtml/Block/Extensions/Remote/Edit.php index 98d97692e2..ce7ae87528 100644 --- a/app/code/core/Mage/Adminhtml/Block/Extensions/Remote/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Extensions/Remote/Edit.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Extensions/Remote/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Extensions/Remote/Edit/Form.php index b8cbb80a83..13354cab39 100644 --- a/app/code/core/Mage/Adminhtml/Block/Extensions/Remote/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Extensions/Remote/Edit/Form.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Extensions/Remote/Edit/Tab/Abstract.php b/app/code/core/Mage/Adminhtml/Block/Extensions/Remote/Edit/Tab/Abstract.php index c670b04e8c..72ddbc01a7 100644 --- a/app/code/core/Mage/Adminhtml/Block/Extensions/Remote/Edit/Tab/Abstract.php +++ b/app/code/core/Mage/Adminhtml/Block/Extensions/Remote/Edit/Tab/Abstract.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Extensions/Remote/Edit/Tab/Actions.php b/app/code/core/Mage/Adminhtml/Block/Extensions/Remote/Edit/Tab/Actions.php index c635c6c9eb..bd3f4d138d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Extensions/Remote/Edit/Tab/Actions.php +++ b/app/code/core/Mage/Adminhtml/Block/Extensions/Remote/Edit/Tab/Actions.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Extensions/Remote/Edit/Tab/Changelog.php b/app/code/core/Mage/Adminhtml/Block/Extensions/Remote/Edit/Tab/Changelog.php index 425f6a3327..9f5b47f08f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Extensions/Remote/Edit/Tab/Changelog.php +++ b/app/code/core/Mage/Adminhtml/Block/Extensions/Remote/Edit/Tab/Changelog.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Extensions/Remote/Edit/Tab/Package.php b/app/code/core/Mage/Adminhtml/Block/Extensions/Remote/Edit/Tab/Package.php index 6ba126e27e..be7dee63d9 100644 --- a/app/code/core/Mage/Adminhtml/Block/Extensions/Remote/Edit/Tab/Package.php +++ b/app/code/core/Mage/Adminhtml/Block/Extensions/Remote/Edit/Tab/Package.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Extensions/Remote/Edit/Tabs.php b/app/code/core/Mage/Adminhtml/Block/Extensions/Remote/Edit/Tabs.php index c68023bebd..e5d077e98f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Extensions/Remote/Edit/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/Extensions/Remote/Edit/Tabs.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Extensions/Remote/Grid.php b/app/code/core/Mage/Adminhtml/Block/Extensions/Remote/Grid.php index c968bc2968..d6bdbe16ec 100644 --- a/app/code/core/Mage/Adminhtml/Block/Extensions/Remote/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Extensions/Remote/Grid.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Extensions/Remote/Grid/Renderer/Action.php b/app/code/core/Mage/Adminhtml/Block/Extensions/Remote/Grid/Renderer/Action.php index b6ca796257..a64d16718c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Extensions/Remote/Grid/Renderer/Action.php +++ b/app/code/core/Mage/Adminhtml/Block/Extensions/Remote/Grid/Renderer/Action.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Html/Date.php b/app/code/core/Mage/Adminhtml/Block/Html/Date.php index 4aa43a6e68..f87002a724 100644 --- a/app/code/core/Mage/Adminhtml/Block/Html/Date.php +++ b/app/code/core/Mage/Adminhtml/Block/Html/Date.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Core * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Html/Select.php b/app/code/core/Mage/Adminhtml/Block/Html/Select.php index dacc3e6ad3..025a225f87 100644 --- a/app/code/core/Mage/Adminhtml/Block/Html/Select.php +++ b/app/code/core/Mage/Adminhtml/Block/Html/Select.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Core * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Media/Editor.php b/app/code/core/Mage/Adminhtml/Block/Media/Editor.php index 7db7bf560c..07b5d66bd7 100644 --- a/app/code/core/Mage/Adminhtml/Block/Media/Editor.php +++ b/app/code/core/Mage/Adminhtml/Block/Media/Editor.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Media/Uploader.php b/app/code/core/Mage/Adminhtml/Block/Media/Uploader.php index 27c21b9072..08e9d1bdf4 100644 --- a/app/code/core/Mage/Adminhtml/Block/Media/Uploader.php +++ b/app/code/core/Mage/Adminhtml/Block/Media/Uploader.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Messages.php b/app/code/core/Mage/Adminhtml/Block/Messages.php index 23c9fb9353..66d6396a92 100644 --- a/app/code/core/Mage/Adminhtml/Block/Messages.php +++ b/app/code/core/Mage/Adminhtml/Block/Messages.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Problem.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Problem.php index c819cbc279..c5c5dcc765 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Problem.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Problem.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Problem/Grid.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Problem/Grid.php index 4d78e48353..ebf9071aec 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Problem/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Problem/Grid.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Problem/Grid/Filter/Checkbox.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Problem/Grid/Filter/Checkbox.php index ff29a3c2c1..ec83d14723 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Problem/Grid/Filter/Checkbox.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Problem/Grid/Filter/Checkbox.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Problem/Grid/Renderer/Checkbox.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Problem/Grid/Renderer/Checkbox.php index 3326e0e1cd..0407f97d98 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Problem/Grid/Renderer/Checkbox.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Problem/Grid/Renderer/Checkbox.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue.php index 68e09dfd60..68b96410db 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Edit.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Edit.php index 87555a6232..599b73c5af 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Edit.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Edit/Form.php index 5fd45dd464..6bb27f24e9 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Edit/Form.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Grid.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Grid.php index 2676103119..ad6f93cfec 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Grid.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Grid/Renderer/Action.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Grid/Renderer/Action.php index 29f93e0e36..1156459a6d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Grid/Renderer/Action.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Grid/Renderer/Action.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber.php index 03167e9583..ab3815af2c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid.php index 2beed5e61a..44be17c1e2 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid/Filter/Checkbox.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid/Filter/Checkbox.php index e667e5c070..9e19f522a8 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid/Filter/Checkbox.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid/Filter/Checkbox.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid/Filter/Website.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid/Filter/Website.php index 7f6c9bc78c..b13046a09a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid/Filter/Website.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid/Filter/Website.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid/Renderer/Checkbox.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid/Renderer/Checkbox.php index b23356c5b9..cb714f2e7f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid/Renderer/Checkbox.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid/Renderer/Checkbox.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid/Renderer/Website.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid/Renderer/Website.php index 9ce9374ca2..c859218b15 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid/Renderer/Website.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid/Renderer/Website.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Template.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Template.php index fd76563474..cfdcc23c74 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Template.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Template.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Edit.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Edit.php index 43ef1329aa..fc12d060fc 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Edit.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Edit/Form.php index 7366112ffc..6f1230379b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Edit/Form.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) @@ -60,7 +66,7 @@ public function renderPrepare($template) $template->addData($post); } - $fieldset = $form->addFieldset('base_fieldset', array('legend'=>Mage::helper('newsletter')->__('Template Information'))); + $fieldset = $form->addFieldset('base_fieldset', array('legend'=>Mage::helper('newsletter')->__('Template Information'), 'class' => 'fieldset-wide')); $fieldset->addField('code', 'text', array( 'name'=>'code', @@ -110,7 +116,7 @@ public function renderPrepare($template) 'required' => true, 'state' => 'html', 'value' => $template->getTemplateText(), - 'style' => 'width:98%; height: 600px;', + 'style' => 'height:36em;', )); if ($template->getId()) { diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Grid.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Grid.php index 187c03e7ee..c5bf5d88a6 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Grid.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Grid/Renderer/Action.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Grid/Renderer/Action.php index b77126ba79..1faba2142f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Grid/Renderer/Action.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Grid/Renderer/Action.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Grid/Renderer/Sender.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Grid/Renderer/Sender.php index 6bb5372daf..71564104b1 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Grid/Renderer/Sender.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Grid/Renderer/Sender.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Preview.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Preview.php index d38539211a..82b516a238 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Preview.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Preview.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Notification/Grid.php b/app/code/core/Mage/Adminhtml/Block/Notification/Grid.php index 49214aa7c9..5aef71adcd 100644 --- a/app/code/core/Mage/Adminhtml/Block/Notification/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Notification/Grid.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Notification/Grid/Renderer/Actions.php b/app/code/core/Mage/Adminhtml/Block/Notification/Grid/Renderer/Actions.php index f11137641a..aae5dbafa6 100644 --- a/app/code/core/Mage/Adminhtml/Block/Notification/Grid/Renderer/Actions.php +++ b/app/code/core/Mage/Adminhtml/Block/Notification/Grid/Renderer/Actions.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Notification/Grid/Renderer/Notice.php b/app/code/core/Mage/Adminhtml/Block/Notification/Grid/Renderer/Notice.php index 5a35284c9e..d4a6cab77b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Notification/Grid/Renderer/Notice.php +++ b/app/code/core/Mage/Adminhtml/Block/Notification/Grid/Renderer/Notice.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Notification/Grid/Renderer/Severity.php b/app/code/core/Mage/Adminhtml/Block/Notification/Grid/Renderer/Severity.php index b77458c243..dc41bf05a5 100644 --- a/app/code/core/Mage/Adminhtml/Block/Notification/Grid/Renderer/Severity.php +++ b/app/code/core/Mage/Adminhtml/Block/Notification/Grid/Renderer/Severity.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Notification/Inbox.php b/app/code/core/Mage/Adminhtml/Block/Notification/Inbox.php index adb82bd351..88839ab7f6 100644 --- a/app/code/core/Mage/Adminhtml/Block/Notification/Inbox.php +++ b/app/code/core/Mage/Adminhtml/Block/Notification/Inbox.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Notification/Toolbar.php b/app/code/core/Mage/Adminhtml/Block/Notification/Toolbar.php index c97fc4bd43..d26b0eb6c4 100644 --- a/app/code/core/Mage/Adminhtml/Block/Notification/Toolbar.php +++ b/app/code/core/Mage/Adminhtml/Block/Notification/Toolbar.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Notification/Window.php b/app/code/core/Mage/Adminhtml/Block/Notification/Window.php index 1c2c8ed75a..6ea5dbe3a0 100644 --- a/app/code/core/Mage/Adminhtml/Block/Notification/Window.php +++ b/app/code/core/Mage/Adminhtml/Block/Notification/Window.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Page.php b/app/code/core/Mage/Adminhtml/Block/Page.php index 0ca887b5d0..cf1748f7b5 100644 --- a/app/code/core/Mage/Adminhtml/Block/Page.php +++ b/app/code/core/Mage/Adminhtml/Block/Page.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Page/Footer.php b/app/code/core/Mage/Adminhtml/Block/Page/Footer.php index 4ff69e6763..d38244cb9a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Page/Footer.php +++ b/app/code/core/Mage/Adminhtml/Block/Page/Footer.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Page/Head.php b/app/code/core/Mage/Adminhtml/Block/Page/Head.php index d473f07683..5d1e591510 100644 --- a/app/code/core/Mage/Adminhtml/Block/Page/Head.php +++ b/app/code/core/Mage/Adminhtml/Block/Page/Head.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Page/Header.php b/app/code/core/Mage/Adminhtml/Block/Page/Header.php index 9a6bd661d4..91a39bc613 100644 --- a/app/code/core/Mage/Adminhtml/Block/Page/Header.php +++ b/app/code/core/Mage/Adminhtml/Block/Page/Header.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Page/Menu.php b/app/code/core/Mage/Adminhtml/Block/Page/Menu.php index b541553302..4043b447e5 100644 --- a/app/code/core/Mage/Adminhtml/Block/Page/Menu.php +++ b/app/code/core/Mage/Adminhtml/Block/Page/Menu.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/Buttons.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Buttons.php index e493253531..93858f8ee0 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Buttons.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Buttons.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/Editroles.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Editroles.php index 660e844bae..109f685330 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Editroles.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Editroles.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/Edituser.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Edituser.php index 1f67ac446b..e656aed17f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Edituser.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Edituser.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/Grid/Role.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Grid/Role.php index e9eb58944a..a0627750b5 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Grid/Role.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Grid/Role.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/Grid/User.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Grid/User.php index a599592514..c3705cd6e9 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Grid/User.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Grid/User.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/Role.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Role.php index 99be1ab891..a7c3a16714 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Role.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Role.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/Role/Grid/User.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Role/Grid/User.php index 2d1292c50a..a79afda5e1 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Role/Grid/User.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Role/Grid/User.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/Roles.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Roles.php index 1a3af964c3..65a04dab3b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Roles.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Roles.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Roleinfo.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Roleinfo.php index 91efe59dea..058e7bceb7 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Roleinfo.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Roleinfo.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Rolesedit.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Rolesedit.php index da6b503bb0..5cd34ffe91 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Rolesedit.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Rolesedit.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Rolesusers.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Rolesusers.php index 94b20a8466..d569b2bf54 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Rolesusers.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Rolesusers.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Useredit.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Useredit.php index 809e2a8ff0..04df7bd9ee 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Useredit.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Useredit.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Userroles.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Userroles.php index 5363d9713d..a253479d96 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Userroles.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Userroles.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/User.php b/app/code/core/Mage/Adminhtml/Block/Permissions/User.php index b382dc98f5..552cf41e54 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/User.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/User.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit.php b/app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit.php index 881ffd43fb..3c84a3bd14 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit/Form.php index 2979db0ae6..c696b4d799 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit/Form.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit/Tab/Main.php b/app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit/Tab/Main.php index 1ccfc3446e..66ed859db9 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit/Tab/Main.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit/Tab/Main.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit/Tab/Roles.php b/app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit/Tab/Roles.php index 66698834aa..8a51c07ad5 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit/Tab/Roles.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit/Tab/Roles.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit/Tabs.php b/app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit/Tabs.php index 70192ee2d9..e77f796d44 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit/Tabs.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/User/Grid.php b/app/code/core/Mage/Adminhtml/Block/Permissions/User/Grid.php index 1d86fedbc1..e3ea1e18ad 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/User/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/User/Grid.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/Usernroles.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Usernroles.php index 8bc6856f7a..0f0b75ebe6 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Usernroles.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Usernroles.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/Users.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Users.php index 77f8fc0997..0b5d22698d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Users.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Users.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Poll/Answer/Edit.php b/app/code/core/Mage/Adminhtml/Block/Poll/Answer/Edit.php index ad3ea9fc38..c1c3898b66 100644 --- a/app/code/core/Mage/Adminhtml/Block/Poll/Answer/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Poll/Answer/Edit.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Poll/Answer/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Poll/Answer/Edit/Form.php index 7d2f250245..e5c02a4488 100644 --- a/app/code/core/Mage/Adminhtml/Block/Poll/Answer/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Poll/Answer/Edit/Form.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Poll/Edit.php b/app/code/core/Mage/Adminhtml/Block/Poll/Edit.php index 8bf99b0a0a..034a66a9a7 100644 --- a/app/code/core/Mage/Adminhtml/Block/Poll/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Poll/Edit.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Form.php index c40b5de12c..ed2ffa691a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Form.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Answers.php b/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Answers.php index 9c4d1b4e1c..8c15fdfc74 100644 --- a/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Answers.php +++ b/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Answers.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Answers/Form.php b/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Answers/Form.php index 0910ca5261..19a7ae716a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Answers/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Answers/Form.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Answers/Grid.php b/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Answers/Grid.php index 3d17278eea..25a61b4912 100644 --- a/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Answers/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Answers/Grid.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Answers/List.php b/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Answers/List.php index b13e461ecd..ef54dc5726 100644 --- a/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Answers/List.php +++ b/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Answers/List.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Form.php b/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Form.php index fc15f2a171..a4d8923642 100644 --- a/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Form.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tabs.php b/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tabs.php index 511ce368bc..4754bd7138 100644 --- a/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tabs.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Poll/Grid.php b/app/code/core/Mage/Adminhtml/Block/Poll/Grid.php index cb6aaaa8a3..a550bcd3fe 100644 --- a/app/code/core/Mage/Adminhtml/Block/Poll/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Poll/Grid.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) @@ -119,8 +125,8 @@ protected function _prepareColumns() 'index' => 'closed', 'type' => 'options', 'options' => array( - 1 => 'Closed', - 0 => 'Open', + 1 => Mage::helper('poll')->__('Closed'), + 0 => Mage::helper('poll')->__('Open') ), )); diff --git a/app/code/core/Mage/Adminhtml/Block/Poll/Poll.php b/app/code/core/Mage/Adminhtml/Block/Poll/Poll.php index 956db36d48..0de03e5c22 100644 --- a/app/code/core/Mage/Adminhtml/Block/Poll/Poll.php +++ b/app/code/core/Mage/Adminhtml/Block/Poll/Poll.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Catalog.php b/app/code/core/Mage/Adminhtml/Block/Promo/Catalog.php index 9db0d62699..427c7082f8 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Catalog.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Catalog.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit.php b/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit.php index 8bbf65bd0d..7adee44d3c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Form.php index cfcc284b47..21b8b20e79 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Form.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Tab/Actions.php b/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Tab/Actions.php index 37fc619440..a667e44cfd 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Tab/Actions.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Tab/Actions.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Tab/Conditions.php b/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Tab/Conditions.php index bad1870402..1c9b6eada2 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Tab/Conditions.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Tab/Conditions.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Tab/Main.php b/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Tab/Main.php index d08e8f2fc2..85b63b2d9f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Tab/Main.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Tab/Main.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Tabs.php b/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Tabs.php index 263aff4838..8e8ab0be13 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Tabs.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Grid.php b/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Grid.php index 63662a4e76..4445b38048 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Grid.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Quote.php b/app/code/core/Mage/Adminhtml/Block/Promo/Quote.php index d978d4458c..ae17768956 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Quote.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Quote.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit.php b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit.php index 828e141be7..36b5be14cd 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Form.php index 6be37b5a02..b2ded96b71 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Form.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Actions.php b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Actions.php index 4a4e1374f6..6710db42a8 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Actions.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Actions.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Conditions.php b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Conditions.php index d4142ec523..ace9f6ac79 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Conditions.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Conditions.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Main.php b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Main.php index 2dd8dcc2bf..1c5d0f9352 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Main.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Main.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tabs.php b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tabs.php index 6b87d5fa02..137b576c51 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tabs.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Grid.php b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Grid.php index a469dd3c3a..1939d7c527 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Grid.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Widget/Chooser/Sku.php b/app/code/core/Mage/Adminhtml/Block/Promo/Widget/Chooser/Sku.php index b73cd12097..2f995e900d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Widget/Chooser/Sku.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Widget/Chooser/Sku.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Rating/Edit.php b/app/code/core/Mage/Adminhtml/Block/Rating/Edit.php index 66e11b797b..db7511077c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Rating/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Rating/Edit.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Rating/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Rating/Edit/Form.php index 434e0bb5e8..ba082023df 100644 --- a/app/code/core/Mage/Adminhtml/Block/Rating/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Rating/Edit/Form.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Rating/Edit/Tab/Form.php b/app/code/core/Mage/Adminhtml/Block/Rating/Edit/Tab/Form.php index a33abbad58..2edccc2750 100644 --- a/app/code/core/Mage/Adminhtml/Block/Rating/Edit/Tab/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Rating/Edit/Tab/Form.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Rating/Edit/Tab/Options.php b/app/code/core/Mage/Adminhtml/Block/Rating/Edit/Tab/Options.php index da999f822b..adfeaaaf8c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Rating/Edit/Tab/Options.php +++ b/app/code/core/Mage/Adminhtml/Block/Rating/Edit/Tab/Options.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Rating/Edit/Tabs.php b/app/code/core/Mage/Adminhtml/Block/Rating/Edit/Tabs.php index 419603e40f..96a3324dd0 100644 --- a/app/code/core/Mage/Adminhtml/Block/Rating/Edit/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/Rating/Edit/Tabs.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Rating/Grid.php b/app/code/core/Mage/Adminhtml/Block/Rating/Grid.php index 4b315d4fb0..66ae02bd8c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Rating/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Rating/Grid.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Rating/Rating.php b/app/code/core/Mage/Adminhtml/Block/Rating/Rating.php index e53b241ab9..f35924d42e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Rating/Rating.php +++ b/app/code/core/Mage/Adminhtml/Block/Rating/Rating.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Customer/Accounts.php b/app/code/core/Mage/Adminhtml/Block/Report/Customer/Accounts.php index 40473f495e..5176587801 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Customer/Accounts.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Customer/Accounts.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Customer/Accounts/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Customer/Accounts/Grid.php index 1fd924df83..71c383415c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Customer/Accounts/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Customer/Accounts/Grid.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Customer/Orders.php b/app/code/core/Mage/Adminhtml/Block/Report/Customer/Orders.php index 8fa80fa93a..fc74fb5176 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Customer/Orders.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Customer/Orders.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Customer/Orders/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Customer/Orders/Grid.php index 491239d5a1..9515a81224 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Customer/Orders/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Customer/Orders/Grid.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Customer/Totals.php b/app/code/core/Mage/Adminhtml/Block/Report/Customer/Totals.php index cb9de8a028..23b0750629 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Customer/Totals.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Customer/Totals.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Customer/Totals/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Customer/Totals/Grid.php index b0bbb2dd60..79c9c1763b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Customer/Totals/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Customer/Totals/Grid.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Grid.php index 74d11d4b4b..fb98ec1eff 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Grid.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Grid/Column/Renderer/Currency.php b/app/code/core/Mage/Adminhtml/Block/Report/Grid/Column/Renderer/Currency.php index e665dd7798..3178a3e395 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Grid/Column/Renderer/Currency.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Grid/Column/Renderer/Currency.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Grid/Column/Renderer/Customer.php b/app/code/core/Mage/Adminhtml/Block/Report/Grid/Column/Renderer/Customer.php index 5bc28b6393..09cef03b91 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Grid/Column/Renderer/Customer.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Grid/Column/Renderer/Customer.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Grid/Column/Renderer/Product.php b/app/code/core/Mage/Adminhtml/Block/Report/Grid/Column/Renderer/Product.php index ff43bb46e4..dbe3c37c91 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Grid/Column/Renderer/Product.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Grid/Column/Renderer/Product.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Product.php b/app/code/core/Mage/Adminhtml/Block/Report/Product.php index ae1200a970..2f147425d6 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Product.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Product.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Product/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Product/Grid.php index ac9cd5c103..4fe44631b8 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Product/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Product/Grid.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Product/Lowstock.php b/app/code/core/Mage/Adminhtml/Block/Report/Product/Lowstock.php index 05cbb82e8d..3cb9d0874f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Product/Lowstock.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Product/Lowstock.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Product/Lowstock/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Product/Lowstock/Grid.php index d886e44d88..7740e87d69 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Product/Lowstock/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Product/Lowstock/Grid.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Product/Ordered.php b/app/code/core/Mage/Adminhtml/Block/Report/Product/Ordered.php index fd92c382b2..b14fd3ca32 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Product/Ordered.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Product/Ordered.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Product/Ordered/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Product/Ordered/Grid.php index c9adef1606..47bb48ba68 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Product/Ordered/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Product/Ordered/Grid.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Product/Viewed.php b/app/code/core/Mage/Adminhtml/Block/Report/Product/Viewed.php index d8a6b4aa7c..ce84e28bc2 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Product/Viewed.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Product/Viewed.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Product/Viewed/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Product/Viewed/Grid.php index c08c108cad..c96f807938 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Product/Viewed/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Product/Viewed/Grid.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Review/Customer.php b/app/code/core/Mage/Adminhtml/Block/Report/Review/Customer.php index 84e65c2cec..6f0833cb6d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Review/Customer.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Review/Customer.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Review/Customer/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Review/Customer/Grid.php index 39328660d5..aee466ac6c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Review/Customer/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Review/Customer/Grid.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Review/Detail.php b/app/code/core/Mage/Adminhtml/Block/Report/Review/Detail.php index bf6ac50f0b..d019aa139e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Review/Detail.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Review/Detail.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Review/Detail/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Review/Detail/Grid.php index 6edd1bd97f..76463afd3f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Review/Detail/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Review/Detail/Grid.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Review/Product.php b/app/code/core/Mage/Adminhtml/Block/Report/Review/Product.php index f482600be3..8770cd44f1 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Review/Product.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Review/Product.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Review/Product/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Review/Product/Grid.php index 6daaa54eaa..129b17e67d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Review/Product/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Review/Product/Grid.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) @@ -68,12 +74,19 @@ protected function _prepareColumns() )); $this->addColumn('avg_rating', array( - 'header' =>Mage::helper('reports')->__('Average rating'), + 'header' =>Mage::helper('reports')->__('Avg. rating'), 'width' =>'50px', 'align' =>'right', 'index' =>'avg_rating' )); + $this->addColumn('avg_rating_approved', array( + 'header' =>Mage::helper('reports')->__('Avg. approved rating'), + 'width' =>'50px', + 'align' =>'right', + 'index' =>'avg_rating_approved' + )); + $this->addColumn('last_created', array( 'header' =>Mage::helper('reports')->__('Last Review'), 'width' =>'150px', diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Coupons.php b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Coupons.php index a187e3b994..8e8b6e9fbf 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Coupons.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Coupons.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Coupons/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Coupons/Grid.php index be44d9fae8..c78e2fea9c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Coupons/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Coupons/Grid.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Invoiced.php b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Invoiced.php index 9e9531589f..720a871f3e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Invoiced.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Invoiced.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Invoiced/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Invoiced/Grid.php index ee16ce1cef..d3e73e76d1 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Invoiced/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Invoiced/Grid.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Refunded.php b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Refunded.php index 2892fca65e..1d5ebe4b95 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Refunded.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Refunded.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Refunded/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Refunded/Grid.php index f7cb801b98..ce64222390 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Refunded/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Refunded/Grid.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) @@ -43,7 +49,7 @@ protected function _prepareCollection() protected function _prepareColumns() { $this->addColumn('orders', array( - 'header' =>Mage::helper('reports')->__('Number of Orders'), + 'header' =>Mage::helper('reports')->__('Number of Refunded Orders'), 'index' =>'orders', 'total' =>'sum', 'type' =>'number' diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Sales.php b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Sales.php index 6e1a577d9f..08f9de8765 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Sales.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Sales.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Sales/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Sales/Grid.php index 01da45cc80..dee44e2440 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Sales/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Sales/Grid.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Shipping.php b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Shipping.php index b42cde3c52..6bed03ccb9 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Shipping.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Shipping.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Shipping/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Shipping/Grid.php index 83f5a42db4..0b6c2c417d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Shipping/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Shipping/Grid.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Tax.php b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Tax.php index 986d8db0cd..277f18c9d2 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Tax.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Tax.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Tax/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Tax/Grid.php index 181deaca32..ff959c98c9 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Tax/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Tax/Grid.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Search.php b/app/code/core/Mage/Adminhtml/Block/Report/Search.php index 27c01a2ac2..5bab3a0a8f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Search.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Search.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Search/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Search/Grid.php index d8c8f9bfe2..0f22e8ee78 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Search/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Search/Grid.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Abandoned.php b/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Abandoned.php index 7aa8ffa9e4..01447e6189 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Abandoned.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Abandoned.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Abandoned/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Abandoned/Grid.php index 3253a87ee4..feb47adf3a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Abandoned/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Abandoned/Grid.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Customer.php b/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Customer.php index 9e714135f4..248d80a430 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Customer.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Customer.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Customer/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Customer/Grid.php index 8db440c55b..6da331bdb4 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Customer/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Customer/Grid.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Product.php b/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Product.php index 0c8b66bc93..1dabe2b260 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Product.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Product.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Product/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Product/Grid.php index 8eff86f8ce..7dec8c4e31 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Product/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Product/Grid.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Customer.php b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Customer.php index 4c6a9c4842..c46516f5f9 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Customer.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Customer.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Customer/Detail.php b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Customer/Detail.php index 2b82e6b44f..6802aca05f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Customer/Detail.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Customer/Detail.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Customer/Detail/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Customer/Detail/Grid.php index abb16a0d33..ca1b7a8397 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Customer/Detail/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Customer/Detail/Grid.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Customer/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Customer/Grid.php index c9487c5c92..f02a52f700 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Customer/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Customer/Grid.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular.php b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular.php index 8f880b25e2..b1272f2b0d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular/Detail.php b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular/Detail.php index 4a6cdc8471..0a652098ba 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular/Detail.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular/Detail.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular/Detail/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular/Detail/Grid.php index 7b9982119b..a3549a0f06 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular/Detail/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular/Detail/Grid.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular/Grid.php index e0d303b3e2..a6dd4cf053 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular/Grid.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Product.php b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Product.php index 290ad50d21..b40ba2783f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Product.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Product.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Product/Detail.php b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Product/Detail.php index 33f6e0b058..1a1d7709c8 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Product/Detail.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Product/Detail.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Product/Detail/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Product/Detail/Grid.php index 1758db0b8c..a80a41adb1 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Product/Detail/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Product/Detail/Grid.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Product/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Product/Grid.php index 25f4cb7b5a..71546c09b5 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Product/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Product/Grid.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Wishlist.php b/app/code/core/Mage/Adminhtml/Block/Report/Wishlist.php index b87d157f43..8a2f48ca23 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Wishlist.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Wishlist.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Wishlist/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Wishlist/Grid.php index 3a0bf1fdd2..85f827ab4b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Wishlist/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Wishlist/Grid.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Review/Add.php b/app/code/core/Mage/Adminhtml/Block/Review/Add.php index e449fba0b6..e787977b2e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Review/Add.php +++ b/app/code/core/Mage/Adminhtml/Block/Review/Add.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Review/Add/Form.php b/app/code/core/Mage/Adminhtml/Block/Review/Add/Form.php index 5cabcee638..36d233491c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Review/Add/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Review/Add/Form.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Review/Edit.php b/app/code/core/Mage/Adminhtml/Block/Review/Edit.php index 8069a4eab4..5371a4b422 100644 --- a/app/code/core/Mage/Adminhtml/Block/Review/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Review/Edit.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Review/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Review/Edit/Form.php index 7cad15fc0b..b694bfee27 100644 --- a/app/code/core/Mage/Adminhtml/Block/Review/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Review/Edit/Form.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Review/Grid.php b/app/code/core/Mage/Adminhtml/Block/Review/Grid.php index 3efd616c0b..1f3349bd21 100644 --- a/app/code/core/Mage/Adminhtml/Block/Review/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Review/Grid.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Review/Grid/Filter/Type.php b/app/code/core/Mage/Adminhtml/Block/Review/Grid/Filter/Type.php index 32fc2fcc3c..37b37ca97c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Review/Grid/Filter/Type.php +++ b/app/code/core/Mage/Adminhtml/Block/Review/Grid/Filter/Type.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Review/Grid/Renderer/Type.php b/app/code/core/Mage/Adminhtml/Block/Review/Grid/Renderer/Type.php index 044fe7cabe..47061a6e2d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Review/Grid/Renderer/Type.php +++ b/app/code/core/Mage/Adminhtml/Block/Review/Grid/Renderer/Type.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Review/Main.php b/app/code/core/Mage/Adminhtml/Block/Review/Main.php index f14dc73c08..d6124ae954 100644 --- a/app/code/core/Mage/Adminhtml/Block/Review/Main.php +++ b/app/code/core/Mage/Adminhtml/Block/Review/Main.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) @@ -44,10 +50,18 @@ public function __construct() } if( Mage::registry('usePendingFilter') === true ) { - $this->_headerText = Mage::helper('review')->__(($customerName ? 'Pending reviews of customer `%s`' : 'Pending reviews'), $customerName); + if ($customerName) { + $this->_headerText = Mage::helper('review')->__('Pending reviews of customer `%s`', $customerName); + } else { + $this->_headerText = Mage::helper('review')->__('Pending reviews'); + } $this->_removeButton('add'); } else { - $this->_headerText = Mage::helper('review')->__(($customerName ? 'All reviews of customer `%s`' : 'All Reviews'), $customerName); + if ($customerName) { + $this->_headerText = Mage::helper('review')->__('All reviews of customer `%s`', $customerName); + } else { + $this->_headerText = Mage::helper('review')->__('All Reviews'); + } } } } \ No newline at end of file diff --git a/app/code/core/Mage/Adminhtml/Block/Review/Product/Grid.php b/app/code/core/Mage/Adminhtml/Block/Review/Product/Grid.php index 63072b2531..347534fc77 100644 --- a/app/code/core/Mage/Adminhtml/Block/Review/Product/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Review/Product/Grid.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Review/Rating/Detailed.php b/app/code/core/Mage/Adminhtml/Block/Review/Rating/Detailed.php index 4772511951..9e551397ba 100644 --- a/app/code/core/Mage/Adminhtml/Block/Review/Rating/Detailed.php +++ b/app/code/core/Mage/Adminhtml/Block/Review/Rating/Detailed.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Review/Rating/Summary.php b/app/code/core/Mage/Adminhtml/Block/Review/Rating/Summary.php index 4dae6b8fc6..c9848c69b5 100644 --- a/app/code/core/Mage/Adminhtml/Block/Review/Rating/Summary.php +++ b/app/code/core/Mage/Adminhtml/Block/Review/Rating/Summary.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales.php b/app/code/core/Mage/Adminhtml/Block/Sales.php index 610d69acbd..2fc7b12299 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Creditmemo.php b/app/code/core/Mage/Adminhtml/Block/Sales/Creditmemo.php index 8d2b92b1c4..afc09ca770 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Creditmemo.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Creditmemo.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Creditmemo/Grid.php b/app/code/core/Mage/Adminhtml/Block/Sales/Creditmemo/Grid.php index effd6e3c68..aac5a232fc 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Creditmemo/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Creditmemo/Grid.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Invoice.php b/app/code/core/Mage/Adminhtml/Block/Sales/Invoice.php index 787270f964..9c1242f296 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Invoice.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Invoice.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Invoice/Grid.php b/app/code/core/Mage/Adminhtml/Block/Sales/Invoice/Grid.php index b861832a8d..08a92db458 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Invoice/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Invoice/Grid.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Items/Abstract.php b/app/code/core/Mage/Adminhtml/Block/Sales/Items/Abstract.php index 2b8748d367..e61670a826 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Items/Abstract.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Items/Abstract.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) @@ -284,8 +290,8 @@ public function displayPriceInclTax(Varien_Object $item) $tax = ($item->getBaseTaxBeforeDiscount() ? $item->getBaseTaxBeforeDiscount() : ($item->getBaseTaxAmount() ? $item->getBaseTaxAmount() : 0)); return $this->displayPrices( - $item->getBasePrice()+$baseTax/$qty, - $item->getPrice()+$tax/$qty + $this->getOrder()->getStore()->roundPrice($item->getBasePrice()+$baseTax/$qty), + $this->getOrder()->getStore()->roundPrice($item->getPrice()+$tax/$qty) ); } @@ -416,4 +422,31 @@ public function canReturnToStock() { return false; } } + + public function canShipPartially() + { + $value = Mage::registry('current_shipment')->getOrder()->getCanShipPartially(); + if (!is_null($value) && !$value) { + return false; + } + return true; + } + + public function canShipPartiallyItem() + { + $value = Mage::registry('current_shipment')->getOrder()->getCanShipPartiallyItem(); + if (!is_null($value) && !$value) { + return false; + } + return true; + } + + public function isShipmentRegular() + { + if (!$this->canShipPartiallyItem() || !$this->canShipPartially()) { + return false; + } + return true; + } + } \ No newline at end of file diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Items/Column/Default.php b/app/code/core/Mage/Adminhtml/Block/Sales/Items/Column/Default.php index cfe9c77d48..7acc4f3a61 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Items/Column/Default.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Items/Column/Default.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) @@ -53,4 +59,13 @@ public function getOrderOptions() } return $result; } + + public function getSku() + { + if ($this->getItem()->getProductType() == Mage_Catalog_Model_Product_Type::TYPE_CONFIGURABLE) { + return $this->getItem()->getProductOptionByCode('simple_sku'); + } + return $this->getItem()->getSku(); + } + } \ No newline at end of file diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Items/Column/Name.php b/app/code/core/Mage/Adminhtml/Block/Sales/Items/Column/Name.php index 02e9492e8b..356eb07fc1 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Items/Column/Name.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Items/Column/Name.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Items/Column/Qty.php b/app/code/core/Mage/Adminhtml/Block/Sales/Items/Column/Qty.php index bb6612fb71..0c0cf65064 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Items/Column/Qty.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Items/Column/Qty.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Items/Renderer/Configurable.php b/app/code/core/Mage/Adminhtml/Block/Sales/Items/Renderer/Configurable.php new file mode 100644 index 0000000000..00812bc081 --- /dev/null +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Items/Renderer/Configurable.php @@ -0,0 +1,42 @@ + + */ +class Mage_Adminhtml_Block_Sales_Items_Renderer_Configurable extends Mage_Adminhtml_Block_Sales_Items_Abstract +{ + + public function getItem() + { + return $this->_getData('item');//->getOrderItem(); + } +} \ No newline at end of file diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Items/Renderer/Default.php b/app/code/core/Mage/Adminhtml/Block/Sales/Items/Renderer/Default.php index 902eb0e769..be8a8f9f50 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Items/Renderer/Default.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Items/Renderer/Default.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order.php index c77b810e2a..623867d06e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Abstract.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Abstract.php index 80ff4152e3..e891378a16 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Abstract.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Abstract.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Comments/View.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Comments/View.php index c8f96b2135..3abe32325c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Comments/View.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Comments/View.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create.php index f73dd4640e..da81963246 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Abstract.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Abstract.php index ed3a96b22c..525813dcec 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Abstract.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Abstract.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Billing/Address.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Billing/Address.php index ecedddad9f..6f1262f8cc 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Billing/Address.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Billing/Address.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Billing/Method.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Billing/Method.php index 7cccbcad5e..230f382e58 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Billing/Method.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Billing/Method.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Billing/Method/Form.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Billing/Method/Form.php index 5696e3d27a..d1d2157554 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Billing/Method/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Billing/Method/Form.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Comment.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Comment.php index 0c8084bc5b..9434f612cd 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Comment.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Comment.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Coupons.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Coupons.php index 7ed830e845..fb15230c20 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Coupons.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Coupons.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Coupons/Form.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Coupons/Form.php index af015f8bb2..d853d1866b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Coupons/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Coupons/Form.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Customer.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Customer.php index abe5da3d7f..76f109854c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Customer.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Customer.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Customer/Grid.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Customer/Grid.php index 248cf250a0..588282d8f5 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Customer/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Customer/Grid.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Data.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Data.php index c314e45d8c..13a576ea1c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Data.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Data.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form.php index 60f60258f0..f33e722f68 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form/Account.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form/Account.php index 8d34ea00c2..1ba106fb98 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form/Account.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form/Account.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form/Address.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form/Address.php index fc478273e5..e656ca83eb 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form/Address.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form/Address.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Giftmessage.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Giftmessage.php index 96bb899926..bc0710d30b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Giftmessage.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Giftmessage.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhmtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Giftmessage/Form.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Giftmessage/Form.php index 6498ca5708..3aa93b2917 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Giftmessage/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Giftmessage/Form.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) @@ -158,6 +164,8 @@ public function _prepareForm() array( 'name' => $this->_getFieldName('message'), 'label' => Mage::helper('sales')->__('Message'), + 'rows' => '5', + 'cols' => '20', 'onchange' => 'toogleRequired(\'' . $this->_getFieldId('message') . '\', [\'' . $this->_getFieldId('sender') . '\', \'' . $this->_getFieldId('recipient') . '\']);' diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Header.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Header.php index 97b676312a..cac7d1bfbd 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Header.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Header.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Items.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Items.php index 5a0c2c6cef..9a5484dee5 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Items.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Items.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Items/Grid.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Items/Grid.php index 2a3209fb3a..9d056d6f4e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Items/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Items/Grid.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Messages.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Messages.php index 4fee607def..cdf51575af 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Messages.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Messages.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Newsletter.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Newsletter.php index 7303f49e4d..9dba98d44f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Newsletter.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Newsletter.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Newsletter/Form.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Newsletter/Form.php index 82bf25b530..5558a5539a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Newsletter/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Newsletter/Form.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search.php index 72db4bc2c1..a001c0f846 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid.php index c2eed51437..b5d14f03b6 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) @@ -116,7 +122,7 @@ protected function _prepareColumns() $this->addColumn('id', array( 'header' => Mage::helper('sales')->__('ID'), 'sortable' => true, - 'width' => '60px', + 'width' => '60', 'index' => 'entity_id' )); $this->addColumn('name', array( @@ -125,7 +131,7 @@ protected function _prepareColumns() )); $this->addColumn('sku', array( 'header' => Mage::helper('sales')->__('SKU'), - 'width' => '80px', + 'width' => '80', 'index' => 'sku' )); $this->addColumn('price', array( @@ -155,10 +161,11 @@ protected function _prepareColumns() 'header' => Mage::helper('sales')->__('Gift'), 'renderer' => 'adminhtml/sales_order_create_search_grid_renderer_giftmessage', 'field_name'=> 'giftmessage', - 'inline_css'=> 'input-text', + 'inline_css'=> 'checkbox', 'align' => 'center', 'index' => 'entity_id', - 'values' => $this->_getGiftmessageSaveModel()->getAllowQuoteItemsProducts() + 'values' => $this->_getGiftmessageSaveModel()->getAllowQuoteItemsProducts(), + 'width' => '1', )); } @@ -172,7 +179,7 @@ protected function _prepareColumns() 'type' => 'input', 'validate_class' => 'validate-number', 'index' => 'qty', - 'width' => '130px', + 'width' => '1', )); return parent::_prepareColumns(); diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid/Renderer/Giftmessage.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid/Renderer/Giftmessage.php index 0fd6868c35..dab7dd56c3 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid/Renderer/Giftmessage.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid/Renderer/Giftmessage.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Shipping/Address.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Shipping/Address.php index 1107bb3f09..e317e44224 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Shipping/Address.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Shipping/Address.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Shipping/Method.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Shipping/Method.php index 45bdc7f75e..a0680e83d5 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Shipping/Method.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Shipping/Method.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Shipping/Method/Form.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Shipping/Method/Form.php index ef548b3f18..b2d1746ae9 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Shipping/Method/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Shipping/Method/Form.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar.php index a3b54b25f6..667889d377 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Abstract.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Abstract.php index 280b62c5a7..d99c3450f1 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Abstract.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Abstract.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Cart.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Cart.php index 6bd846e951..ee29756841 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Cart.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Cart.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Compared.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Compared.php index 0006222d45..b6ae085250 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Compared.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Compared.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Pcompared.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Pcompared.php index a42e58b325..17eacb9230 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Pcompared.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Pcompared.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Pviewed.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Pviewed.php index 03e122edc4..7bc2a299fe 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Pviewed.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Pviewed.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Reorder.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Reorder.php index 6c22ee60a2..2de2ab80f5 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Reorder.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Reorder.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Viewed.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Viewed.php index f5caacaf62..d777add422 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Viewed.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Viewed.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Wishlist.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Wishlist.php index dc45bcc940..3f2775db78 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Wishlist.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Wishlist.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Store.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Store.php index a01fa68014..59d291a7b9 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Store.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Store.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Store/Select.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Store/Select.php index 6caa816bfe..c057cfe168 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Store/Select.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Store/Select.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals.php index 2343c23b25..2620359d42 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Default.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Default.php index 14982742df..181df58984 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Default.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Default.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Table.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Table.php index a7147e9f7e..9dc8ede3b5 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Table.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Table.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Tax.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Tax.php index 63e1b314ef..be9b17f5fb 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Tax.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Tax.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create.php index 05f69b842d..695df02bd8 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create/Form.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create/Form.php index a028252929..4de27cd78f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create/Form.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create/Items.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create/Items.php index c8be5cf209..c99c432668 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create/Items.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create/Items.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) @@ -121,12 +127,12 @@ public function getOrderTotalData() public function getOrderTotalbarData() { $totalbarData = array(); - $this->setPriceDataObject($this->getCreditmemo()); - $totalbarData[] = array(Mage::helper('sales')->__('Paid Amount'), $this->displayPriceAttribute('amount_paid'), false); - $totalbarData[] = array(Mage::helper('sales')->__('Refund Amount'), $this->displayPriceAttribute('amount_refunded'), false); - $totalbarData[] = array(Mage::helper('sales')->__('Shipping Amount'), $this->displayPriceAttribute('shipping_captured'), false); - $totalbarData[] = array(Mage::helper('sales')->__('Shipping Refund'), $this->displayPriceAttribute('shipping_refunded'), false); - $totalbarData[] = array(Mage::helper('sales')->__('Order Grand Total'), $this->displayPriceAttribute('grand_total'), true); + $this->setPriceDataObject($this->getOrder()); + $totalbarData[] = array(Mage::helper('sales')->__('Paid Amount'), $this->displayPriceAttribute('base_total_invoiced'), false); + $totalbarData[] = array(Mage::helper('sales')->__('Refund Amount'), $this->displayPriceAttribute('base_total_refunded'), false); + $totalbarData[] = array(Mage::helper('sales')->__('Shipping Amount'), $this->displayPriceAttribute('base_shipping_invoiced'), false); + $totalbarData[] = array(Mage::helper('sales')->__('Shipping Refund'), $this->displayPriceAttribute('base_shipping_refunded'), false); + $totalbarData[] = array(Mage::helper('sales')->__('Order Grand Total'), $this->displayPriceAttribute('base_grand_total'), true); return $totalbarData; } diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/View.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/View.php index db1435baeb..b60de99864 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/View.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/View.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/View/Comments.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/View/Comments.php index 8371cea89f..b27cf19bb4 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/View/Comments.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/View/Comments.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/View/Form.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/View/Form.php index 5537f98462..84b337a42f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/View/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/View/Form.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/View/Items.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/View/Items.php index ce3b1e74fa..e184898d0f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/View/Items.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/View/Items.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Grid.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Grid.php index e129045795..4dc4b3724c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Grid.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) @@ -62,7 +68,7 @@ protected function _prepareColumns() $this->addColumn('real_order_id', array( 'header'=> Mage::helper('sales')->__('Order #'), 'width' => '80px', - 'type' => 'number', + 'type' => 'text', 'index' => 'increment_id', )); diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create.php index 13d7c6c1ec..f4101064f4 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create/Form.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create/Form.php index df1f439894..3d5024932a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create/Form.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) @@ -105,4 +111,12 @@ public function hasInvoiceShipmentTypeMismatch() { return false; } + public function canShipPartiallyItem() + { + $value = $this->getOrder()->getCanShipPartiallyItem(); + if (!is_null($value) && !$value) { + return false; + } + return true; + } } \ No newline at end of file diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create/Items.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create/Items.php index 6ea46079dc..f743fc9eaf 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create/Items.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create/Items.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create/Tracking.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create/Tracking.php index 8b2009e776..2971ae71dd 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create/Tracking.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create/Tracking.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/View.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/View.php index 25a4c19b3a..a493009f6d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/View.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/View.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/View/Comments.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/View/Comments.php index d3e80b709f..c984c12695 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/View/Comments.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/View/Comments.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/View/Form.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/View/Form.php index 229234ba9c..1248a5f41c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/View/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/View/Form.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/View/Items.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/View/Items.php index ec2ce50df3..de38d59451 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/View/Items.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/View/Items.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Payment.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Payment.php index ceb765b740..dcfbf709d4 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Payment.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Payment.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create.php index 41e34357b6..383f244bd2 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create/Form.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create/Form.php index 42b94060a6..a354351892 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create/Form.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create/Items.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create/Items.php index 3405ebe8d5..cb76bc19f3 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create/Items.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create/Items.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) @@ -89,4 +95,30 @@ public function getUpdateUrl() { return $this->getUrl('*/*/updateQty', array('order_id'=>$this->getShipment()->getOrderId())); } + + public function canShipPartially() + { + $value = Mage::registry('current_shipment')->getOrder()->getCanShipPartially(); + if (!is_null($value) && !$value) { + return false; + } + return true; + } + + public function canShipPartiallyItem() + { + $value = Mage::registry('current_shipment')->getOrder()->getCanShipPartiallyItem(); + if (!is_null($value) && !$value) { + return false; + } + return true; + } + + public function isShipmentRegular() + { + if (!$this->canShipPartiallyItem() || !$this->canShipPartially()) { + return false; + } + return true; + } } \ No newline at end of file diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create/Tracking.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create/Tracking.php index 4a2b420dea..a887eb1798 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create/Tracking.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create/Tracking.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Tracking/Info.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Tracking/Info.php index db0653cc59..5c699fd14b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Tracking/Info.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Tracking/Info.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View.php index fe1fc03ebb..d719b6d78a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View/Comments.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View/Comments.php index aabe074ce5..1ef754c514 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View/Comments.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View/Comments.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View/Form.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View/Form.php index e98a1f84cc..99a497458a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View/Form.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View/Items.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View/Items.php index 53ba1d6c41..d567068761 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View/Items.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View/Items.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View/Tracking.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View/Tracking.php index 65c2f978a2..321f3d401f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View/Tracking.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View/Tracking.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Totalbar.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Totalbar.php index 8ee2f3160f..f4a6006a6b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Totalbar.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Totalbar.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Totals.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Totals.php index 36375ad110..d183f3f11c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Totals.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Totals.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Totals/Tax.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Totals/Tax.php index 8569e935d9..7db8e059be 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Totals/Tax.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Totals/Tax.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View.php index 6917142729..47efc21317 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Form.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Form.php index 40ad9c2982..a1980d9606 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Form.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Giftmessage.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Giftmessage.php index edf8a9c91d..fb7c93fa5c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Giftmessage.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Giftmessage.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/History.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/History.php index c686c49a6f..8fc6b4ac29 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/History.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/History.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Info.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Info.php index a061031d36..c01636af97 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Info.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Info.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Items.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Items.php index 924c729ae8..a9c7086d49 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Items.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Items.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Items/Renderer/Default.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Items/Renderer/Default.php index 66bc29a206..9f014f41b5 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Items/Renderer/Default.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Items/Renderer/Default.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Messages.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Messages.php index 16978cd4f2..8480fada29 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Messages.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Messages.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Creditmemos.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Creditmemos.php index cd35eaa18a..3c06c2f9b3 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Creditmemos.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Creditmemos.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/History.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/History.php index d6bfdbc848..577eaa359e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/History.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/History.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) @@ -130,6 +136,21 @@ public function getTabTitle() return Mage::helper('sales')->__('Order History'); } + public function getTabClass() + { + return 'ajax only'; + } + + public function getClass() + { + return $this->getTabClass(); + } + + public function getTabUrl() + { + return $this->getUrl('*/*/commentsHistory', array('_current' => true)); + } + public function canShowTab() { return true; diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Info.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Info.php index d52652799d..50da71ed9e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Info.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Info.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Invoices.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Invoices.php index b9680c44e0..06609c6f93 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Invoices.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Invoices.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Shipments.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Shipments.php index 0871fa92fe..8341a820c3 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Shipments.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Shipments.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tabs.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tabs.php index be2a0c6b0d..0468fb47f3 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tabs.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Reorder/Renderer/Action.php b/app/code/core/Mage/Adminhtml/Block/Sales/Reorder/Renderer/Action.php index 9a91bd2698..9aff0c4619 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Reorder/Renderer/Action.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Reorder/Renderer/Action.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Shipment.php b/app/code/core/Mage/Adminhtml/Block/Sales/Shipment.php index c01f646ab6..741b6a2701 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Shipment.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Shipment.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Shipment/Grid.php b/app/code/core/Mage/Adminhtml/Block/Sales/Shipment/Grid.php index 9dadde9e11..6607c4d35a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Shipment/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Shipment/Grid.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Sitemap.php b/app/code/core/Mage/Adminhtml/Block/Sitemap.php index 1adfde6369..a836b12997 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sitemap.php +++ b/app/code/core/Mage/Adminhtml/Block/Sitemap.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Sitemap * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Sitemap/Edit.php b/app/code/core/Mage/Adminhtml/Block/Sitemap/Edit.php index 1bfa3e04bd..4f03b21449 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sitemap/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Sitemap/Edit.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Sitemap/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Sitemap/Edit/Form.php index 356e31da09..b31803f7fa 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sitemap/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Sitemap/Edit/Form.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) @@ -50,7 +56,7 @@ protected function _prepareForm() 'method' => 'post' )); - $fieldset = $form->addFieldset('add_sitemap_form', array('class' => 'sitemap', 'legend' => Mage::helper('sitemap')->__('Sitemap'))); + $fieldset = $form->addFieldset('add_sitemap_form', array('legend' => Mage::helper('sitemap')->__('Sitemap'))); if ($model->getId()) { $fieldset->addField('sitemap_id', 'hidden', array( diff --git a/app/code/core/Mage/Adminhtml/Block/Sitemap/Grid.php b/app/code/core/Mage/Adminhtml/Block/Sitemap/Grid.php index 975f548888..84fc707a21 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sitemap/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Sitemap/Grid.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Sitemap/Grid/Renderer/Link.php b/app/code/core/Mage/Adminhtml/Block/Sitemap/Grid/Renderer/Link.php index 2b75365b33..95b6d73be7 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sitemap/Grid/Renderer/Link.php +++ b/app/code/core/Mage/Adminhtml/Block/Sitemap/Grid/Renderer/Link.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Sitemap * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Sitemap/Grid/Renderer/Time.php b/app/code/core/Mage/Adminhtml/Block/Sitemap/Grid/Renderer/Time.php index 3d3b51e36b..ab73d0dd0b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sitemap/Grid/Renderer/Time.php +++ b/app/code/core/Mage/Adminhtml/Block/Sitemap/Grid/Renderer/Time.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Sitemap * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/Store/Switcher.php b/app/code/core/Mage/Adminhtml/Block/Store/Switcher.php index e7563ac3fb..460051dcbc 100644 --- a/app/code/core/Mage/Adminhtml/Block/Store/Switcher.php +++ b/app/code/core/Mage/Adminhtml/Block/Store/Switcher.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) @@ -34,6 +40,7 @@ public function __construct() parent::__construct(); $this->setTemplate('store/switcher.phtml'); $this->setUseConfirm(true); + $this->setUseAjax(true); $this->setDefaultStoreName($this->__('All Store Views')); } diff --git a/app/code/core/Mage/Adminhtml/Block/System/Account/Edit.php b/app/code/core/Mage/Adminhtml/Block/System/Account/Edit.php index e85fe9e9dc..c9adcd00f3 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Account/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Account/Edit.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/System/Account/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/System/Account/Edit/Form.php index 75caa2f91d..991479ec72 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Account/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Account/Edit/Form.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/System/Cache/Edit.php b/app/code/core/Mage/Adminhtml/Block/System/Cache/Edit.php index 639a20663a..f17dd757b7 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Cache/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Cache/Edit.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) @@ -68,21 +74,62 @@ public function initForm() public function getCatalogData() { + $layeredIsDisabled = false; + $nowIsDisabled = false; + $warning = ''; + + $flag = Mage::getModel('catalogindex/catalog_index_flag')->loadSelf(); + switch ($flag->getState()) { + case Mage_CatalogIndex_Model_Catalog_Index_Flag::STATE_QUEUED: + $layeredAction = Mage::helper('adminhtml')->__('Queued... Cancel'); + //$layeredIsDisabled = true; + break; + case Mage_CatalogIndex_Model_Catalog_Index_Flag::STATE_RUNNING: + $layeredAction = Mage::helper('adminhtml')->__('Running... Kill'); + $warning = Mage::helper('adminhtml')->__('Do you really want to KILL parallel process and start new indexing process?'); + //$layeredIsDisabled = true; + //$nowIsDisabled = true; + break; + default: + $layeredAction = Mage::helper('adminhtml')->__('Queue Refresh'); + //$layeredIsDisabled = false; + break; + } + return array( 'refresh_catalog_rewrites' => array( - 'name' => 'refresh_catalog_rewrites', 'label' => Mage::helper('adminhtml')->__('Catalog Rewrites'), - 'action' => Mage::helper('adminhtml')->__('Refresh'), + 'buttons' => array( + array( + 'name' => 'refresh_catalog_rewrites', + 'action' => Mage::helper('adminhtml')->__('Refresh'), + ) + ), ), 'clear_images_cache' => array( - 'name' => 'clear_images_cache', 'label' => Mage::helper('adminhtml')->__('Images Cache'), - 'action' => Mage::helper('adminhtml')->__('Clear'), + 'buttons' => array( + array( + 'name' => 'clear_images_cache', + 'action' => Mage::helper('adminhtml')->__('Clear'), + ) + ), ), 'refresh_layered_navigation' => array( - 'name' => 'refresh_layered_navigation', 'label' => Mage::helper('adminhtml')->__('Layered Navigation Indices'), - 'action' => Mage::helper('adminhtml')->__('Refresh'), + 'buttons' => array( + array( + 'name' => 'refresh_layered_navigation', + 'action' => $layeredAction, + 'disabled' => $layeredIsDisabled, + ), + array( + 'name' => 'refresh_layered_navigation_now', + 'action' => Mage::helper('adminhtml')->__('Refresh Now*'), + 'comment' => Mage::helper('adminhtml')->__('* - If indexing is in progress, it will be killed and new indexing process will start'), + 'warning' => $warning, + ) + ), ) ); } diff --git a/app/code/core/Mage/Adminhtml/Block/System/Cache/Form.php b/app/code/core/Mage/Adminhtml/Block/System/Cache/Form.php index f026b09491..23626535a1 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Cache/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Cache/Form.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) @@ -31,30 +37,28 @@ class Mage_Adminhtml_Block_System_Cache_Form extends Mage_Adminhtml_Block_Widget public function initForm() { - $hlp = Mage::helper('adminhtml'); - $form = new Varien_Data_Form(); $fieldset = $form->addFieldset('cache_enable', array( - 'legend'=>$hlp->__('Cache control') + 'legend' => Mage::helper('adminhtml')->__('Cache control') )); $fieldset->addField('all_cache', 'select', array( 'name'=>'all_cache', - 'label'=>''.$hlp->__('All Cache').'', + 'label'=>''.Mage::helper('adminhtml')->__('All Cache').'', 'value'=>1, 'options'=>array( - '' => $hlp->__('No change'), - 'refresh' => $hlp->__('Refresh'), - 'disable' => $hlp->__('Disable'), - 'enable' => $hlp->__('Enable'), + '' => Mage::helper('adminhtml')->__('No change'), + 'refresh' => Mage::helper('adminhtml')->__('Refresh'), + 'disable' => Mage::helper('adminhtml')->__('Disable'), + 'enable' => Mage::helper('adminhtml')->__('Enable'), ), )); foreach (Mage::helper('core')->getCacheTypes() as $type=>$label) { $fieldset->addField('enable_'.$type, 'checkbox', array( 'name'=>'enable['.$type.']', - 'label'=>$hlp->__($label), + 'label'=>$label, 'value'=>1, 'checked'=>(int)Mage::app()->useCache($type), //'options'=>$options, diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Dwstree.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Dwstree.php index 261a53f0ef..da3c77ec80 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Dwstree.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Dwstree.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Edit.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Edit.php index 1336d1698c..fe4ff462ab 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Edit.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form.php index d5ec373480..14b2f426f9 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field.php index c3c48a3086..cdde7f5989 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) @@ -50,9 +56,10 @@ protected function _getElementHtml(Varien_Data_Form_Element_Abstract $element) */ public function render(Varien_Data_Form_Element_Abstract $element) { - $html = ''; - $id = $element->getHtmlId(); + + $html = ''; + //$isDefault = !$this->getRequest()->getParam('website') && !$this->getRequest()->getParam('store'); $isMultiple = $element->getExtType()==='multiple'; @@ -81,7 +88,7 @@ public function render(Varien_Data_Form_Element_Abstract $element) $html.= ''; if ($addInheritCheckbox) { @@ -103,9 +110,9 @@ public function render(Varien_Data_Form_Element_Abstract $element) } // default value - $html.= ''; } diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Array/Abstract.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Array/Abstract.php index c5595548dd..cc54754254 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Array/Abstract.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Array/Abstract.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) @@ -79,6 +85,8 @@ public function addColumn($name, $params) $this->_columns[$name] = array( 'label' => empty($params['label']) ? 'Column' : $params['label'], 'size' => empty($params['size']) ? false : $params['size'], + 'style' => empty($params['style']) ? null : $params['style'], + 'class' => empty($params['class']) ? null : $params['class'], 'renderer' => false, ); if ((!empty($params['renderer'])) && ($params['renderer'] instanceof Mage_Core_Block_Abstract)) { @@ -147,6 +155,9 @@ protected function _renderCellTemplate($columnName) ->toHtml(); } - return ''; + return ''; } } \ No newline at end of file diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Datetime.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Datetime.php index be4f185664..ab07cedf0e 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Datetime.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Datetime.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Export.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Export.php index 87c448432b..2463ad8746 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Export.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Export.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Image.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Image.php index 9b20b8e390..194b799cc2 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Image.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Image.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Import.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Import.php index d32af0e249..65737cf812 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Import.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Import.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) @@ -49,10 +55,10 @@ public function getElementHtml() { $html = ''; - $html .= ''; + $html .= ''; $html .= << + '; - $this->getResponse()->setRedirect($this->getUrl('*/*/edit', array('id'=>$category->getId(), 'store'=>$storeId))); + // $this->getResponse()->setRedirect($this->getUrl('*/*/edit', array('_current'=> true, 'id'=>$category->getId()))); } /** @@ -150,9 +254,10 @@ public function saveAction() */ public function moveAction() { - $nodeId = $this->getRequest()->getPost('id', false); - $parentNodeId = $this->getRequest()->getPost('pid', false); - $prevNodeId = $this->getRequest()->getPost('aid', false); + $nodeId = $this->getRequest()->getPost('id', false); + $parentNodeId = $this->getRequest()->getPost('pid', false); + $prevNodeId = $this->getRequest()->getPost('aid', false); + $prevParentNodeId = $this->getRequest()->getPost('paid', false); try { $tree = Mage::getResourceModel('catalog/category_tree') @@ -168,7 +273,12 @@ public function moveAction() $tree->move($node, $newParentNode, $prevNode); - Mage::dispatchEvent('category_move', array('category_id' => $nodeId)); + Mage::dispatchEvent('category_move', + array( + 'category_id' => $nodeId, + 'prev_parent_id' => $prevParentNodeId, + 'parent_id' => $parentNodeId + )); $this->getResponse()->setBody("SUCCESS"); } @@ -201,12 +311,49 @@ public function deleteAction() public function gridAction() { - $this->_initCategory(); + if (!$category = $this->_initCategory()) { + return; + } $this->getResponse()->setBody( $this->getLayout()->createBlock('adminhtml/catalog_category_tab_product')->toHtml() ); } + public function treeAction() + { + $storeId = (int) $this->getRequest()->getParam('store'); + $categoryId = (int) $this->getRequest()->getParam('id'); + + if ($storeId) { + if (!$categoryId) { + $store = Mage::app()->getStore($storeId); + $rootId = $store->getRootCategoryId(); + $this->getRequest()->setParam('id', $rootId); + } + } + if (!$category = $this->_initCategory()) { + return; + } + $block = $this->getLayout()->createBlock('adminhtml/catalog_category_tree'); + $root = $block->getRoot(); + $response = array(); + $response['data'] = $block->getTree(); + $response['parameters'] = array( + 'text' => htmlentities($root->getName()), + 'draggable' => false, + 'allowDrop' => ($root->getIsVisible())?'true':'false', + 'id' => (int) $root->getId(), + 'expanded' => (int) $block->getIsWasExpanded(), + 'store_id' => (int) $block->getStore()->getId(), + 'category_id' => (int) $category->getId(), + 'root_visible'=> (int) $root->getIsVisible() + ); + + $this->getResponse()->setBody( + Zend_Json::encode($response) + ); + } + protected function _isAllowed() { return Mage::getSingleton('admin/session')->isAllowed('catalog/categories'); diff --git a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/Action/AttributeController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/Action/AttributeController.php index 1f11b61dd5..97b883d619 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/Action/AttributeController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/Action/AttributeController.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/AttributeController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/AttributeController.php index 05ab79b399..9458e8a7e2 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/AttributeController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/AttributeController.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/DatafeedsController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/DatafeedsController.php index 540e10d1af..045b86fbd7 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/DatafeedsController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/DatafeedsController.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/GalleryController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/GalleryController.php index 5293e50577..362853bd20 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/GalleryController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/GalleryController.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/GroupController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/GroupController.php index 807dc7841d..ab0efb14d1 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/GroupController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/GroupController.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/ReviewController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/ReviewController.php index 1b82959b28..5ab193b39b 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/ReviewController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/ReviewController.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/SetController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/SetController.php index 3bf578c737..bb31a7b9ac 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/SetController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/SetController.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/controllers/Catalog/ProductController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/ProductController.php index f6f1c598cc..2d9ffa78cc 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Catalog/ProductController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/ProductController.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) @@ -417,7 +423,7 @@ protected function _initProductSave() $product->addData($productData); if (Mage::app()->isSingleStoreMode()) { - $product->setWebsiteIds(array(Mage::app()->getStore(true)->getId())); + $product->setWebsiteIds(array(Mage::app()->getStore(true)->getWebsite()->getId())); } /** * Check "Use Default Value" checkboxes values @@ -578,8 +584,8 @@ public function duplicateAction() /** * Decode strings for linked products * - * @param string $encoded - * @return array + * @param string $encoded + * @return array */ protected function _decodeInput($encoded) { @@ -831,13 +837,9 @@ public function quickCreateAction() ); } catch (Exception $e) { - echo 1; - echo $e->getMessage(); - mageDebugBacktrace(false, true, false, $e->getTrace()); - exit(); Mage::logException($e); $result['error'] = array( - 'message' => $this->__('Product saving error.') + 'message' => $this->__('Product saving error. ') . $e->getMessage() ); } diff --git a/app/code/core/Mage/Adminhtml/controllers/Catalog/SearchController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/SearchController.php index 9b64a6e30f..654ba75889 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Catalog/SearchController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/SearchController.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) @@ -86,7 +92,7 @@ public function saveAction() if ($queryText = $this->getRequest()->getParam('query_text')) { $model->load($queryText); - if ($this->getRequest()->getParam('query_id') != $model->getId()) { + if ($model->getId() && $this->getRequest()->getParam('query_id') != $model->getId()) { Mage::getSingleton('adminhtml/session')->addError(Mage::helper('catalog')->__('Search Term with such search query already exist.')); Mage::getSingleton('adminhtml/session')->setPageData($data); $this->_redirect('*/*/edit', array('id' => $this->getRequest()->getParam('query_id'))); diff --git a/app/code/core/Mage/Adminhtml/controllers/CatalogController.php b/app/code/core/Mage/Adminhtml/controllers/CatalogController.php index a175563e3f..b72fc2ca77 100644 --- a/app/code/core/Mage/Adminhtml/controllers/CatalogController.php +++ b/app/code/core/Mage/Adminhtml/controllers/CatalogController.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/controllers/Checkout/AgreementController.php b/app/code/core/Mage/Adminhtml/controllers/Checkout/AgreementController.php index ba2f77c087..b2376e958b 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Checkout/AgreementController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Checkout/AgreementController.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) @@ -139,6 +145,6 @@ protected function _initAction() protected function _isAllowed() { - return Mage::getSingleton('admin/session')->isAllowed('sales/checkout/agreement'); + return Mage::getSingleton('admin/session')->isAllowed('sales/checkoutagreement'); } } diff --git a/app/code/core/Mage/Adminhtml/controllers/Cms/BlockController.php b/app/code/core/Mage/Adminhtml/controllers/Cms/BlockController.php index 7e9c8e9854..1c0da935ab 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Cms/BlockController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Cms/BlockController.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/controllers/Cms/PageController.php b/app/code/core/Mage/Adminhtml/controllers/Cms/PageController.php index 7a7ee59508..8f9f43a417 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Cms/PageController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Cms/PageController.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Cms * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/controllers/Customer/ConfigController.php b/app/code/core/Mage/Adminhtml/controllers/Customer/ConfigController.php index f819efa255..ac4ab03354 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Customer/ConfigController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Customer/ConfigController.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/controllers/Customer/GroupController.php b/app/code/core/Mage/Adminhtml/controllers/Customer/GroupController.php index a14d427eb7..aea965dcd8 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Customer/GroupController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Customer/GroupController.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/controllers/Customer/OnlineController.php b/app/code/core/Mage/Adminhtml/controllers/Customer/OnlineController.php index e5a6b5381c..c77cd87971 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Customer/OnlineController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Customer/OnlineController.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/controllers/CustomerController.php b/app/code/core/Mage/Adminhtml/controllers/CustomerController.php index 374d7bb38e..81e5016902 100644 --- a/app/code/core/Mage/Adminhtml/controllers/CustomerController.php +++ b/app/code/core/Mage/Adminhtml/controllers/CustomerController.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/controllers/DashboardController.php b/app/code/core/Mage/Adminhtml/controllers/DashboardController.php index e6d7695162..6673a7db60 100644 --- a/app/code/core/Mage/Adminhtml/controllers/DashboardController.php +++ b/app/code/core/Mage/Adminhtml/controllers/DashboardController.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/controllers/Extensions/ConfigController.php b/app/code/core/Mage/Adminhtml/controllers/Extensions/ConfigController.php index 520d4620c1..68f21c9e4a 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Extensions/ConfigController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Extensions/ConfigController.php @@ -13,6 +13,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/controllers/Extensions/ConsoleController.php b/app/code/core/Mage/Adminhtml/controllers/Extensions/ConsoleController.php index ac1a9883a0..3f145694bf 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Extensions/ConsoleController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Extensions/ConsoleController.php @@ -13,6 +13,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/controllers/Extensions/CustomController.php b/app/code/core/Mage/Adminhtml/controllers/Extensions/CustomController.php index 868f085690..28aefc008d 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Extensions/CustomController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Extensions/CustomController.php @@ -1,209 +1,273 @@ - - */ -class Mage_Adminhtml_Extensions_CustomController extends Mage_Adminhtml_Controller_Action -{ - public function indexAction() - { - $this->_forward('edit'); - } - - public function editAction() - { - $this->loadLayout(); - - $this->_setActiveMenu('system/extensions/custom'); - - $this->_addContent($this->getLayout()->createBlock('adminhtml/extensions_custom_edit')); - - $this->_addLeft($this->getLayout()->createBlock('adminhtml/extensions_custom_edit_tabs')); - - $this->renderLayout(); - } - - public function resetAction() - { - Mage::getSingleton('adminhtml/session')->unsCustomExtensionPackageFormData(); - $this->_redirect('*/*/edit'); - } - - public function loadAction() - { - $package = $this->getRequest()->getParam('id'); - if ($package) { - $filename = Mage::getBaseDir('var').DS.'pear'.DS.$package.'.ser'; - $session = Mage::getSingleton('adminhtml/session'); - if (is_readable($filename)) { - $p = file_get_contents($filename); - $data = unserialize($p); - $session->setCustomExtensionPackageFormData($data); - $session->addSuccess(Mage::helper('adminhtml')->__("Package %s data was successfully loaded", $package)); - } else { - $session->addError(Mage::helper('adminhtml')->__("File %s.ser could not be read", $package)); - } - } - $this->_redirect('*/*/edit'); - } - - public function saveAction() - { - $session = Mage::getSingleton('adminhtml/session'); - $p = $this->getRequest()->getPost(); - - if (!empty($p['_create'])) { - $create = true; - unset($p['_create']); - } - - $session->setCustomExtensionPackageFormData($p); - try { - $ext = Mage::getModel('adminhtml/extension'); - $ext->setData($p); - $output = $ext->getPear()->getOutput(); - if ($ext->savePackage()) { - $session->addSuccess('Package data was successfully saved'); - } else { - $session->addError('There was a problem saving package data'); - $this->_redirect('*/*/edit'); - } - if (empty($create)) { - $this->_redirect('*/*/edit'); - } else { - $this->_forward('create'); - } - } - catch(Mage_Core_Exception $e){ - $session->addError($e->getMessage()); - $this->_redirect('*/*'); - } - catch(Exception $e){ - $session->addError($e->getMessage()); - $this->_redirect('*/*'); - } - } - - public function createAction() - { - $session = Mage::getSingleton('adminhtml/session'); - try { - $p = $this->getRequest()->getPost(); - $session->setCustomExtensionPackageFormData($p); - $ext = Mage::getModel('adminhtml/extension'); - $ext->setData($p); - $result = $ext->createPackage(); - $pear = Varien_Pear::getInstance(); - if ($result) { - $data = $pear->getOutput(); - $session->addSuccess($data[0]['output']); - $this->_redirect('*/*'); - #$this->_forward('reset'); - } else { - $session->addError($result->getMessage()); - $this->_redirect('*/*'); - } - } - catch(Mage_Core_Exception $e){ - $session->addError($e->getMessage()); - $this->_redirect('*/*'); - } - catch(Exception $e){ - $session->addError($e->getMessage()); - $this->_redirect('*/*'); - } - } - - public function releaseAction() - { - #Varien_Pear::getInstance()->runHtmlConsole(array('command'=>'list-channels')); - if (empty($_POST)) { - $serFiles = @glob(Mage::getBaseDir('var').DS.'pear'.DS.'*.ser'); - if (!$serFiles) { - return; - } - $pkg = new Varien_Object(); - echo ' -
 '; - $html.= ' '; + $html.= '
'.$element->getLabel().'
'; $html.= $this->_getElementHtml($element); if ($element->getComment()) { - $html.= '
'.$element->getComment().'
'; + $html.= '

'.$element->getComment().'

'; } $html.= '		'; + $html.= ''; //$html.= ''; - $html.= ''; + $html.= ' '; $html.= ''; $html.= '
- - '; - foreach ($serFiles as $i=>$file) { - $serialized = file_get_contents($file); - $pkg->setData(unserialize($serialized)); - $n = $pkg->getName(); - echo ' - - - '; - #echo "
"; print_r($pkg->getData()); echo "
"; exit; - } - echo '
Update/PackageVersionState
- - -
'; - } else { - @set_time_limit(0); - ob_implicit_flush(); - foreach ($_POST['pkgs'] as $r) { - if (empty($r['name'])) { - continue; - } - echo "

".$r['name']."

"; - - $ext = Mage::getModel('adminhtml/extension'); - $ext->setData(unserialize(file_get_contents($r['file']))); - $ext->setData('release_version', $r['release_version']); - $ext->setData('release_stability', $r['release_stability']); -#echo "
"; print_r($ext->getData()); echo "
"; - $result = $ext->savePackage(); - if (!$result) { - echo "ERROR while creating the package"; - continue; - } else { - echo "Package created; "; - } - $result = $ext->createPackage(); - $pear = Varien_Pear::getInstance(); - if ($result) { - $data = $pear->getOutput(); - print_r($data[0]['output']); - } else { - echo "ERROR:"; - print_r($result->getMessage()); - } - } - echo '
Refresh'; - } - exit; - } - - protected function _isAllowed() - { - return Mage::getSingleton('admin/session')->isAllowed('system/extensions/custom'); - } + + */ +class Mage_Adminhtml_Extensions_CustomController extends Mage_Adminhtml_Controller_Action +{ + public function indexAction() + { + $this->_forward('edit'); + } + + public function editAction() + { + $this->loadLayout(); + + $this->_setActiveMenu('system/extensions/custom'); + + $this->_addContent($this->getLayout()->createBlock('adminhtml/extensions_custom_edit')); + + $this->_addLeft($this->getLayout()->createBlock('adminhtml/extensions_custom_edit_tabs')); + + $this->renderLayout(); + } + + public function resetAction() + { + Mage::getSingleton('adminhtml/session')->unsCustomExtensionPackageFormData(); + $this->_redirect('*/*/edit'); + } + + public function loadAction() + { + $package = $this->getRequest()->getParam('id'); + if ($package) { + $session = Mage::getSingleton('adminhtml/session'); + try { + $data = $this->_loadPackageFile(Mage::getBaseDir('var') . DS . 'pear' . DS . $package); + + $data = array_merge($data, array('file_name' => $package)); + + $session->setCustomExtensionPackageFormData($data); + $session->addSuccess(Mage::helper('adminhtml')->__("Package %s data was successfully loaded", $package)); + } + catch (Exception $e) { + $session->addError($e->getMessage()); + } + } + $this->_redirect('*/*/edit'); + } + + private function _loadPackageFile($filenameNoExtension) + { + $data = null; + + // try to load xml-file + $filename = $filenameNoExtension . '.xml'; + if (file_exists($filename)) { + $xml = simplexml_load_file($filename); + $data = Mage::helper('core')->xmlToAssoc($xml); + if (!empty($data)) { + return $data; + } + } + + // try to load ser-file + $filename = $filenameNoExtension . '.ser'; + if (!is_readable($filename)) { + throw new Exception(Mage::helper('adminhtml')->__('Failed to load %1$s.xml or %1$s.ser', basename($filenameNoExtension))); + } + $contents = file_get_contents($filename); + $data = unserialize($contents); + if (!empty($data)) { + return $data; + } + + throw new Exception('Failed to load package data.'); + } + + public function saveAction() + { + $session = Mage::getSingleton('adminhtml/session'); + $p = $this->getRequest()->getPost(); + + if (!empty($p['_create'])) { + $create = true; + unset($p['_create']); + } + + if ($p['file_name'] == '') { + $p['file_name'] = $p['name']; + } + + $session->setCustomExtensionPackageFormData($p); + try { + $ext = Mage::getModel('adminhtml/extension'); + /* @var $ext Mage_Adminhtml_Model_Extension */ + $ext->setData($p); + $output = $ext->getPear()->getOutput(); + if ($ext->savePackage()) { + $session->addSuccess('Package data was successfully saved'); + } else { + $session->addError('There was a problem saving package data'); + $this->_redirect('*/*/edit'); + } + if (empty($create)) { + $this->_redirect('*/*/edit'); + } else { + $this->_forward('create'); + } + } + catch(Mage_Core_Exception $e){ + $session->addError($e->getMessage()); + $this->_redirect('*/*'); + } + catch(Exception $e){ + $session->addError($e->getMessage()); + $this->_redirect('*/*'); + } + } + + public function createAction() + { + $session = Mage::getSingleton('adminhtml/session'); + try { + $p = $this->getRequest()->getPost(); + $session->setCustomExtensionPackageFormData($p); + $ext = Mage::getModel('adminhtml/extension'); + $ext->setData($p); + $result = $ext->createPackage(); + $pear = Varien_Pear::getInstance(); + if ($result) { + $data = $pear->getOutput(); + $session->addSuccess($data[0]['output']); + $this->_redirect('*/*'); + #$this->_forward('reset'); + } else { + $session->addError($result->getMessage()); + $this->_redirect('*/*'); + } + } + catch(Mage_Core_Exception $e){ + $session->addError($e->getMessage()); + $this->_redirect('*/*'); + } + catch(Exception $e){ + $session->addError($e->getMessage()); + $this->_redirect('*/*'); + } + } + + public function releaseAction() + { + #Varien_Pear::getInstance()->runHtmlConsole(array('command'=>'list-channels')); + if (empty($_POST)) { + $serFiles = @glob(Mage::getBaseDir('var').DS.'pear'.DS.'*.ser'); + if (!$serFiles) { + return; + } + $pkg = new Varien_Object(); + echo ' +
+ + '; + foreach ($serFiles as $i=>$file) { + $serialized = file_get_contents($file); + $pkg->setData(unserialize($serialized)); + $n = $pkg->getName(); + echo ' + + + '; + #echo "
"; print_r($pkg->getData()); echo "
"; exit; + } + echo '
Update/PackageVersionState
+ + +
'; + } else { + @set_time_limit(0); + ob_implicit_flush(); + foreach ($_POST['pkgs'] as $r) { + if (empty($r['name'])) { + continue; + } + echo "

".$r['name']."

"; + + $ext = Mage::getModel('adminhtml/extension'); + $ext->setData(unserialize(file_get_contents($r['file']))); + $ext->setData('release_version', $r['release_version']); + $ext->setData('release_stability', $r['release_stability']); +#echo "
"; print_r($ext->getData()); echo "
"; + $result = $ext->savePackage(); + if (!$result) { + echo "ERROR while creating the package"; + continue; + } else { + echo "Package created; "; + } + $result = $ext->createPackage(); + $pear = Varien_Pear::getInstance(); + if ($result) { + $data = $pear->getOutput(); + print_r($data[0]['output']); + } else { + echo "ERROR:"; + print_r($result->getMessage()); + } + } + echo '
Refresh'; + } + exit; + } + + protected function _isAllowed() + { + return Mage::getSingleton('admin/session')->isAllowed('system/extensions/custom'); + } + + /** + * Grid for loading packages + * + */ + public function loadtabAction() + { + $this->getResponse()->setBody( + $this->getLayout()->createBlock('adminhtml/extensions_custom_edit_tab_load')->toHtml() + ); + } + + /** + * Grid for loading packages + * + */ + public function gridAction() + { + $this->getResponse()->setBody( + $this->getLayout()->createBlock('adminhtml/extensions_custom_edit_tab_grid')->toHtml() + ); + } + } \ No newline at end of file diff --git a/app/code/core/Mage/Adminhtml/controllers/Extensions/FileController.php b/app/code/core/Mage/Adminhtml/controllers/Extensions/FileController.php index 7d3b19e06d..b9d7c5d9db 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Extensions/FileController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Extensions/FileController.php @@ -13,6 +13,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/controllers/Extensions/LocalController.php b/app/code/core/Mage/Adminhtml/controllers/Extensions/LocalController.php index 59c2276fca..7fa3f16274 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Extensions/LocalController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Extensions/LocalController.php @@ -13,6 +13,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/controllers/Extensions/RemoteController.php b/app/code/core/Mage/Adminhtml/controllers/Extensions/RemoteController.php index be5d35f76d..b04b66a095 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Extensions/RemoteController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Extensions/RemoteController.php @@ -13,6 +13,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/controllers/IndexController.php b/app/code/core/Mage/Adminhtml/controllers/IndexController.php index fa2880ceed..2c89a3b3b2 100644 --- a/app/code/core/Mage/Adminhtml/controllers/IndexController.php +++ b/app/code/core/Mage/Adminhtml/controllers/IndexController.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/controllers/JsonController.php b/app/code/core/Mage/Adminhtml/controllers/JsonController.php index 2bc5d9d6b1..3085026309 100644 --- a/app/code/core/Mage/Adminhtml/controllers/JsonController.php +++ b/app/code/core/Mage/Adminhtml/controllers/JsonController.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/controllers/Media/EditorController.php b/app/code/core/Mage/Adminhtml/controllers/Media/EditorController.php index 8010a76556..ca20c99602 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Media/EditorController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Media/EditorController.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/controllers/Media/UploaderController.php b/app/code/core/Mage/Adminhtml/controllers/Media/UploaderController.php index cf4b0b395d..a8675a8e9d 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Media/UploaderController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Media/UploaderController.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/controllers/Newsletter/ProblemController.php b/app/code/core/Mage/Adminhtml/controllers/Newsletter/ProblemController.php index ec74c8563c..7624ce4e03 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Newsletter/ProblemController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Newsletter/ProblemController.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/controllers/Newsletter/QueueController.php b/app/code/core/Mage/Adminhtml/controllers/Newsletter/QueueController.php index 1276a5c537..55d2d05c02 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Newsletter/QueueController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Newsletter/QueueController.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/controllers/Newsletter/SubscriberController.php b/app/code/core/Mage/Adminhtml/controllers/Newsletter/SubscriberController.php index f98d07ccb5..cda3a2bb87 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Newsletter/SubscriberController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Newsletter/SubscriberController.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/controllers/Newsletter/TemplateController.php b/app/code/core/Mage/Adminhtml/controllers/Newsletter/TemplateController.php index 7922fb3b8c..c77d486fe1 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Newsletter/TemplateController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Newsletter/TemplateController.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/controllers/Permissions/RoleController.php b/app/code/core/Mage/Adminhtml/controllers/Permissions/RoleController.php index 18938f96f4..38b1f51040 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Permissions/RoleController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Permissions/RoleController.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/controllers/Permissions/UserController.php b/app/code/core/Mage/Adminhtml/controllers/Permissions/UserController.php index 48bdf5e5da..569da7ed70 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Permissions/UserController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Permissions/UserController.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/controllers/Poll/AnswerController.php b/app/code/core/Mage/Adminhtml/controllers/Poll/AnswerController.php index 40cdd866a3..b0c3a38631 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Poll/AnswerController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Poll/AnswerController.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/controllers/PollController.php b/app/code/core/Mage/Adminhtml/controllers/PollController.php index b5b9a9ef69..3e6811e676 100644 --- a/app/code/core/Mage/Adminhtml/controllers/PollController.php +++ b/app/code/core/Mage/Adminhtml/controllers/PollController.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/controllers/Promo/CatalogController.php b/app/code/core/Mage/Adminhtml/controllers/Promo/CatalogController.php index 04b858ca55..26f218b3c7 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Promo/CatalogController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Promo/CatalogController.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/controllers/Promo/QuoteController.php b/app/code/core/Mage/Adminhtml/controllers/Promo/QuoteController.php index 7049df7e4c..7510904dcd 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Promo/QuoteController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Promo/QuoteController.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) @@ -107,6 +113,9 @@ public function saveAction() return; } } + if (isset($data['simple_action']) && $data['simple_action'] == 'by_percent' && isset($data['discount_amount'])) { + $data['discount_amount'] = min(100,$data['discount_amount']); + } if (isset($data['rule']['conditions'])) { $data['conditions'] = $data['rule']['conditions']; } diff --git a/app/code/core/Mage/Adminhtml/controllers/Promo/WidgetController.php b/app/code/core/Mage/Adminhtml/controllers/Promo/WidgetController.php index af59328684..944d34116e 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Promo/WidgetController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Promo/WidgetController.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) @@ -23,22 +29,26 @@ class Mage_Adminhtml_Promo_WidgetController extends Mage_Adminhtml_Controller_Ac { public function chooserAction() { + $block = false; switch ($this->getRequest()->getParam('attribute')) { case 'sku': - $type = 'adminhtml/promo_widget_chooser_sku'; + $block = $this->getLayout()->createBlock( + 'adminhtml/promo_widget_chooser_sku', 'promo_widget_chooser_sku', + array('js_form_object' => $this->getRequest()->getParam('form'), + )); break; case 'category_ids': - $type = 'adminhtml/promo_widget_chooser_categories'; + $block = $this->getLayout()->createBlock( + 'adminhtml/catalog_category_checkboxes_tree', 'promo_widget_chooser_category_ids', + array('js_form_object' => $this->getRequest()->getParam('form')) + ) + ->setCategoryIds($this->getRequest()->getParam('selected', array())) + ; break; } - if (!empty($type)) { - $block = $this->getLayout()->createBlock($type, 'promo_widget_chooser_sku', array( - 'js_form_object' => $this->getRequest()->getParam('form'), - )); - if ($block) { - $this->getResponse()->setBody($block->toHtml()); - } + if ($block) { + $this->getResponse()->setBody($block->toHtml()); } } @@ -46,4 +56,52 @@ protected function _isAllowed() { return Mage::getSingleton('admin/session')->isAllowed('promo/catalog'); } + + /** + * Get tree node (Ajax version) + */ + public function categoriesJsonAction() + { + if ($categoryId = (int) $this->getRequest()->getPost('id')) { + $this->getRequest()->setParam('id', $categoryId); + + if (!$category = $this->_initCategory()) { + return; + } + $this->getResponse()->setBody( + $this->getLayout()->createBlock('adminhtml/catalog_category_tree') + ->getTreeJson($category) + ); + } + } + + /** + * Initialize category object in registry + * + * @return Mage_Catalog_Model_Category + */ + protected function _initCategory() + { + $categoryId = (int) $this->getRequest()->getParam('id',false); + + $storeId = (int) $this->getRequest()->getParam('store'); + + $category = Mage::getModel('catalog/category'); + $category->setStoreId($storeId); + + if ($categoryId) { + $category->load($categoryId); + if ($storeId) { + $rootId = Mage::app()->getStore($storeId)->getRootCategoryId(); + if (!in_array($rootId, $category->getPathIds())) { + $this->_redirect('*/*/', array('_current'=>true, 'id'=>null)); + return false; + } + } + } + + Mage::register('category', $category); + Mage::register('current_category', $category); + return $category; + } } diff --git a/app/code/core/Mage/Adminhtml/controllers/PromoController.php b/app/code/core/Mage/Adminhtml/controllers/PromoController.php index 9626611895..3d252a3cdf 100644 --- a/app/code/core/Mage/Adminhtml/controllers/PromoController.php +++ b/app/code/core/Mage/Adminhtml/controllers/PromoController.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/controllers/RatingController.php b/app/code/core/Mage/Adminhtml/controllers/RatingController.php index 93fa96dfd2..0691f07d14 100644 --- a/app/code/core/Mage/Adminhtml/controllers/RatingController.php +++ b/app/code/core/Mage/Adminhtml/controllers/RatingController.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/controllers/Report/CustomerController.php b/app/code/core/Mage/Adminhtml/controllers/Report/CustomerController.php index 8f45e82956..460b80a0a4 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Report/CustomerController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Report/CustomerController.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/controllers/Report/ProductController.php b/app/code/core/Mage/Adminhtml/controllers/Report/ProductController.php index 9f8561f4e0..cdb21d3e3d 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Report/ProductController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Report/ProductController.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/controllers/Report/ReviewController.php b/app/code/core/Mage/Adminhtml/controllers/Report/ReviewController.php index ba3b728263..44cafaf259 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Report/ReviewController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Report/ReviewController.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/controllers/Report/SalesController.php b/app/code/core/Mage/Adminhtml/controllers/Report/SalesController.php index 3ea9b22144..6c5494bb95 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Report/SalesController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Report/SalesController.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/controllers/Report/ShopcartController.php b/app/code/core/Mage/Adminhtml/controllers/Report/ShopcartController.php index 517d1e2c69..72b8ad8ec4 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Report/ShopcartController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Report/ShopcartController.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/controllers/Report/TagController.php b/app/code/core/Mage/Adminhtml/controllers/Report/TagController.php index 8cecf5453a..8aae85276c 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Report/TagController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Report/TagController.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/controllers/ReportController.php b/app/code/core/Mage/Adminhtml/controllers/ReportController.php index 3930287be9..6eedcafe31 100644 --- a/app/code/core/Mage/Adminhtml/controllers/ReportController.php +++ b/app/code/core/Mage/Adminhtml/controllers/ReportController.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/CreditmemoController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/CreditmemoController.php index dc60422406..a380c7ce98 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Sales/CreditmemoController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Sales/CreditmemoController.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/InvoiceController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/InvoiceController.php index 821a2edf12..c676b84d11 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Sales/InvoiceController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Sales/InvoiceController.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreateController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreateController.php index 647de7550d..7e7b558c43 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreateController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreateController.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) @@ -121,6 +127,11 @@ protected function _processData() $this->_getOrderCreateModel()->importPostData($data); } + /** + * init first billing address, need for virtual products + */ + $this->_getOrderCreateModel()->getBillingAddress(); + /** * Flag for using billing address for shipping */ diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreditmemoController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreditmemoController.php index 014161b35d..4300161c85 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreditmemoController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreditmemoController.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) @@ -188,6 +194,11 @@ protected function _initCreditmemo($update = false) } elseif ($invoice) { $creditmemo->setShippingAmount($invoice->getShippingAmount()); } + else { + $creditmemo->setShippingAmount( + $order->getBaseShippingAmount()-$order->getBaseShippingRefunded() + ); + } if (isset($data['adjustment_positive'])) { $creditmemo->setAdjustmentPositive($data['adjustment_positive']); @@ -250,6 +261,10 @@ public function startAction() public function newAction() { if ($creditmemo = $this->_initCreditmemo()) { + $commentText = Mage::getSingleton('adminhtml/session')->getCommentText(true); + + $creditmemo->addData(array('commentText'=>$commentText)); + $this->loadLayout() ->_setActiveMenu('sales/order') ->renderLayout(); @@ -300,6 +315,9 @@ public function saveAction() $this->__('Credit Memo total must be positive.') ); } + + Mage::getSingleton('adminhtml/session')->setCommentText($data['comment_text']); + $comment = ''; if (!empty($data['comment_text'])) { $comment = $data['comment_text']; @@ -321,6 +339,7 @@ public function saveAction() $this->_saveCreditmemo($creditmemo); $creditmemo->sendEmail(!empty($data['send_email']), $comment); $this->_getSession()->addSuccess($this->__('Credit Memo was successfully created')); + Mage::getSingleton('adminhtml/session')->getCommentText(true); $this->_redirect('*/sales_order/view', array('order_id' => $creditmemo->getOrderId())); return; } diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/EditController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/EditController.php index f5d6465555..866a90379a 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/EditController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/EditController.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/InvoiceController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/InvoiceController.php index 4f2967d735..4426f8563f 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/InvoiceController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/InvoiceController.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) @@ -290,8 +296,6 @@ public function saveAction() $invoice->setEmailSent(true); } - $invoice->getOrder()->setIsInProcess(true); - $transactionSave = Mage::getModel('core/resource_transaction') ->addObject($invoice) ->addObject($invoice->getOrder()); diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/ShipmentController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/ShipmentController.php index 54a98fc92d..a657105465 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/ShipmentController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/ShipmentController.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/View/GiftmessageController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/View/GiftmessageController.php index 4f5affd12a..ea4a424142 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/View/GiftmessageController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/View/GiftmessageController.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/OrderController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/OrderController.php index 424fca342c..a8391b03b3 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Sales/OrderController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Sales/OrderController.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) @@ -178,6 +184,7 @@ public function addCommentAction() { if ($order = $this->_initOrder()) { try { + $response = false; $data = $this->getRequest()->getPost('history'); $notify = isset($data['is_customer_notified']) ? $data['is_customer_notified'] : false; $order->addStatusToHistory($data['status'], $data['comment'], $notify); @@ -185,7 +192,9 @@ public function addCommentAction() $order->sendOrderUpdateEmail($notify, $comment); $order->save(); - $response = $this->getLayout()->createBlock('adminhtml/sales_order_view_history')->toHtml(); + + $this->loadLayout('empty'); + $this->renderLayout(); } catch (Mage_Core_Exception $e) { $response = array( @@ -201,8 +210,8 @@ public function addCommentAction() } if (is_array($response)) { $response = Zend_Json::encode($response); + $this->getResponse()->setBody($response); } - $this->getResponse()->setBody($response); } } @@ -239,6 +248,17 @@ public function creditmemosAction() ); } + /** + * Generate order history for ajax request + */ + public function commentsHistoryAction() + { + $this->_initOrder(); + $this->getResponse()->setBody( + $this->getLayout()->createBlock('adminhtml/sales_order_view_tab_history')->toHtml() + ); + } + /** * Cancel selected orders */ diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/ShipmentController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/ShipmentController.php index 8d0712c255..60c4005efb 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Sales/ShipmentController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Sales/ShipmentController.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/controllers/SalesController.php b/app/code/core/Mage/Adminhtml/controllers/SalesController.php index 30ed0047f3..0878263645 100644 --- a/app/code/core/Mage/Adminhtml/controllers/SalesController.php +++ b/app/code/core/Mage/Adminhtml/controllers/SalesController.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/controllers/SitemapController.php b/app/code/core/Mage/Adminhtml/controllers/SitemapController.php index 0a91945add..a8b4e19d09 100644 --- a/app/code/core/Mage/Adminhtml/controllers/SitemapController.php +++ b/app/code/core/Mage/Adminhtml/controllers/SitemapController.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Sitemap * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/controllers/System/AccountController.php b/app/code/core/Mage/Adminhtml/controllers/System/AccountController.php index 29cd994933..13f5854bf3 100644 --- a/app/code/core/Mage/Adminhtml/controllers/System/AccountController.php +++ b/app/code/core/Mage/Adminhtml/controllers/System/AccountController.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/controllers/System/BackupController.php b/app/code/core/Mage/Adminhtml/controllers/System/BackupController.php index a9b343e833..4f0dca7228 100644 --- a/app/code/core/Mage/Adminhtml/controllers/System/BackupController.php +++ b/app/code/core/Mage/Adminhtml/controllers/System/BackupController.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/controllers/System/CacheController.php b/app/code/core/Mage/Adminhtml/controllers/System/CacheController.php index 76653b8354..67105e5b8d 100644 --- a/app/code/core/Mage/Adminhtml/controllers/System/CacheController.php +++ b/app/code/core/Mage/Adminhtml/controllers/System/CacheController.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) @@ -78,7 +84,7 @@ public function saveAction() case 'refresh_catalog_rewrites': try { Mage::getSingleton('catalog/url')->refreshRewrites(); - $this->_getSession()->addSuccess(Mage::helper('adminhtml')->__('Catalog Rewrites was refreshed succesfuly')); + $this->_getSession()->addSuccess(Mage::helper('adminhtml')->__('Catalog Rewrites were refreshed succesfuly')); } catch (Mage_Core_Exception $e) { $this->_getSession()->addError($e->getMessage()); @@ -91,7 +97,7 @@ public function saveAction() case 'clear_images_cache': try { Mage::getModel('catalog/product_image')->clearCache(); - $this->_getSession()->addSuccess(Mage::helper('adminhtml')->__('Image cache was cleared succesfuly')); + $this->_getSession()->addSuccess(Mage::helper('adminhtml')->__('Image cache were cleared succesfuly')); } catch (Mage_Core_Exception $e) { $this->_getSession()->addError($e->getMessage()); @@ -101,10 +107,17 @@ public function saveAction() } break; - case 'refresh_layered_navigation': + case 'refresh_layered_navigation_now': try { + $flag = Mage::getModel('catalogindex/catalog_index_flag')->loadSelf(); + if ($flag->getState() == Mage_CatalogIndex_Model_Catalog_Index_Flag::STATE_RUNNING) { + $kill = Mage::getModel('catalogindex/catalog_index_kill_flag')->loadSelf(); + $kill->setFlagData($flag->getFlagData())->save(); + } + + $flag->setState(Mage_CatalogIndex_Model_Catalog_Index_Flag::STATE_QUEUED)->save(); Mage::getSingleton('catalogindex/indexer')->plainReindex(); - $this->_getSession()->addSuccess(Mage::helper('adminhtml')->__('Layered Navigation Indices was refreshed succesfuly')); + $this->_getSession()->addSuccess(Mage::helper('adminhtml')->__('Layered Navigation Indices were refreshed succesfuly')); } catch (Mage_Core_Exception $e) { $this->_getSession()->addError($e->getMessage()); @@ -114,6 +127,35 @@ public function saveAction() } break; + + case 'refresh_layered_navigation': + try { + $flag = Mage::getModel('catalogindex/catalog_index_flag')->loadSelf(); + switch ($flag->getState()) { + case Mage_CatalogIndex_Model_Catalog_Index_Flag::STATE_QUEUED: + $flag->delete(); + $this->_getSession()->addSuccess(Mage::helper('adminhtml')->__('Layered Navigation indexing queue cancelled')); + break; + case Mage_CatalogIndex_Model_Catalog_Index_Flag::STATE_RUNNING: + $kill = Mage::getModel('catalogindex/catalog_index_kill_flag')->loadSelf(); + $kill->setFlagData($flag->getFlagData())->save(); + $this->_getSession()->addSuccess(Mage::helper('adminhtml')->__('Layered Navigation process queued to be killed')); + break; + default: + $flag->setState(Mage_CatalogIndex_Model_Catalog_Index_Flag::STATE_QUEUED)->save(); + $this->_getSession()->addSuccess(Mage::helper('adminhtml')->__('Layered Navigation indexing queued')); + break; + } + } + catch (Mage_Core_Exception $e) { + $this->_getSession()->addError($e->getMessage()); + } + catch (Exception $e) { + $this->_getSession()->addException($e, Mage::helper('adminhtml')->__('Error while refreshed Layered Navigation Indices. Please try again later')); + } + break; + + default: break; } diff --git a/app/code/core/Mage/Adminhtml/controllers/System/ConfigController.php b/app/code/core/Mage/Adminhtml/controllers/System/ConfigController.php index b508fe7e7b..c63191e2b4 100644 --- a/app/code/core/Mage/Adminhtml/controllers/System/ConfigController.php +++ b/app/code/core/Mage/Adminhtml/controllers/System/ConfigController.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/controllers/System/Convert/GuiController.php b/app/code/core/Mage/Adminhtml/controllers/System/Convert/GuiController.php index 4088b04337..e2a16ac2a7 100644 --- a/app/code/core/Mage/Adminhtml/controllers/System/Convert/GuiController.php +++ b/app/code/core/Mage/Adminhtml/controllers/System/Convert/GuiController.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/controllers/System/Convert/ProfileController.php b/app/code/core/Mage/Adminhtml/controllers/System/Convert/ProfileController.php index 2213ac49b3..cb955b8f0c 100644 --- a/app/code/core/Mage/Adminhtml/controllers/System/Convert/ProfileController.php +++ b/app/code/core/Mage/Adminhtml/controllers/System/Convert/ProfileController.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/controllers/System/CurrencyController.php b/app/code/core/Mage/Adminhtml/controllers/System/CurrencyController.php index 6b9b54140c..b2b568d062 100644 --- a/app/code/core/Mage/Adminhtml/controllers/System/CurrencyController.php +++ b/app/code/core/Mage/Adminhtml/controllers/System/CurrencyController.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/controllers/System/DesignController.php b/app/code/core/Mage/Adminhtml/controllers/System/DesignController.php index a994866082..1d94649a76 100644 --- a/app/code/core/Mage/Adminhtml/controllers/System/DesignController.php +++ b/app/code/core/Mage/Adminhtml/controllers/System/DesignController.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/controllers/System/Email/TemplateController.php b/app/code/core/Mage/Adminhtml/controllers/System/Email/TemplateController.php index f1ac86e400..83733c1149 100644 --- a/app/code/core/Mage/Adminhtml/controllers/System/Email/TemplateController.php +++ b/app/code/core/Mage/Adminhtml/controllers/System/Email/TemplateController.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/controllers/System/StoreController.php b/app/code/core/Mage/Adminhtml/controllers/System/StoreController.php index df4b4dfd14..2127f1f0c0 100644 --- a/app/code/core/Mage/Adminhtml/controllers/System/StoreController.php +++ b/app/code/core/Mage/Adminhtml/controllers/System/StoreController.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/controllers/SystemController.php b/app/code/core/Mage/Adminhtml/controllers/SystemController.php index 516a8e70e0..931c5427ff 100644 --- a/app/code/core/Mage/Adminhtml/controllers/SystemController.php +++ b/app/code/core/Mage/Adminhtml/controllers/SystemController.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/controllers/TagController.php b/app/code/core/Mage/Adminhtml/controllers/TagController.php index 6e74d191ad..40f9fb174a 100644 --- a/app/code/core/Mage/Adminhtml/controllers/TagController.php +++ b/app/code/core/Mage/Adminhtml/controllers/TagController.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/controllers/Tax/Class/CustomerController.php b/app/code/core/Mage/Adminhtml/controllers/Tax/Class/CustomerController.php index 8752a07e8b..f5944818ed 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Tax/Class/CustomerController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Tax/Class/CustomerController.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/controllers/Tax/Class/ProductController.php b/app/code/core/Mage/Adminhtml/controllers/Tax/Class/ProductController.php index 8368ba8935..f73e82276b 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Tax/Class/ProductController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Tax/Class/ProductController.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/controllers/Tax/ClassController.php b/app/code/core/Mage/Adminhtml/controllers/Tax/ClassController.php index 1dfd5fc50d..f91050ffdd 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Tax/ClassController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Tax/ClassController.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/controllers/Tax/RateController.php b/app/code/core/Mage/Adminhtml/controllers/Tax/RateController.php index 8f401b7660..9fc994432a 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Tax/RateController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Tax/RateController.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/controllers/Tax/RuleController.php b/app/code/core/Mage/Adminhtml/controllers/Tax/RuleController.php index b18620831a..075ce23f2b 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Tax/RuleController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Tax/RuleController.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/controllers/UrlrewriteController.php b/app/code/core/Mage/Adminhtml/controllers/UrlrewriteController.php index a079efe7c2..36a70e7620 100644 --- a/app/code/core/Mage/Adminhtml/controllers/UrlrewriteController.php +++ b/app/code/core/Mage/Adminhtml/controllers/UrlrewriteController.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Adminhtml/etc/config.xml b/app/code/core/Mage/Adminhtml/etc/config.xml index 9edb3211f3..8a3e17764c 100644 --- a/app/code/core/Mage/Adminhtml/etc/config.xml +++ b/app/code/core/Mage/Adminhtml/etc/config.xml @@ -13,6 +13,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Api/Controller/Action.php b/app/code/core/Mage/Api/Controller/Action.php index 8380147a56..8720b5694a 100644 --- a/app/code/core/Mage/Api/Controller/Action.php +++ b/app/code/core/Mage/Api/Controller/Action.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Api/Exception.php b/app/code/core/Mage/Api/Exception.php index 2b87c59d1b..0e6d306e5b 100644 --- a/app/code/core/Mage/Api/Exception.php +++ b/app/code/core/Mage/Api/Exception.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Api * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Api/Helper/Data.php b/app/code/core/Mage/Api/Helper/Data.php index ae037a2cd9..f1db5add47 100644 --- a/app/code/core/Mage/Api/Helper/Data.php +++ b/app/code/core/Mage/Api/Helper/Data.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Api * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Api/Model/Acl.php b/app/code/core/Mage/Api/Model/Acl.php index 3fc04788b7..a0bb4b701b 100644 --- a/app/code/core/Mage/Api/Model/Acl.php +++ b/app/code/core/Mage/Api/Model/Acl.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Api * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Api/Model/Acl/Assert/Ip.php b/app/code/core/Mage/Api/Model/Acl/Assert/Ip.php index db290df0fe..5546d3f04c 100644 --- a/app/code/core/Mage/Api/Model/Acl/Assert/Ip.php +++ b/app/code/core/Mage/Api/Model/Acl/Assert/Ip.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Api * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Api/Model/Acl/Assert/Time.php b/app/code/core/Mage/Api/Model/Acl/Assert/Time.php index 830d2bfb01..6f76640482 100644 --- a/app/code/core/Mage/Api/Model/Acl/Assert/Time.php +++ b/app/code/core/Mage/Api/Model/Acl/Assert/Time.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Api * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Api/Model/Acl/Resource.php b/app/code/core/Mage/Api/Model/Acl/Resource.php index f2a96f8e10..434ad186be 100644 --- a/app/code/core/Mage/Api/Model/Acl/Resource.php +++ b/app/code/core/Mage/Api/Model/Acl/Resource.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Api * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Api/Model/Acl/Role.php b/app/code/core/Mage/Api/Model/Acl/Role.php index 4c0fe88ae9..11466e9341 100644 --- a/app/code/core/Mage/Api/Model/Acl/Role.php +++ b/app/code/core/Mage/Api/Model/Acl/Role.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Api * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Api/Model/Acl/Role/Generic.php b/app/code/core/Mage/Api/Model/Acl/Role/Generic.php index 5d53269643..2907c20617 100644 --- a/app/code/core/Mage/Api/Model/Acl/Role/Generic.php +++ b/app/code/core/Mage/Api/Model/Acl/Role/Generic.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Api * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Api/Model/Acl/Role/Group.php b/app/code/core/Mage/Api/Model/Acl/Role/Group.php index 7462a3f0a4..fdc066c43d 100644 --- a/app/code/core/Mage/Api/Model/Acl/Role/Group.php +++ b/app/code/core/Mage/Api/Model/Acl/Role/Group.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Api * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Api/Model/Acl/Role/Registry.php b/app/code/core/Mage/Api/Model/Acl/Role/Registry.php index 9fbdb8d110..9db6eab80b 100644 --- a/app/code/core/Mage/Api/Model/Acl/Role/Registry.php +++ b/app/code/core/Mage/Api/Model/Acl/Role/Registry.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Api * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Api/Model/Acl/Role/User.php b/app/code/core/Mage/Api/Model/Acl/Role/User.php index 09beea1656..e590e04961 100644 --- a/app/code/core/Mage/Api/Model/Acl/Role/User.php +++ b/app/code/core/Mage/Api/Model/Acl/Role/User.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Api * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Api/Model/Config.php b/app/code/core/Mage/Api/Model/Config.php index f0ff1cfeb6..6a209ba26b 100644 --- a/app/code/core/Mage/Api/Model/Config.php +++ b/app/code/core/Mage/Api/Model/Config.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Api * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Api/Model/Mysql4/Acl.php b/app/code/core/Mage/Api/Model/Mysql4/Acl.php index ebdb0afc2d..1f1cc33d18 100644 --- a/app/code/core/Mage/Api/Model/Mysql4/Acl.php +++ b/app/code/core/Mage/Api/Model/Mysql4/Acl.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Api * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Api/Model/Mysql4/Acl/Role.php b/app/code/core/Mage/Api/Model/Mysql4/Acl/Role.php index 7f94b6d701..82eaec6c1c 100644 --- a/app/code/core/Mage/Api/Model/Mysql4/Acl/Role.php +++ b/app/code/core/Mage/Api/Model/Mysql4/Acl/Role.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Api * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Api/Model/Mysql4/Acl/Role/Collection.php b/app/code/core/Mage/Api/Model/Mysql4/Acl/Role/Collection.php index 11042e91e0..8918292481 100644 --- a/app/code/core/Mage/Api/Model/Mysql4/Acl/Role/Collection.php +++ b/app/code/core/Mage/Api/Model/Mysql4/Acl/Role/Collection.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Api * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Api/Model/Mysql4/Permissions/Collection.php b/app/code/core/Mage/Api/Model/Mysql4/Permissions/Collection.php index adbf32d3de..cb806956bd 100644 --- a/app/code/core/Mage/Api/Model/Mysql4/Permissions/Collection.php +++ b/app/code/core/Mage/Api/Model/Mysql4/Permissions/Collection.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Permissions * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Api/Model/Mysql4/Role.php b/app/code/core/Mage/Api/Model/Mysql4/Role.php index 65640d5bc1..bf9a62c1b1 100644 --- a/app/code/core/Mage/Api/Model/Mysql4/Role.php +++ b/app/code/core/Mage/Api/Model/Mysql4/Role.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Permissions * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Api/Model/Mysql4/Role/Collection.php b/app/code/core/Mage/Api/Model/Mysql4/Role/Collection.php index 902b9bd049..04000e1f76 100644 --- a/app/code/core/Mage/Api/Model/Mysql4/Role/Collection.php +++ b/app/code/core/Mage/Api/Model/Mysql4/Role/Collection.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Permissions * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Api/Model/Mysql4/Roles.php b/app/code/core/Mage/Api/Model/Mysql4/Roles.php index 231286e110..5e85f6d78d 100644 --- a/app/code/core/Mage/Api/Model/Mysql4/Roles.php +++ b/app/code/core/Mage/Api/Model/Mysql4/Roles.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Permissions * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Api/Model/Mysql4/Roles/Collection.php b/app/code/core/Mage/Api/Model/Mysql4/Roles/Collection.php index 37739a4047..7461e5c182 100644 --- a/app/code/core/Mage/Api/Model/Mysql4/Roles/Collection.php +++ b/app/code/core/Mage/Api/Model/Mysql4/Roles/Collection.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Permissions * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Api/Model/Mysql4/Roles/User/Collection.php b/app/code/core/Mage/Api/Model/Mysql4/Roles/User/Collection.php index 3e20b5a277..e9fb3af5d0 100644 --- a/app/code/core/Mage/Api/Model/Mysql4/Roles/User/Collection.php +++ b/app/code/core/Mage/Api/Model/Mysql4/Roles/User/Collection.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Permissions * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Api/Model/Mysql4/Rules.php b/app/code/core/Mage/Api/Model/Mysql4/Rules.php index 726d5fbfb9..f10719fc6b 100644 --- a/app/code/core/Mage/Api/Model/Mysql4/Rules.php +++ b/app/code/core/Mage/Api/Model/Mysql4/Rules.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Permissions * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Api/Model/Mysql4/Rules/Collection.php b/app/code/core/Mage/Api/Model/Mysql4/Rules/Collection.php index 993a54f344..9f372b4cce 100644 --- a/app/code/core/Mage/Api/Model/Mysql4/Rules/Collection.php +++ b/app/code/core/Mage/Api/Model/Mysql4/Rules/Collection.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Permissions * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Api/Model/Mysql4/User.php b/app/code/core/Mage/Api/Model/Mysql4/User.php index 289e7aa391..eb2ec63ce1 100644 --- a/app/code/core/Mage/Api/Model/Mysql4/User.php +++ b/app/code/core/Mage/Api/Model/Mysql4/User.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Api * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) @@ -48,7 +54,8 @@ public function recordLogin(Mage_Api_Model_User $user) { $data = array( 'logdate' => now(), - 'lognum' => $user->getLognum()+1 + 'lognum' => $user->getLognum()+1, + 'sessid' => $user->getSessid() ); $condition = $this->_getWriteAdapter()->quoteInto('user_id=?', $user->getUserId()); $this->_getWriteAdapter()->update($this->getTable('api/user'), $data, $condition); @@ -62,6 +69,13 @@ public function loadByUsername($username) return $this->_getReadAdapter()->fetchRow($select, array('username'=>$username)); } + public function loadBySessId ($sessId) + { + $select = $this->_getReadAdapter()->select()->from($this->getTable('api/user')) + ->where('sessid=:sessid'); + return $this->_getReadAdapter()->fetchRow($select, array('sessid'=>$sessId)); + } + public function hasAssigned2Role($user) { if (is_numeric($user)) { diff --git a/app/code/core/Mage/Api/Model/Mysql4/User/Collection.php b/app/code/core/Mage/Api/Model/Mysql4/User/Collection.php index 250acd2556..428bce70b5 100644 --- a/app/code/core/Mage/Api/Model/Mysql4/User/Collection.php +++ b/app/code/core/Mage/Api/Model/Mysql4/User/Collection.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Permissions * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Api/Model/Resource/Abstract.php b/app/code/core/Mage/Api/Model/Resource/Abstract.php index cd2a5878cd..900fcebb6d 100644 --- a/app/code/core/Mage/Api/Model/Resource/Abstract.php +++ b/app/code/core/Mage/Api/Model/Resource/Abstract.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Api * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Api/Model/Role.php b/app/code/core/Mage/Api/Model/Role.php index 5a78999c66..c9bce6c86d 100644 --- a/app/code/core/Mage/Api/Model/Role.php +++ b/app/code/core/Mage/Api/Model/Role.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Api * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Api/Model/Roles.php b/app/code/core/Mage/Api/Model/Roles.php index 680db7a443..6ab33b6ecb 100644 --- a/app/code/core/Mage/Api/Model/Roles.php +++ b/app/code/core/Mage/Api/Model/Roles.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Api * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Api/Model/Rules.php b/app/code/core/Mage/Api/Model/Rules.php index 91e465fb33..8c8a50c516 100644 --- a/app/code/core/Mage/Api/Model/Rules.php +++ b/app/code/core/Mage/Api/Model/Rules.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Api * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Api/Model/Server.php b/app/code/core/Mage/Api/Model/Server.php index a2056effb6..d4cbc1e15f 100644 --- a/app/code/core/Mage/Api/Model/Server.php +++ b/app/code/core/Mage/Api/Model/Server.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Api * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Api/Model/Server/Adapter/Interface.php b/app/code/core/Mage/Api/Model/Server/Adapter/Interface.php index a549177179..ba3834a354 100644 --- a/app/code/core/Mage/Api/Model/Server/Adapter/Interface.php +++ b/app/code/core/Mage/Api/Model/Server/Adapter/Interface.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Api * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Api/Model/Server/Adapter/Soap.php b/app/code/core/Mage/Api/Model/Server/Adapter/Soap.php index 0d6a11f9c5..4e1862aadb 100644 --- a/app/code/core/Mage/Api/Model/Server/Adapter/Soap.php +++ b/app/code/core/Mage/Api/Model/Server/Adapter/Soap.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Api * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) @@ -150,9 +156,9 @@ public function fault($code, $message) * @param none * @return boolean */ - protected function _extensionLoaded () + protected function _extensionLoaded() { - return class_exists('SoapServer'); + return class_exists('SoapServer', false); } } // Class Mage_Api_Model_Server_Adapter_Soap End \ No newline at end of file diff --git a/app/code/core/Mage/Api/Model/Server/Adapter/Xmlrpc.php b/app/code/core/Mage/Api/Model/Server/Adapter/Xmlrpc.php index fc72eb074a..5bae6c959d 100644 --- a/app/code/core/Mage/Api/Model/Server/Adapter/Xmlrpc.php +++ b/app/code/core/Mage/Api/Model/Server/Adapter/Xmlrpc.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Api * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Api/Model/Server/Handler.php b/app/code/core/Mage/Api/Model/Server/Handler.php index f1f2dc7bea..c7702c2760 100644 --- a/app/code/core/Mage/Api/Model/Server/Handler.php +++ b/app/code/core/Mage/Api/Model/Server/Handler.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Api * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Api/Model/Server/Handler/Abstract.php b/app/code/core/Mage/Api/Model/Server/Handler/Abstract.php index 912ef473e5..885e663e2e 100644 --- a/app/code/core/Mage/Api/Model/Server/Handler/Abstract.php +++ b/app/code/core/Mage/Api/Model/Server/Handler/Abstract.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Api * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) @@ -98,6 +104,17 @@ protected function _isAllowed($resource, $privilege=null) return $this->_getSession()->isAllowed($resource, $privilege); } + /** + * Check session expiration + * + * @param none + * @return boolean + */ + protected function _isSessionExpired () + { + return $this->_getSession()->isSessionExpired(); + } + /** * Dispatch webservice fault * @@ -200,6 +217,10 @@ public function call($sessionId, $apiPath, $args = array()) { $this->_startSession($sessionId); + if (!$this->_getSession()->isLoggedIn($sessionId)) { + return $this->_fault('session_expired'); + } + list($resourceName, $methodName) = explode('.', $apiPath); if (empty($resourceName) || empty($methodName)) { @@ -277,6 +298,11 @@ public function call($sessionId, $apiPath, $args = array()) public function multiCall($sessionId, array $calls = array(), $options = array()) { $this->_startSession($sessionId); + + if (!$this->_getSession()->isLoggedIn($sessionId)) { + return $this->_fault('session_expired'); + } + $result = array(); $resourcesAlias = $this->_getConfig()->getResourcesAlias(); diff --git a/app/code/core/Mage/Api/Model/Session.php b/app/code/core/Mage/Api/Model/Session.php index bd392f02b8..7caca1bc38 100644 --- a/app/code/core/Mage/Api/Model/Session.php +++ b/app/code/core/Mage/Api/Model/Session.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Api * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) @@ -47,7 +53,10 @@ public function login($username, $apiKey) return; } - $user = Mage::getModel('api/user')->login($username, $apiKey); + $user = Mage::getModel('api/user') + ->setSessid($this->getSessionId()) + ->login($username, $apiKey); + if ( $user->getId() && $user->getIsActive() != '1' ) { Mage::throwException(Mage::helper('api')->__('Your Account has been deactivated.')); } elseif (!Mage::getModel('api/user')->hasAssigned2Role($user->getId())) { @@ -111,8 +120,55 @@ public function isAllowed($resource, $privilege=null) return false; } - public function isLoggedIn() + /** + * Check session expiration + * + * @param none + * @return boolean + */ + public function isSessionExpired ($user) + { + if (!$user->getId()) { + return true; + } + $timeout = strtotime( now() ) - strtotime( $user->getLogdate() ); + return $timeout > Mage::getStoreConfig('api/config/session_timeout'); + } + + + public function isLoggedIn($sessId = false) + { + $userExists = $this->getUser() && $this->getUser()->getId(); + + if (!$userExists && $sessId !== false) { + return $this->_renewBySessId($sessId); + } + + if ($userExists) { + Mage::register('isSecureArea', true, true); + } + return $userExists; + } + + /** + * Renew user by session ID if session not expired + * + * @param string $sessId + * @return boolean + */ + protected function _renewBySessId ($sessId) { - return $this->getUser() && $this->getUser()->getId(); + $user = Mage::getModel('api/user')->loadBySessId($sessId); + if (!$user->getId() || !$user->getSessid()) { + return false; + } + if ($user->getSessid() == $sessId && !$this->isSessionExpired($user)) { + $this->setUser($user); + $this->setAcl(Mage::getResourceModel('api/acl')->loadAcl()); + $user->getResource()->recordLogin($user); + return true; + } + return false; } + } // Class Mage_Api_Model_Session End \ No newline at end of file diff --git a/app/code/core/Mage/Api/Model/User.php b/app/code/core/Mage/Api/Model/User.php index a3c52c7744..65042a3818 100644 --- a/app/code/core/Mage/Api/Model/User.php +++ b/app/code/core/Mage/Api/Model/User.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Api * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) @@ -155,7 +161,9 @@ public function authenticate($username, $apiKey) */ public function login($username, $apiKey) { + $sessId = $this->getSessid(); if ($this->authenticate($username, $apiKey)) { + $this->setSessid($sessId); $this->getResource()->recordLogin($this); } @@ -174,6 +182,12 @@ public function loadByUsername($username) return $this; } + public function loadBySessId ($sessId) + { + $this->setData($this->getResource()->loadBySessId($sessId)); + return $this; + } + public function hasAssigned2Role($user) { return $this->getResource()->hasAssigned2Role($user); diff --git a/app/code/core/Mage/Api/controllers/IndexController.php b/app/code/core/Mage/Api/controllers/IndexController.php index 84f13eae6e..55a52450c9 100644 --- a/app/code/core/Mage/Api/controllers/IndexController.php +++ b/app/code/core/Mage/Api/controllers/IndexController.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Api * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Api/controllers/SoapController.php b/app/code/core/Mage/Api/controllers/SoapController.php index 0c9c74493f..cc6e18568c 100644 --- a/app/code/core/Mage/Api/controllers/SoapController.php +++ b/app/code/core/Mage/Api/controllers/SoapController.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Api * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Api/controllers/XmlrpcController.php b/app/code/core/Mage/Api/controllers/XmlrpcController.php index 668ebb8083..191c2e52c7 100644 --- a/app/code/core/Mage/Api/controllers/XmlrpcController.php +++ b/app/code/core/Mage/Api/controllers/XmlrpcController.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Api * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Api/etc/api.xml b/app/code/core/Mage/Api/etc/api.xml index 4c2836d985..21bd83cdd6 100644 --- a/app/code/core/Mage/Api/etc/api.xml +++ b/app/code/core/Mage/Api/etc/api.xml @@ -13,6 +13,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Api * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) @@ -71,6 +77,10 @@ 4 Resource path is not callable. + + 5 + Session expired. Try to relogin. + diff --git a/app/code/core/Mage/Api/etc/config.xml b/app/code/core/Mage/Api/etc/config.xml index 27ce810276..0440fadd7e 100644 --- a/app/code/core/Mage/Api/etc/config.xml +++ b/app/code/core/Mage/Api/etc/config.xml @@ -13,6 +13,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Api * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) @@ -102,4 +108,41 @@ + + + + + + + + + + + Magento Core Api Section + + + + + + + + + + + + + + Mage_Api.csv + + + + + + + + + 3600 + + + \ No newline at end of file diff --git a/app/code/core/Mage/Api/etc/system.xml b/app/code/core/Mage/Api/etc/system.xml new file mode 100644 index 0000000000..1239e5a336 --- /dev/null +++ b/app/code/core/Mage/Api/etc/system.xml @@ -0,0 +1,60 @@ + + + + + + + service + text + 101 + 1 + 1 + 1 + + + + text + 1 + 1 + 1 + 1 + + + + text + 1 + 1 + 1 + 1 + + + + + + + \ No newline at end of file diff --git a/app/code/core/Mage/Api/sql/api_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/Api/sql/api_setup/mysql4-install-0.7.0.php index 6b6d349cbc..247502afd7 100644 --- a/app/code/core/Mage/Api/sql/api_setup/mysql4-install-0.7.0.php +++ b/app/code/core/Mage/Api/sql/api_setup/mysql4-install-0.7.0.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Admin * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Api/sql/api_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/Api/sql/api_setup/mysql4-upgrade-0.7.0-0.7.1.php new file mode 100644 index 0000000000..0e474860c8 --- /dev/null +++ b/app/code/core/Mage/Api/sql/api_setup/mysql4-upgrade-0.7.0-0.7.1.php @@ -0,0 +1,40 @@ + + */ + +$installer = $this; +/* @var $installer Mage_Core_Model_Resource_Setup */ + +$installer->startSetup(); +$installer->run("ALTER TABLE {$this->getTable('api_user')} ADD `sessid` VARCHAR(40) NOT NULL AFTER `lognum`;"); +$installer->endSetup(); \ No newline at end of file diff --git a/app/code/core/Mage/Backup/Exception.php b/app/code/core/Mage/Backup/Exception.php index 19c1c544cb..ceb4dc5c42 100644 --- a/app/code/core/Mage/Backup/Exception.php +++ b/app/code/core/Mage/Backup/Exception.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Backup * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Backup/Helper/Data.php b/app/code/core/Mage/Backup/Helper/Data.php index 082f3353de..3de538ce15 100644 --- a/app/code/core/Mage/Backup/Helper/Data.php +++ b/app/code/core/Mage/Backup/Helper/Data.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Backup * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Backup/Model/Backup.php b/app/code/core/Mage/Backup/Model/Backup.php index 35d313d9c1..46979e10fe 100644 --- a/app/code/core/Mage/Backup/Model/Backup.php +++ b/app/code/core/Mage/Backup/Model/Backup.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Backup * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Backup/Model/Db.php b/app/code/core/Mage/Backup/Model/Db.php index f15758734c..3758747531 100644 --- a/app/code/core/Mage/Backup/Model/Db.php +++ b/app/code/core/Mage/Backup/Model/Db.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Backup * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Backup/Model/Fs/Collection.php b/app/code/core/Mage/Backup/Model/Fs/Collection.php index 2df0657fad..47a76c2db3 100644 --- a/app/code/core/Mage/Backup/Model/Fs/Collection.php +++ b/app/code/core/Mage/Backup/Model/Fs/Collection.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Backup * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Backup/Model/Media.php b/app/code/core/Mage/Backup/Model/Media.php index 45733bea3c..aebe3c3e66 100644 --- a/app/code/core/Mage/Backup/Model/Media.php +++ b/app/code/core/Mage/Backup/Model/Media.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Backup * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Backup/Model/Mysql4/Db.php b/app/code/core/Mage/Backup/Model/Mysql4/Db.php index ca64863ed3..643ac06e5c 100644 --- a/app/code/core/Mage/Backup/Model/Mysql4/Db.php +++ b/app/code/core/Mage/Backup/Model/Mysql4/Db.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Backup * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Backup/Model/View.php b/app/code/core/Mage/Backup/Model/View.php index 45733bea3c..aebe3c3e66 100644 --- a/app/code/core/Mage/Backup/Model/View.php +++ b/app/code/core/Mage/Backup/Model/View.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Backup * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Backup/etc/config.xml b/app/code/core/Mage/Backup/etc/config.xml index 8145a08e93..5fd39054de 100644 --- a/app/code/core/Mage/Backup/etc/config.xml +++ b/app/code/core/Mage/Backup/etc/config.xml @@ -13,6 +13,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Backup * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes.php index 0672666059..fe60d7f626 100644 --- a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes.php +++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Bundle * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Extend.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Extend.php index 56164294ea..e0607b0b9a 100644 --- a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Extend.php +++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Extend.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Bundle * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Special.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Special.php index 3d0c7ff0e6..0d70d32061 100644 --- a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Special.php +++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Special.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Bundle * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle.php index 00c7fbfbc6..03eade12f7 100644 --- a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle.php +++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Bundle * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php index 174e326001..269751ddf2 100644 --- a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php +++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Bundle * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search.php index a26ea08fa3..ee6f8b01fb 100644 --- a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search.php +++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Bundle * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search/Grid.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search/Grid.php index ce2cdb97b5..ced3a492c3 100644 --- a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search/Grid.php +++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search/Grid.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Bundle * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Selection.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Selection.php index 4ec65346c7..9df4f12bf2 100644 --- a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Selection.php +++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Selection.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Bundle * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tabs.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tabs.php index 9259a54631..d90a97d05b 100644 --- a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tabs.php +++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tabs.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Bundle * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Sales/Order/Items/Renderer.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Sales/Order/Items/Renderer.php index 7dc0f8c618..5c824621b7 100644 --- a/app/code/core/Mage/Bundle/Block/Adminhtml/Sales/Order/Items/Renderer.php +++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Sales/Order/Items/Renderer.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Bundle * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Sales/Order/View/Items/Renderer.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Sales/Order/View/Items/Renderer.php index 139db18b48..f50cbd3bd2 100644 --- a/app/code/core/Mage/Bundle/Block/Adminhtml/Sales/Order/View/Items/Renderer.php +++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Sales/Order/View/Items/Renderer.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Bundle * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Bundle/Block/Catalog/Product/List/Partof.php b/app/code/core/Mage/Bundle/Block/Catalog/Product/List/Partof.php index 0d1c507d1e..832408117f 100644 --- a/app/code/core/Mage/Bundle/Block/Catalog/Product/List/Partof.php +++ b/app/code/core/Mage/Bundle/Block/Catalog/Product/List/Partof.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Bundle * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Bundle/Block/Catalog/Product/Price.php b/app/code/core/Mage/Bundle/Block/Catalog/Product/Price.php index 635c529563..b3a81433c7 100644 --- a/app/code/core/Mage/Bundle/Block/Catalog/Product/Price.php +++ b/app/code/core/Mage/Bundle/Block/Catalog/Product/Price.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Bundle * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Bundle/Block/Catalog/Product/View.php b/app/code/core/Mage/Bundle/Block/Catalog/Product/View.php index 6ee40b49f6..621a5ef0cc 100644 --- a/app/code/core/Mage/Bundle/Block/Catalog/Product/View.php +++ b/app/code/core/Mage/Bundle/Block/Catalog/Product/View.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Bundle * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle.php b/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle.php index bfcaa13ddc..d15277a586 100644 --- a/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle.php +++ b/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Bundle * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php b/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php index fe55b5050e..99740b57e3 100644 --- a/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php +++ b/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Bundle * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Checkbox.php b/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Checkbox.php index 3ca0056c95..8228a832e6 100644 --- a/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Checkbox.php +++ b/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Checkbox.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Bundle * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Multi.php b/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Multi.php index e882c08d16..d9dad59ab8 100644 --- a/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Multi.php +++ b/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Multi.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Bundle * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Radio.php b/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Radio.php index 2eb9015d0f..2b6616949a 100644 --- a/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Radio.php +++ b/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Radio.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Bundle * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Select.php b/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Select.php index 43ad2f76a8..fde3a75df0 100644 --- a/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Select.php +++ b/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Select.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Bundle * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Bundle/Block/Checkout/Cart/Item/Renderer.php b/app/code/core/Mage/Bundle/Block/Checkout/Cart/Item/Renderer.php index 69dc9c41cd..18c7a985a8 100644 --- a/app/code/core/Mage/Bundle/Block/Checkout/Cart/Item/Renderer.php +++ b/app/code/core/Mage/Bundle/Block/Checkout/Cart/Item/Renderer.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Bundle * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Bundle/Block/Sales/Order/Items/Renderer.php b/app/code/core/Mage/Bundle/Block/Sales/Order/Items/Renderer.php index 559356a031..7d3290fb27 100644 --- a/app/code/core/Mage/Bundle/Block/Sales/Order/Items/Renderer.php +++ b/app/code/core/Mage/Bundle/Block/Sales/Order/Items/Renderer.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Bundle * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Bundle/Helper/Data.php b/app/code/core/Mage/Bundle/Helper/Data.php index 70c5810901..b7df61265c 100644 --- a/app/code/core/Mage/Bundle/Helper/Data.php +++ b/app/code/core/Mage/Bundle/Helper/Data.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Bundle * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Bundle/Model/CatalogIndex/Data/Bundle.php b/app/code/core/Mage/Bundle/Model/CatalogIndex/Data/Bundle.php index 9aa73dcc93..b1c0580427 100644 --- a/app/code/core/Mage/Bundle/Model/CatalogIndex/Data/Bundle.php +++ b/app/code/core/Mage/Bundle/Model/CatalogIndex/Data/Bundle.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Bundle * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Bundle/Model/Mysql4/Bundle.php b/app/code/core/Mage/Bundle/Model/Mysql4/Bundle.php index 0b86544e53..7d132b57bf 100644 --- a/app/code/core/Mage/Bundle/Model/Mysql4/Bundle.php +++ b/app/code/core/Mage/Bundle/Model/Mysql4/Bundle.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Bundle * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Bundle/Model/Mysql4/Option.php b/app/code/core/Mage/Bundle/Model/Mysql4/Option.php index ba1abc6599..8e71512a5b 100644 --- a/app/code/core/Mage/Bundle/Model/Mysql4/Option.php +++ b/app/code/core/Mage/Bundle/Model/Mysql4/Option.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Bundle * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Bundle/Model/Mysql4/Option/Collection.php b/app/code/core/Mage/Bundle/Model/Mysql4/Option/Collection.php index 3abe9d6e60..ee0c4906f8 100644 --- a/app/code/core/Mage/Bundle/Model/Mysql4/Option/Collection.php +++ b/app/code/core/Mage/Bundle/Model/Mysql4/Option/Collection.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Bundle * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Bundle/Model/Mysql4/Selection.php b/app/code/core/Mage/Bundle/Model/Mysql4/Selection.php index 9993a76284..0d9d12802a 100644 --- a/app/code/core/Mage/Bundle/Model/Mysql4/Selection.php +++ b/app/code/core/Mage/Bundle/Model/Mysql4/Selection.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Bundle * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) @@ -61,4 +67,28 @@ protected function _afterDelete(Mage_Core_Model_Abstract $object) return $this; } */ + + public function getPriceFromIndex($productId, $qty, $storeId, $groupId) { + $select = clone $this->_getReadAdapter()->select(); + $select->reset(); + + $attrPriceId = Mage::getSingleton('eav/entity_attribute')->getIdByCode('catalog_product', 'price'); + $attrTierPriceId = Mage::getSingleton('eav/entity_attribute')->getIdByCode('catalog_product', 'tier_price'); + + $select->from(array("price_index" => $this->getTable('catalogindex/price')), array('price' => 'SUM(value)')) + ->where('entity_id in (?)', $productId) + ->where('store_id = ?', $storeId) + ->where('customer_group_id = ?', $groupId) + ->where('attribute_id in (?)', array($attrPriceId, $attrTierPriceId)) + ->where('qty <= ?', $qty) + ->group('entity_id'); + + $price = $this->_getReadAdapter()->fetchCol($select); + if (!empty($price)) { + return array_shift($price); + } else { + return 0; + } + } + } \ No newline at end of file diff --git a/app/code/core/Mage/Bundle/Model/Mysql4/Selection/Collection.php b/app/code/core/Mage/Bundle/Model/Mysql4/Selection/Collection.php index ab9160aa21..d26cfb3ffc 100644 --- a/app/code/core/Mage/Bundle/Model/Mysql4/Selection/Collection.php +++ b/app/code/core/Mage/Bundle/Model/Mysql4/Selection/Collection.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Bundle * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Bundle/Model/Observer.php b/app/code/core/Mage/Bundle/Model/Observer.php index 3d3b2cc797..5a900e77c3 100644 --- a/app/code/core/Mage/Bundle/Model/Observer.php +++ b/app/code/core/Mage/Bundle/Model/Observer.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Bundle * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Bundle/Model/Option.php b/app/code/core/Mage/Bundle/Model/Option.php index 363234ff7d..4de56805bb 100644 --- a/app/code/core/Mage/Bundle/Model/Option.php +++ b/app/code/core/Mage/Bundle/Model/Option.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Bundle * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Bundle/Model/Product/Attribute/Source/Price/View.php b/app/code/core/Mage/Bundle/Model/Product/Attribute/Source/Price/View.php index d693c6c770..44b717fd4c 100644 --- a/app/code/core/Mage/Bundle/Model/Product/Attribute/Source/Price/View.php +++ b/app/code/core/Mage/Bundle/Model/Product/Attribute/Source/Price/View.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Bundle * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Bundle/Model/Product/Price.php b/app/code/core/Mage/Bundle/Model/Product/Price.php index f06d5e92fa..b374c4dddb 100644 --- a/app/code/core/Mage/Bundle/Model/Product/Price.php +++ b/app/code/core/Mage/Bundle/Model/Product/Price.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Bundle * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) @@ -401,6 +407,7 @@ protected function _applySpecialPrice($product, $finalPrice) public static function calculatePrice($basePrice, $specialPrice, $specialPriceFrom, $specialPriceTo, $rulePrice = false, $wId = null, $gId = null, $productId = null) { $resource = Mage::getResourceSingleton('bundle/bundle'); + $selectionResource = Mage::getResourceSingleton('bundle/selection'); $productPriceTypeId = Mage::getSingleton('eav/entity_attribute')->getIdByCode('catalog_product', 'price_type'); if ($wId instanceof Mage_Core_Model_Store) { $store = $wId->getId(); @@ -411,24 +418,28 @@ public static function calculatePrice($basePrice, $specialPrice, $specialPriceFr if (!$gId) { $gId = Mage::getSingleton('customer/session')->getCustomerGroupId(); + } else if ($gId instanceof Mage_Customer_Model_Group) { + $gId = $gId->getId(); } - $attributes = $resource->getAttributeData($productId, $productPriceTypeId, $store); + if (!isset(self::$attributeCache[$productId]['price_type'])) { + $attributes = $resource->getAttributeData($productId, $productPriceTypeId, $store); + self::$attributeCache[$productId]['price_type'] = $attributes; + } else { + $attributes = self::$attributeCache[$productId]['price_type']; + } $options = array(0); - $results = $resource->getSelectionsData($productId); if (!$attributes[0]['value']) { //dynamic $dataRetreiver = Mage::getSingleton('catalogindex/data_simple'); - $childIds = array(); + $childrenQty = array(); foreach ($results as $key => $result) { if (!$result['product_id']) { continue; } - $results[$key]['final_price'] = $dataRetreiver->getFinalPrice($result['product_id'], $wId, $gId); - $tiers = $resource->getTierPrices($result['product_id'], $wId->getWebsiteId()); if ($result['selection_can_change_qty'] && $result['type'] != 'multi' && $result['type'] != 'checkbox') { $qty = 1; @@ -436,56 +447,7 @@ public static function calculatePrice($basePrice, $specialPrice, $specialPriceFr $qty = $result['selection_qty']; } - $allGroups = Mage_Customer_Model_Group::CUST_GROUP_ALL; - - $prevQty = 1; - $prevPrice = $results[$key]['final_price']; - $prevGroup = $allGroups; - - foreach ($tiers as $tier) { - - if (!is_numeric($gId)) { - $_gId = $gId->getId(); - } else { - $_gId = $gId; - } - - if ($tier['customer_group_id'] != $_gId && $tier['all_groups']!=1) { - // tier not for current customer group nor is for all groups - continue; - } - - if ($qty < $tier['qty']) { - // tier is higher than product qty - continue; - } - - if ($tier['qty'] < $prevQty) { - // higher tier qty already found - continue; - } - - if ($tier['qty'] == $prevQty && $prevGroup != $allGroups && $tier['all_groups'] == 1) { - // found tier qty is same as current tier qty but current tier group is ALL_GROUPS - continue; - } - - $prevPrice = $tier['value']; - $prevQty = $tier['qty']; - $prevGroup = $tier['customer_group_id']; - } - $results[$key]['final_price'] = $prevPrice; - } - - foreach ($results as $result) { - if (!$result['product_id']) { - continue; - } - if ($result['selection_can_change_qty'] && $result['type'] != 'multi' && $result['type'] != 'checkbox') { - $qty = 1; - } else { - $qty = $result['selection_qty']; - } + $result['final_price'] = $selectionResource->getPriceFromIndex($result['product_id'], $qty, $store, $gId); $selectionPrice = $result['final_price']*$qty; @@ -495,9 +457,7 @@ public static function calculatePrice($basePrice, $specialPrice, $specialPriceFr $options[$result['option_id']] = $selectionPrice; } } - $basePrice = array_sum($options); - } else { //fixed foreach ($results as $result) { if (!$result['product_id']) { diff --git a/app/code/core/Mage/Bundle/Model/Product/Type.php b/app/code/core/Mage/Bundle/Model/Product/Type.php index 9f0422d2e5..265aa1ae73 100644 --- a/app/code/core/Mage/Bundle/Model/Product/Type.php +++ b/app/code/core/Mage/Bundle/Model/Product/Type.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Bundle * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) @@ -327,11 +333,14 @@ public function prepareForCart(Varien_Object $buyRequest) return Mage::helper('bundle')->__('Please select options for product.'); } - $optionsCollection = $this->getOptionsByIds($optionIds); - - foreach ($optionsCollection->getItems() as $option) { - if ($option->getRequired() && !isset($options[$option->getId()])) { - return Mage::helper('bundle')->__('Required options not selected.'); + //$optionsCollection = $this->getOptionsByIds($optionIds); + $product->getTypeInstance()->setStoreFilter($product->getStoreId()); + $optionsCollection = $this->getOptionsCollection(); + if (!$this->getProduct()->getSkipCheckRequiredOption()) { + foreach ($optionsCollection->getItems() as $option) { + if ($option->getRequired() && !isset($options[$option->getId()])) { + return Mage::helper('bundle')->__('Required options not selected.'); + } } } $selectionIds = array(); diff --git a/app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Abstract.php b/app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Abstract.php index e75770bb09..28a895a237 100644 --- a/app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Abstract.php +++ b/app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Abstract.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Bundle * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Creditmemo.php b/app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Creditmemo.php index f7c3456b65..336245725e 100644 --- a/app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Creditmemo.php +++ b/app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Creditmemo.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) @@ -38,58 +44,79 @@ public function draw() $items = $this->getChilds($item); $_prevOptionId = ''; $shift = array(0, 0, 0); + $leftBound = 35; + $rightBound = 565; + $size = 7; foreach ($items as $_item) { $this->_setFontRegular(); - $attributes = $this->getSelectionAttributes($_item); + $x = $leftBound; + // draw selection attributes if ($_item->getOrderItem()->getParentItem()) { + $attributes = $this->getSelectionAttributes($_item); if ($_prevOptionId != $attributes['option_id']) { $this->_setfontItalic(); - $page->drawText($attributes['option_label'], 60, $pdf->y, 'UTF-8'); + $page->drawText($attributes['option_label'], $x, $pdf->y, 'UTF-8'); $this->_setFontRegular(); $_prevOptionId = $attributes['option_id']; $pdf->y -= 10; } } - if ($this->canShowPriceInfo($_item)) { - $page->drawText($_item->getQty()*1, 35, $pdf->y, 'UTF-8'); - } - - + // draw product titles if ($_item->getOrderItem()->getParentItem()) { - $feed = 65; + $feed = $x + 5; $name = $this->getValueHtml($_item); } else { - $feed = 60; + $feed = $x; $name = $_item->getName(); } foreach (Mage::helper('core/string')->str_split($name, 60, true, true) as $key => $part) { - $page->drawText($part, $feed, $pdf->y-$shift[0], 'UTF-8'); + $page->drawText($part, $feed, $pdf->y - $shift[0], 'UTF-8'); if ($key > 0) { $shift[0] += 10; } } + $x += 220; + // draw SKUs $shift[2] = 0; - foreach (Mage::helper('core/string')->str_split($item->getSku(), 30) as $key => $part) { - $page->drawText($part, 265, $pdf->y-$shift[2], 'UTF-8'); - if ($key > 0) { - $shift[2] += 10; + if (!$_item->getOrderItem()->getParentItem()) { + foreach (Mage::helper('core/string')->str_split($item->getSku(), 30) as $key => $part) { + if ($key > 0) { + $shift[2] += 10; + } + $page->drawText($part, $x, $pdf->y - $shift[2], 'UTF-8'); } } - $font = $this->_setFontBold(); - //$page->setFont($font); + $x += 100; + $font = $this->_setFontBold(); if ($this->canShowPriceInfo($_item)) { - $page->drawText($order->formatPriceTxt($_item->getTaxAmount()), 380, $pdf->y, 'UTF-8'); - $page->drawText($order->formatPriceTxt(-$_item->getDiscountAmount()), 430, $pdf->y, 'UTF-8'); - $page->drawText($order->formatPriceTxt($_item->getRowTotal()), 480, $pdf->y, 'UTF-8'); - - $row_total = $order->formatPriceTxt($_item->getRowTotal()+$_item->getTaxAmount()-$_item->getDiscountAmount()); - - $page->drawText($row_total, 565-$pdf->widthForStringUsingFontSize($row_total, $font, 7), $pdf->y, 'UTF-8'); + // draw Total(ex) + $text = $order->formatPriceTxt($_item->getRowTotal()); + $page->drawText($text, $pdf->getAlignRight($text, $x, 50, $font, $size), $pdf->y, 'UTF-8'); + $x += 50; + + // draw Discount + $text = $order->formatPriceTxt(-$_item->getDiscountAmount()); + $page->drawText($text, $pdf->getAlignRight($text, $x, 50, $font, $size), $pdf->y, 'UTF-8'); + $x += 50; + + // draw QTY + $text = $_item->getQty() * 1; + $page->drawText($text, $pdf->getAlignCenter($text, $x, 30, $font, $size), $pdf->y, 'UTF-8'); + $x += 30; + + // draw Tax + $text = $order->formatPriceTxt($_item->getTaxAmount()); + $page->drawText($text, $pdf->getAlignRight($text, $x, 45, $font, $size, 10), $pdf->y, 'UTF-8'); + $x += 45; + + // draw Total(inc) + $text = $order->formatPriceTxt($_item->getRowTotal()+$_item->getTaxAmount()-$_item->getDiscountAmount()); + $page->drawText($text, 565-$pdf->widthForStringUsingFontSize($text, $font, 7), $pdf->y, 'UTF-8'); } $pdf->y -=max($shift)+10; @@ -97,13 +124,12 @@ public function draw() if ($item->getOrderItem()->getProductOptions() || $item->getOrderItem()->getDescription()) { $this->_setFontRegular(); - $shift[1] = 10; $options = $item->getOrderItem()->getProductOptions(); if (isset($options['options'])) { foreach ($options['options'] as $option) { $this->_setFontItalic(); - foreach (Mage::helper('core/string')->str_split(strip_tags($option['label']), 60,false,true) as $_option) { - $page->drawText($_option, 60, $pdf->y-$shift[1], 'UTF-8'); + foreach (Mage::helper('core/string')->str_split(strip_tags($option['label']), 60, false, true) as $_option) { + $page->drawText($_option, $leftBound, $pdf->y-$shift[1], 'UTF-8'); $shift[1] += 10; } $this->_setFontRegular(); @@ -111,7 +137,7 @@ public function draw() $values = explode(', ', strip_tags($option['value'])); foreach ($values as $value) { foreach (Mage::helper('core/string')->str_split($value, 50,true,true) as $_value) { - $page->drawText($_value, 65, $pdf->y-$shift[1], 'UTF-8'); + $page->drawText($_value, $leftBound + 5, $pdf->y-$shift[1], 'UTF-8'); $shift[1] += 10; } } @@ -120,8 +146,8 @@ public function draw() } foreach ($this->_parseDescription() as $description){ - $page->drawText(strip_tags($description), 65, $pdf->y-$shift{1}, 'UTF-8'); - $shift{1} += 10; + $page->drawText(strip_tags($description), $leftBound + 5, $pdf->y-$shift{1}, 'UTF-8'); + $shift[1] += 10; } $pdf->y -= max($shift)+10; diff --git a/app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Invoice.php b/app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Invoice.php index bc317dea50..69c10aa204 100644 --- a/app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Invoice.php +++ b/app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Invoice.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) @@ -38,6 +44,13 @@ public function draw() $this->_setFontRegular(); $items = $this->getChilds($item); +// $page->drawText(Mage::helper('sales')->__('Product'), 35, $this->y, 'UTF-8'); +// $page->drawText(Mage::helper('sales')->__('SKU'), 240, $this->y, 'UTF-8'); +// $page->drawText(Mage::helper('sales')->__('Price'), 380, $this->y, 'UTF-8'); +// $page->drawText(Mage::helper('sales')->__('QTY'), 430, $this->y, 'UTF-8'); +// $page->drawText(Mage::helper('sales')->__('Tax'), 480, $this->y, 'UTF-8'); +// $page->drawText(Mage::helper('sales')->__('Subtotal'), 535, $this->y, 'UTF-8'); + $_prevOptionId = ''; foreach ($items as $_item) { @@ -48,23 +61,19 @@ public function draw() if ($_item->getOrderItem()->getParentItem()) { if ($_prevOptionId != $attributes['option_id']) { $this->_setFontItalic(); - $page->drawText($attributes['option_label'], 60, $pdf->y, 'UTF-8'); + $page->drawText($attributes['option_label'], 35, $pdf->y, 'UTF-8'); $this->_setFontRegular(); $_prevOptionId = $attributes['option_id']; $pdf->y -= 10; } } - if ($this->canShowPriceInfo($_item)) { - $page->drawText($_item->getQty()*1, 35, $pdf->y, 'UTF-8'); - } - /* in case Product name is longer than 80 chars - it is written in a few lines */ if ($_item->getOrderItem()->getParentItem()) { - $feed = 65; + $feed = 40; $name = $this->getValueHtml($_item); } else { - $feed = 60; + $feed = 35; $name = $_item->getName(); } foreach (Mage::helper('core/string')->str_split($name, 60, true, true) as $key => $part) { @@ -74,40 +83,52 @@ public function draw() } } - /* in case Product SKU is longer than 36 chars - it is written in a few lines */ - foreach (Mage::helper('core/string')->str_split($item->getSku(), 30) as $key => $part) { - $page->drawText($part, 380, $pdf->y-$shift[2], 'UTF-8'); - if ($key > 0) { - $shift[2] += 10; + + // draw SKUs + if (!$_item->getOrderItem()->getParentItem()) { + foreach (Mage::helper('core/string')->str_split($item->getSku(), 30) as $key => $part) { + if ($key > 0) { + $shift[2] += 10; + } + $page->drawText($part, 240, $pdf->y-$shift[2], 'UTF-8'); } } + // draw prices if ($this->canShowPriceInfo($_item)) { $font = $this->_setFontBold(); - $row_total = $order->formatPriceTxt($_item->getRowTotal()); + $price = $order->formatPriceTxt($_item->getPrice()); + $page->drawText($price, 395-$pdf->widthForStringUsingFontSize($price, $font, 7), $pdf->y, 'UTF-8'); + + $page->drawText($_item->getQty()*1, 435, $pdf->y, 'UTF-8'); + + $tax = $order->formatPriceTxt($_item->getTaxAmount()); + $page->drawText($tax, 495-$pdf->widthForStringUsingFontSize($tax, $font, 7), $pdf->y, 'UTF-8'); + + $row_total = $order->formatPriceTxt($_item->getRowTotal()); $page->drawText($row_total, 565-$pdf->widthForStringUsingFontSize($row_total, $font, 7), $pdf->y, 'UTF-8'); + $this->_setFontRegular(); } $pdf->y -= max($shift)+10; } if ($item->getOrderItem()->getProductOptions() || $item->getOrderItem()->getDescription()) { - $shift{1} = 10; $options = $item->getOrderItem()->getProductOptions(); if (isset($options['options'])) { foreach ($options['options'] as $option) { $this->_setFontItalic(); - foreach (Mage::helper('core/string')->str_split(strip_tags($option['label']), 60,false,true) as $_option) { - $page->drawText($_option, 60, $pdf->y-$shift[1], 'UTF-8'); + foreach (Mage::helper('core/string')->str_split(strip_tags($option['label']), 60,false, true) as $_option) { + $page->drawText($_option, 35, $pdf->y-$shift[1], 'UTF-8'); $shift[1] += 10; } $this->_setFontRegular(); if ($option['value']) { $values = explode(', ', strip_tags($option['value'])); foreach ($values as $value) { - foreach (Mage::helper('core/string')->str_split($value, 70,true,true) as $_value) { - $page->drawText($_value, 65, $pdf->y-$shift[1], 'UTF-8'); + foreach (Mage::helper('core/string')->str_split($value, 70, true, true) as $_value) { + $page->drawText($_value, 40, $pdf->y-$shift[1], 'UTF-8'); $shift[1] += 10; } } diff --git a/app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Shipment.php b/app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Shipment.php index b6a864082c..2d3d714608 100644 --- a/app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Shipment.php +++ b/app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Shipment.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Bundle * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) @@ -86,10 +92,10 @@ public function draw() } foreach (Mage::helper('core/string')->str_split($item->getSku(), 30) as $key => $part) { - $page->drawText($part, 440, $pdf->y-$shift[2], 'UTF-8'); if ($key > 0) { $shift[2] += 10; } + $page->drawText($part, 440, $pdf->y-$shift[2], 'UTF-8'); } $pdf->y -=max($shift)+10; diff --git a/app/code/core/Mage/Bundle/Model/Selection.php b/app/code/core/Mage/Bundle/Model/Selection.php index b9fb9d77d4..5437b2441e 100644 --- a/app/code/core/Mage/Bundle/Model/Selection.php +++ b/app/code/core/Mage/Bundle/Model/Selection.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Bundle * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Bundle/Model/Source/Option/Selection/Price/Type.php b/app/code/core/Mage/Bundle/Model/Source/Option/Selection/Price/Type.php index 9d1ffeefbf..81c3a4709b 100644 --- a/app/code/core/Mage/Bundle/Model/Source/Option/Selection/Price/Type.php +++ b/app/code/core/Mage/Bundle/Model/Source/Option/Selection/Price/Type.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Bundle * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Bundle/Model/Source/Option/Type.php b/app/code/core/Mage/Bundle/Model/Source/Option/Type.php index d34741d72d..21bc2f5d25 100644 --- a/app/code/core/Mage/Bundle/Model/Source/Option/Type.php +++ b/app/code/core/Mage/Bundle/Model/Source/Option/Type.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Bundle * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Bundle/controllers/SelectionController.php b/app/code/core/Mage/Bundle/controllers/SelectionController.php index 5bf7739dc8..39bccfc101 100644 --- a/app/code/core/Mage/Bundle/controllers/SelectionController.php +++ b/app/code/core/Mage/Bundle/controllers/SelectionController.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Bundle * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Bundle/etc/config.xml b/app/code/core/Mage/Bundle/etc/config.xml index 12d73157ff..956141bde1 100644 --- a/app/code/core/Mage/Bundle/etc/config.xml +++ b/app/code/core/Mage/Bundle/etc/config.xml @@ -13,6 +13,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Bundle * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-install-0.1.0.php b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-install-0.1.0.php index f431fc2030..c5fbde2262 100644 --- a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-install-0.1.0.php +++ b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-install-0.1.0.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Bundle * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.0-0.1.1.php b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.0-0.1.1.php index 890b168dbe..365b00e198 100644 --- a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.0-0.1.1.php +++ b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.0-0.1.1.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Bundle * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.1-0.1.2.php b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.1-0.1.2.php index f7ef4a5e1c..3f72fb97ad 100644 --- a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.1-0.1.2.php +++ b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.1-0.1.2.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Bundle * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.2-0.1.3.php b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.2-0.1.3.php index 0871c65d16..5039e35920 100644 --- a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.2-0.1.3.php +++ b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.2-0.1.3.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Bundle * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.3-0.1.4.php b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.3-0.1.4.php index a41a3b1e5f..8ff167141c 100644 --- a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.3-0.1.4.php +++ b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.3-0.1.4.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Bundle * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Catalog/Block/Breadcrumbs.php b/app/code/core/Mage/Catalog/Block/Breadcrumbs.php index 278a901e38..6d907465d2 100644 --- a/app/code/core/Mage/Catalog/Block/Breadcrumbs.php +++ b/app/code/core/Mage/Catalog/Block/Breadcrumbs.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Checkout * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Catalog/Block/Category/View.php b/app/code/core/Mage/Catalog/Block/Category/View.php index 361fc1eafd..47dd7c0bd0 100644 --- a/app/code/core/Mage/Catalog/Block/Category/View.php +++ b/app/code/core/Mage/Catalog/Block/Category/View.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Catalog/Block/Layer/Filter/Abstract.php b/app/code/core/Mage/Catalog/Block/Layer/Filter/Abstract.php index fc735cb49b..b21ebdfb8f 100644 --- a/app/code/core/Mage/Catalog/Block/Layer/Filter/Abstract.php +++ b/app/code/core/Mage/Catalog/Block/Layer/Filter/Abstract.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Catalog/Block/Layer/Filter/Attribute.php b/app/code/core/Mage/Catalog/Block/Layer/Filter/Attribute.php index b475a4e898..a97886f9e8 100644 --- a/app/code/core/Mage/Catalog/Block/Layer/Filter/Attribute.php +++ b/app/code/core/Mage/Catalog/Block/Layer/Filter/Attribute.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Catalog/Block/Layer/Filter/Category.php b/app/code/core/Mage/Catalog/Block/Layer/Filter/Category.php index f6c85cd52b..468cbadb9a 100644 --- a/app/code/core/Mage/Catalog/Block/Layer/Filter/Category.php +++ b/app/code/core/Mage/Catalog/Block/Layer/Filter/Category.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Catalog/Block/Layer/Filter/Price.php b/app/code/core/Mage/Catalog/Block/Layer/Filter/Price.php index c32dd2e76f..3b80c43b89 100644 --- a/app/code/core/Mage/Catalog/Block/Layer/Filter/Price.php +++ b/app/code/core/Mage/Catalog/Block/Layer/Filter/Price.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Catalog/Block/Layer/State.php b/app/code/core/Mage/Catalog/Block/Layer/State.php index d693ce3c97..29aba744c6 100644 --- a/app/code/core/Mage/Catalog/Block/Layer/State.php +++ b/app/code/core/Mage/Catalog/Block/Layer/State.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Catalog/Block/Layer/View.php b/app/code/core/Mage/Catalog/Block/Layer/View.php index 4cb3968bbf..20e37295c8 100644 --- a/app/code/core/Mage/Catalog/Block/Layer/View.php +++ b/app/code/core/Mage/Catalog/Block/Layer/View.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Catalog/Block/Navigation.php b/app/code/core/Mage/Catalog/Block/Navigation.php index 8594ed2c6a..ba09ed33cf 100644 --- a/app/code/core/Mage/Catalog/Block/Navigation.php +++ b/app/code/core/Mage/Catalog/Block/Navigation.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) @@ -75,6 +81,7 @@ public function getCurrentChildCategories() ->addAttributeToSelect('is_anchor') ->addAttributeToFilter('is_active', 1) ->addIdFilter($category->getChildren()) + ->setOrder('position', 'ASC') ->joinUrlRewrite() ->load(); diff --git a/app/code/core/Mage/Catalog/Block/Product.php b/app/code/core/Mage/Catalog/Block/Product.php index 847083db74..cfffbc7ee3 100644 --- a/app/code/core/Mage/Catalog/Block/Product.php +++ b/app/code/core/Mage/Catalog/Block/Product.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Catalog/Block/Product/Abstract.php b/app/code/core/Mage/Catalog/Block/Product/Abstract.php index bb378d8751..d8022980e9 100644 --- a/app/code/core/Mage/Catalog/Block/Product/Abstract.php +++ b/app/code/core/Mage/Catalog/Block/Product/Abstract.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Catalog/Block/Product/Compare/List.php b/app/code/core/Mage/Catalog/Block/Product/Compare/List.php index 6100a29750..2b0e3d1bd7 100644 --- a/app/code/core/Mage/Catalog/Block/Product/Compare/List.php +++ b/app/code/core/Mage/Catalog/Block/Product/Compare/List.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Catalog/Block/Product/Compare/Sidebar.php b/app/code/core/Mage/Catalog/Block/Product/Compare/Sidebar.php index c04b225319..7e5b9c2c2f 100644 --- a/app/code/core/Mage/Catalog/Block/Product/Compare/Sidebar.php +++ b/app/code/core/Mage/Catalog/Block/Product/Compare/Sidebar.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Catalog/Block/Product/Gallery.php b/app/code/core/Mage/Catalog/Block/Product/Gallery.php index 1b3c7b8d3f..1982c1ff3f 100644 --- a/app/code/core/Mage/Catalog/Block/Product/Gallery.php +++ b/app/code/core/Mage/Catalog/Block/Product/Gallery.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Catalog/Block/Product/List.php b/app/code/core/Mage/Catalog/Block/Product/List.php index 02004d5498..0a3112c114 100644 --- a/app/code/core/Mage/Catalog/Block/Product/List.php +++ b/app/code/core/Mage/Catalog/Block/Product/List.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Catalog/Block/Product/List/Crosssell.php b/app/code/core/Mage/Catalog/Block/Product/List/Crosssell.php index 6f2f0a2ce7..41eb53f7ec 100644 --- a/app/code/core/Mage/Catalog/Block/Product/List/Crosssell.php +++ b/app/code/core/Mage/Catalog/Block/Product/List/Crosssell.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Catalog/Block/Product/List/Random.php b/app/code/core/Mage/Catalog/Block/Product/List/Random.php index f625a0b4ab..a2b15a9999 100644 --- a/app/code/core/Mage/Catalog/Block/Product/List/Random.php +++ b/app/code/core/Mage/Catalog/Block/Product/List/Random.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Catalog/Block/Product/List/Related.php b/app/code/core/Mage/Catalog/Block/Product/List/Related.php index 6abccb5fb4..d993a489d7 100644 --- a/app/code/core/Mage/Catalog/Block/Product/List/Related.php +++ b/app/code/core/Mage/Catalog/Block/Product/List/Related.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Catalog/Block/Product/List/Toolbar.php b/app/code/core/Mage/Catalog/Block/Product/List/Toolbar.php index 52721681c9..43973aca4d 100644 --- a/app/code/core/Mage/Catalog/Block/Product/List/Toolbar.php +++ b/app/code/core/Mage/Catalog/Block/Product/List/Toolbar.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Catalog/Block/Product/List/Upsell.php b/app/code/core/Mage/Catalog/Block/Product/List/Upsell.php index 348dda1ae6..d13556498d 100644 --- a/app/code/core/Mage/Catalog/Block/Product/List/Upsell.php +++ b/app/code/core/Mage/Catalog/Block/Product/List/Upsell.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Catalog/Block/Product/New.php b/app/code/core/Mage/Catalog/Block/Product/New.php index f54d1d2f00..1323314b35 100644 --- a/app/code/core/Mage/Catalog/Block/Product/New.php +++ b/app/code/core/Mage/Catalog/Block/Product/New.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) @@ -28,6 +34,10 @@ */ class Mage_Catalog_Block_Product_New extends Mage_Catalog_Block_Product_Abstract { + protected $_productsCount = null; + + const DEFAULT_PRODUCTS_COUNT = 5; + public function __construct() { parent::__construct(); @@ -43,14 +53,33 @@ public function __construct() ->addAttributeToSort('news_from_date','desc') ->addAttributeToSelect(array('name', 'price', 'small_image'), 'inner') ->addAttributeToSelect(array('special_price', 'special_from_date', 'special_to_date'), 'left') + ->addAttributeToSelect('status') ; /* @var $products Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Collection */ Mage::getSingleton('catalog/product_status')->addVisibleFilterToCollection($products); Mage::getSingleton('catalog/product_visibility')->addVisibleInCatalogFilterToCollection($products); - $products->setOrder('news_from_date')->setPageSize(5)->setCurPage(1); - $this->setProductCollection($products); } + + protected function _beforeToHtml() + { + $this->getProductCollection()->setOrder('news_from_date')->setPageSize($this->getProductsCount())->setCurPage(1); + return parent::_beforeToHtml(); + } + + public function setProductsCount($count) + { + $this->_productsCount = $count; + return $this; + } + + public function getProductsCount() + { + if (null === $this->_productsCount) { + $this->_productsCount = self::DEFAULT_PRODUCTS_COUNT; + } + return $this->_productsCount; + } } \ No newline at end of file diff --git a/app/code/core/Mage/Catalog/Block/Product/Price.php b/app/code/core/Mage/Catalog/Block/Product/Price.php index 494cf171a6..7037e06391 100644 --- a/app/code/core/Mage/Catalog/Block/Product/Price.php +++ b/app/code/core/Mage/Catalog/Block/Product/Price.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Catalog/Block/Product/Send.php b/app/code/core/Mage/Catalog/Block/Product/Send.php index cf7c8e45d2..da1ac25fe7 100644 --- a/app/code/core/Mage/Catalog/Block/Product/Send.php +++ b/app/code/core/Mage/Catalog/Block/Product/Send.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Catalog/Block/Product/View.php b/app/code/core/Mage/Catalog/Block/Product/View.php index 56d424b16d..b185289352 100644 --- a/app/code/core/Mage/Catalog/Block/Product/View.php +++ b/app/code/core/Mage/Catalog/Block/Product/View.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) @@ -94,6 +100,7 @@ public function getJsonConfig() $_request->setProductClassId($this->getProduct()->getTaxClassId()); $currentTax = Mage::getSingleton('tax/calculation')->getRate($_request); + $_regularPrice = $this->getProduct()->getPrice(); $_finalPrice = $this->getProduct()->getFinalPrice(); $_priceInclTax = Mage::helper('tax')->getPrice($this->getProduct(), $_finalPrice, true); $_priceExclTax = Mage::helper('tax')->getPrice($this->getProduct(), $_finalPrice); @@ -107,8 +114,10 @@ public function getJsonConfig() 'productId' => $this->getProduct()->getId(), 'priceFormat' => Mage::app()->getLocale()->getJsPriceFormat(), 'includeTax' => Mage::helper('tax')->priceIncludesTax() ? 'true' : 'false', - 'showIncludeTax' => $this->helper('tax')->displayPriceIncludingTax(), + 'showIncludeTax' => Mage::helper('tax')->displayPriceIncludingTax(), + 'showBothPrices' => Mage::helper('tax')->displayBothPrices(), 'productPrice' => Mage::helper('core')->currency($_finalPrice, false, false), + 'productOldPrice'=> Mage::helper('core')->currency($_regularPrice, false, false), 'skipCalculate' => ($_priceExclTax != $_priceInclTax ? 0 : 1), 'defaultTax' => $defaultTax, 'currentTax' => $currentTax, diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Abstract.php b/app/code/core/Mage/Catalog/Block/Product/View/Abstract.php index 30a4b83115..832e3eb76e 100644 --- a/app/code/core/Mage/Catalog/Block/Product/View/Abstract.php +++ b/app/code/core/Mage/Catalog/Block/Product/View/Abstract.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Additional.php b/app/code/core/Mage/Catalog/Block/Product/View/Additional.php index de1d16bb40..40ebf63d28 100644 --- a/app/code/core/Mage/Catalog/Block/Product/View/Additional.php +++ b/app/code/core/Mage/Catalog/Block/Product/View/Additional.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Attributes.php b/app/code/core/Mage/Catalog/Block/Product/View/Attributes.php index bf62cf3b64..e6a9721513 100644 --- a/app/code/core/Mage/Catalog/Block/Product/View/Attributes.php +++ b/app/code/core/Mage/Catalog/Block/Product/View/Attributes.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) @@ -38,13 +44,20 @@ function getProduct() return $this->_product; } - public function getAdditionalData() + /** + * $excludeAttr is optional array of attribute codes to + * exclude them from additional data array + * + * @param array $excludeAttr + * @return array + */ + public function getAdditionalData(array $excludeAttr = array()) { $data = array(); $product = $this->getProduct(); $attributes = $product->getAttributes(); foreach ($attributes as $attribute) { - if ($attribute->getIsVisibleOnFront() && $attribute->getIsUserDefined()) { + if ($attribute->getIsVisibleOnFront() && $attribute->getIsUserDefined() && !in_array($attribute->getAttributeCode(), $excludeAttr)) { $value = $attribute->getFrontend()->getValue($product); if (strlen($value) && $product->hasData($attribute->getAttributeCode())) { diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Description.php b/app/code/core/Mage/Catalog/Block/Product/View/Description.php index 5da6443e6f..4ba7c0c520 100644 --- a/app/code/core/Mage/Catalog/Block/Product/View/Description.php +++ b/app/code/core/Mage/Catalog/Block/Product/View/Description.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Media.php b/app/code/core/Mage/Catalog/Block/Product/View/Media.php index 87999933cc..14e3b9b3be 100644 --- a/app/code/core/Mage/Catalog/Block/Product/View/Media.php +++ b/app/code/core/Mage/Catalog/Block/Product/View/Media.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Options.php b/app/code/core/Mage/Catalog/Block/Product/View/Options.php index 7c18dac9ac..53c7fbb1b4 100644 --- a/app/code/core/Mage/Catalog/Block/Product/View/Options.php +++ b/app/code/core/Mage/Catalog/Block/Product/View/Options.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Options/Abstract.php b/app/code/core/Mage/Catalog/Block/Product/View/Options/Abstract.php index 054e70bae4..b99f19547e 100644 --- a/app/code/core/Mage/Catalog/Block/Product/View/Options/Abstract.php +++ b/app/code/core/Mage/Catalog/Block/Product/View/Options/Abstract.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Date.php b/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Date.php index bd4d7b2f81..3bf8bf0b5a 100644 --- a/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Date.php +++ b/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Date.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) @@ -58,7 +64,7 @@ public function getTimeHtml() ->createBlock('core/html_select') ->setData(array( 'id' => 'options_'.$this->getOption()->getId().'_hour', - 'class' => 'select'.$require + 'class' => $require )) ->setName('options['.$this->getOption()->getId().'][hour]') ->setOptions(array('00' => '00', '01' => '01')); @@ -67,7 +73,7 @@ public function getTimeHtml() ->createBlock('core/html_select') ->setData(array( 'id' => 'options_'.$this->getOption()->getId().'_minutes', - 'class' => 'select'.$require + 'class' => $require )) ->setName('options['.$this->getOption()->getId().'][minutes]') ->setOptions(array('00' => '00', '05' => '05')); @@ -76,7 +82,7 @@ public function getTimeHtml() ->createBlock('core/html_select') ->setData(array( 'id' => 'options_'.$this->getOption()->getId().'_time_format', - 'class' => 'select'.$require + 'class' => $require )) ->setName('options['.$this->getOption()->getId().'][time_format]') ->setOptions(array('am' => 'AM', 'pm' => 'PM')); diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Default.php b/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Default.php index 9f5e739990..c67fbea8c9 100644 --- a/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Default.php +++ b/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Default.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/File.php b/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/File.php index f1092d644e..bc96d0fa78 100644 --- a/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/File.php +++ b/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/File.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Select.php b/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Select.php index c4f22264af..9f44d8dd3e 100644 --- a/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Select.php +++ b/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Select.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) @@ -41,7 +47,7 @@ public function getValuesHtml() $select = $this->getLayout()->createBlock('core/html_select') ->setData(array( 'id' => 'select_'.$_option->getId(), - 'class' => 'select'.$require.' product-custom-option' + 'class' => $require.' product-custom-option' )); if ($_option->getType() == Mage_Catalog_Model_Product_Option::OPTION_TYPE_DROP_DOWN) { $select->setName('options['.$_option->getid().']') @@ -77,14 +83,14 @@ public function getValuesHtml() switch ($_option->getType()) { case Mage_Catalog_Model_Product_Option::OPTION_TYPE_RADIO: $type = 'radio'; - $class = 'form-radio'; + $class = 'radio'; if (!$_option->getIsRequire()) { - $selectHtml .= '
    • '; + $selectHtml .= '
    • '; } break; case Mage_Catalog_Model_Product_Option::OPTION_TYPE_CHECKBOX: $type = 'checkbox'; - $class = 'form-checkbox'; + $class = 'checkbox'; $arraySign = '[]'; break; } @@ -96,13 +102,13 @@ public function getValuesHtml() 'pricing_value' => $_value->getPrice(true) )); $selectHtml .= '
  • ' . - '' . - '
    '; + '' . + ''; if ($_option->getIsRequire()) { $selectHtml .= ''; + ''; } $selectHtml .= '
    • '; } diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Text.php b/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Text.php index 4b9123e031..c479fc8714 100644 --- a/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Text.php +++ b/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Text.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Price.php b/app/code/core/Mage/Catalog/Block/Product/View/Price.php index 6f62ff2ed8..63ec5bd9d6 100644 --- a/app/code/core/Mage/Catalog/Block/Product/View/Price.php +++ b/app/code/core/Mage/Catalog/Block/Product/View/Price.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Tabs.php b/app/code/core/Mage/Catalog/Block/Product/View/Tabs.php index 7b01e37c20..0cb43e8546 100644 --- a/app/code/core/Mage/Catalog/Block/Product/View/Tabs.php +++ b/app/code/core/Mage/Catalog/Block/Product/View/Tabs.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Type/Configurable.php b/app/code/core/Mage/Catalog/Block/Product/View/Type/Configurable.php index c16a72ff3a..7446cfd329 100644 --- a/app/code/core/Mage/Catalog/Block/Product/View/Type/Configurable.php +++ b/app/code/core/Mage/Catalog/Block/Product/View/Type/Configurable.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Type/Grouped.php b/app/code/core/Mage/Catalog/Block/Product/View/Type/Grouped.php index 54bc4d2bf2..7585026318 100644 --- a/app/code/core/Mage/Catalog/Block/Product/View/Type/Grouped.php +++ b/app/code/core/Mage/Catalog/Block/Product/View/Type/Grouped.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Type/Simple.php b/app/code/core/Mage/Catalog/Block/Product/View/Type/Simple.php index e13c59e0f1..2d5465deeb 100644 --- a/app/code/core/Mage/Catalog/Block/Product/View/Type/Simple.php +++ b/app/code/core/Mage/Catalog/Block/Product/View/Type/Simple.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Type/Virtual.php b/app/code/core/Mage/Catalog/Block/Product/View/Type/Virtual.php index adb94a0304..679b666e88 100644 --- a/app/code/core/Mage/Catalog/Block/Product/View/Type/Virtual.php +++ b/app/code/core/Mage/Catalog/Block/Product/View/Type/Virtual.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Abstract.php b/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Abstract.php index 5d00f02fa1..204cfbad02 100644 --- a/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Abstract.php +++ b/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Abstract.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Category.php b/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Category.php index 828d601e0d..6213a5242a 100644 --- a/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Category.php +++ b/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Category.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Product.php b/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Product.php index 3270a8befd..f4a211924c 100644 --- a/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Product.php +++ b/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Product.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Catalog/Exception.php b/app/code/core/Mage/Catalog/Exception.php index a4445d6b29..24a8e4675c 100644 --- a/app/code/core/Mage/Catalog/Exception.php +++ b/app/code/core/Mage/Catalog/Exception.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Catalog/Helper/Category.php b/app/code/core/Mage/Catalog/Helper/Category.php index ecee7be80e..bec8bf1805 100644 --- a/app/code/core/Mage/Catalog/Helper/Category.php +++ b/app/code/core/Mage/Catalog/Helper/Category.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Catalog/Helper/Data.php b/app/code/core/Mage/Catalog/Helper/Data.php index 6180da0b05..1862a6f9cf 100644 --- a/app/code/core/Mage/Catalog/Helper/Data.php +++ b/app/code/core/Mage/Catalog/Helper/Data.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) @@ -37,6 +43,7 @@ public function getBreadcrumbPath() $pathIds = array_reverse(explode(',', $pathInStore)); $categories = Mage::getResourceModel('catalog/category_collection') + ->setStore(Mage::app()->getStore()) ->addAttributeToSelect('name') ->addAttributeToSelect('url_key') ->addFieldToFilter('entity_id', array('in'=>$pathIds)) @@ -46,6 +53,7 @@ public function getBreadcrumbPath() // add category path breadcrumb foreach ($pathIds as $categoryId) { if (isset($categories[$categoryId]) && $categories[$categoryId]->getName()) { + $categories[$categoryId]->setStoreId(Mage::app()->getStore()->getId()); $path['category'.$categoryId] = array( 'label' => $categories[$categoryId]->getName(), 'link' => $this->_isCategoryLink($categoryId) ? $categories[$categoryId]->getUrl() : '' diff --git a/app/code/core/Mage/Catalog/Helper/Image.php b/app/code/core/Mage/Catalog/Helper/Image.php index 3c113f223b..605d0f1506 100644 --- a/app/code/core/Mage/Catalog/Helper/Image.php +++ b/app/code/core/Mage/Catalog/Helper/Image.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Catalog/Helper/Map.php b/app/code/core/Mage/Catalog/Helper/Map.php index 29c04f91b6..d4fb8831ef 100644 --- a/app/code/core/Mage/Catalog/Helper/Map.php +++ b/app/code/core/Mage/Catalog/Helper/Map.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Catalog/Helper/Product.php b/app/code/core/Mage/Catalog/Helper/Product.php index a8fcc85a99..45e13cef09 100644 --- a/app/code/core/Mage/Catalog/Helper/Product.php +++ b/app/code/core/Mage/Catalog/Helper/Product.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Catalog/Helper/Product/Compare.php b/app/code/core/Mage/Catalog/Helper/Product/Compare.php index 7aa4a4d49e..64b65d39d1 100644 --- a/app/code/core/Mage/Catalog/Helper/Product/Compare.php +++ b/app/code/core/Mage/Catalog/Helper/Product/Compare.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Catalog/Helper/Product/Url.php b/app/code/core/Mage/Catalog/Helper/Product/Url.php index a30a139f4f..0a4d2a1ba4 100644 --- a/app/code/core/Mage/Catalog/Helper/Product/Url.php +++ b/app/code/core/Mage/Catalog/Helper/Product/Url.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Catalog/Model/Abstract.php b/app/code/core/Mage/Catalog/Model/Abstract.php index 76ba7e71a2..b827267dbe 100644 --- a/app/code/core/Mage/Catalog/Model/Abstract.php +++ b/app/code/core/Mage/Catalog/Model/Abstract.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) @@ -55,9 +61,10 @@ public function getResourceCollection() return $collection; } - public function loadByAttribute($attribute, $value) + public function loadByAttribute($attribute, $value, $additionalAttributes='*') { $collection = $this->getResourceCollection() + ->addAttributeToSelect($additionalAttributes) ->addAttributeToFilter($attribute, $value) ->setPage(1,1); diff --git a/app/code/core/Mage/Catalog/Model/Api/Resource.php b/app/code/core/Mage/Catalog/Model/Api/Resource.php index e6d855cb87..0004a623dc 100644 --- a/app/code/core/Mage/Catalog/Model/Api/Resource.php +++ b/app/code/core/Mage/Catalog/Model/Api/Resource.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Catalog/Model/Category.php b/app/code/core/Mage/Catalog/Model/Category.php index 97e437eb71..9449c8688a 100644 --- a/app/code/core/Mage/Catalog/Model/Category.php +++ b/app/code/core/Mage/Catalog/Model/Category.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) @@ -33,6 +39,7 @@ class Mage_Catalog_Model_Category extends Mage_Catalog_Model_Abstract const DM_PRODUCT = 'PRODUCTS'; const DM_PAGE = 'PAGE'; const DM_MIXED = 'PRODUCTS_AND_PAGE'; + const TREE_ROOT_ID = 1; const CACHE_TAG = 'catalog_category'; protected $_cacheTag = 'catalog_category'; @@ -352,7 +359,9 @@ private function _getAttribute($attributeCode) public function getAllChildren() { + $this->getTreeModelInstance()->load(); $children = $this->getTreeModelInstance()->getChildren($this->getId()); + $myId = array($this->getId()); if (is_array($children)) { $children = array_merge($myId, $children); @@ -364,6 +373,7 @@ public function getAllChildren() public function getChildren() { + $this->getTreeModelInstance()->load(); return implode(',', $this->getTreeModelInstance()->getChildren($this->getId(), false)); } @@ -434,4 +444,33 @@ protected function _beforeDelete() $this->_protectFromNonAdmin(); return parent::_beforeDelete(); } + + public function getAnchorsAbove() + { + $anchors = array(); + $path = $this->getPathIds(); + + if (in_array($this->getId(), $path)) { + unset($path[array_search($this->getId(), $path)]); + } + + if (!Mage::registry('_category_is_anchor_attribute')) { + $model = $this->getResource()->getAttribute('is_anchor'); + Mage::register('_category_is_anchor_attribute', $model); + } + + if ($isAnchorAttribute = Mage::registry('_category_is_anchor_attribute')) { + $anchors = $this->getResource()->findWhereAttributeIs($path, $isAnchorAttribute, 1); + } + return $anchors; + } + + public function getProductCount() + { + if (!$this->hasProductCount()) { + $count = $this->_getResource()->getProductCount($this); // load product count + $this->setData('product_count', $count); + } + return $this->getData('product_count'); + } } \ No newline at end of file diff --git a/app/code/core/Mage/Catalog/Model/Category/Api.php b/app/code/core/Mage/Catalog/Model/Category/Api.php index 51c8bd4055..fc9b69b37f 100644 --- a/app/code/core/Mage/Catalog/Model/Category/Api.php +++ b/app/code/core/Mage/Catalog/Model/Category/Api.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) @@ -43,7 +49,9 @@ public function level($website = null, $store = null, $categoryId = null) { $ids = array(); $storeId = Mage_Catalog_Model_Category::DEFAULT_STORE_ID; - if (!is_null($website)) { + + // load root categories of website + if (null !== $website) { try { $website = Mage::app()->getWebsite($website); foreach ($website->getStores() as $store) { @@ -53,26 +61,28 @@ public function level($website = null, $store = null, $categoryId = null) } catch (Mage_Core_Exception $e) { $this->_fault('website_not_exists', $e->getMessage()); } - } elseif (!is_null($store) && is_null($categoryId)) { - try { - $store = Mage::app()->getStore($store); - $storeId = $store->getId(); - $ids = $store->getRootCategoryId(); - } catch (Mage_Core_Model_Store_Exception $e) { - $this->_fault('store_not_exists'); - } - } elseif (!is_null($store)) { - $storeId = $this->_getStoreId($store); - $ids = (int) $categoryId; - } else { - foreach (Mage::app()->getStores() as $store) { - $ids[] = $store->getRootCategoryId(); + } + elseif (null !== $store) { + // load children of root category of store + if (null === $categoryId) { + try { + $store = Mage::app()->getStore($store); + $storeId = $store->getId(); + $ids = $store->getRootCategoryId(); + } catch (Mage_Core_Model_Store_Exception $e) { + $this->_fault('store_not_exists'); + } } - - if (count($ids)==0) { - $ids[] = 1; + // load children of specified category id + else { + $storeId = $this->_getStoreId($store); + $ids = (int)$categoryId; } } + // load all root categories + else { + $ids = Mage_Catalog_Model_Category::TREE_ROOT_ID; + } $collection = Mage::getModel('catalog/category')->getCollection() ->setStoreId($storeId) @@ -80,7 +90,7 @@ public function level($website = null, $store = null, $categoryId = null) ->addAttributeToSelect('is_active'); if (is_array($ids)) { - $collection->addFieldToFilter('entity_id', array('in'=>$ids)); + $collection->addFieldToFilter('entity_id', array('in' => $ids)); } else { $collection->addFieldToFilter('parent_id', $ids); } @@ -200,7 +210,7 @@ public function info($categoryId, $store = null, $attributes = null) // Basic category data $result = array(); $result['category_id'] = $category->getId(); - $result['parent_id'] = $category->getParentId(); + $result['is_active'] = $category->getIsActive(); $result['position'] = $category->getPosition(); $result['level'] = $category->getLevel(); @@ -210,6 +220,9 @@ public function info($categoryId, $store = null, $attributes = null) $result[$attribute->getAttributeCode()] = $category->getData($attribute->getAttributeCode()); } } + $result['parent_id'] = $category->getParentId(); + $result['children'] = $category->getChildren(); + $result['all_children'] = $category->getAllChildren(); return $result; } @@ -223,9 +236,16 @@ public function info($categoryId, $store = null, $attributes = null) */ public function create($parentId, $categoryData, $store = null) { + $parent_category = $this->_initCategory($parentId); + $category = Mage::getModel('catalog/category') - ->setStoreId($this->_getStoreId($store)) - ->setParentId($parentId); + ->setStoreId($this->_getStoreId($store)); + + + + $category->addData(array('path'=>implode('/',$parent_category->getPathIds()))); + + $category ->setAttributeSetId($category->getDefaultAttributeSetId()); /* @var $category Mage_Catalog_Model_Category */ foreach ($category->getAttributes() as $attribute) { @@ -237,7 +257,7 @@ public function create($parentId, $categoryData, $store = null) ); } } - + $category->setParentId($parent_category->getId()); try { $category->save(); } catch (Mage_Core_Exception $e) { @@ -288,17 +308,27 @@ public function update($categoryId, $categoryData, $store = null) */ public function move($categoryId, $parentId, $afterId = null) { + $category = $this->_initCategory($categoryId); + $parent_category = $this->_initCategory($parentId); + $tree = Mage::getResourceModel('catalog/category_tree') ->load(); - $node = $tree->getNodeById($categoryId); - $newParentNode = $tree->getNodeById($parentId); - $prevNode = $tree->getNodeById($afterId); + $node = $tree->getNodeById($category->getId()); + $newParentNode = $tree->getNodeById($parent_category->getId()); if (!$node || !$node->getId()) { $this->_fault('not_exists'); } + // if $afterId is null - move category to the down + if ($afterId === null && $parent_category->hasChildren()) { + $parentChildren = $parent_category->getChildren(); + $afterId = array_pop(explode(',', $parentChildren)); + } + + $prevNode = $tree->getNodeById($afterId); + if (!$prevNode || !$prevNode->getId()) { $prevNode = null; } diff --git a/app/code/core/Mage/Catalog/Model/Category/Attribute/Api.php b/app/code/core/Mage/Catalog/Model/Category/Attribute/Api.php index 4fd5226e6f..9a4875c73c 100644 --- a/app/code/core/Mage/Catalog/Model/Category/Attribute/Api.php +++ b/app/code/core/Mage/Catalog/Model/Category/Attribute/Api.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Image.php b/app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Image.php index 84c1688ff0..47caaa946c 100644 --- a/app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Image.php +++ b/app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Image.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Urlkey.php b/app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Urlkey.php index 37652d6d2d..d4d2c13dc8 100644 --- a/app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Urlkey.php +++ b/app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Urlkey.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Layout.php b/app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Layout.php index 60d642df3b..b7559b967f 100644 --- a/app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Layout.php +++ b/app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Layout.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Mode.php b/app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Mode.php index c46e6a7a04..33a24d23c2 100644 --- a/app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Mode.php +++ b/app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Mode.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Page.php b/app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Page.php index 6a4428da23..94d90800d8 100644 --- a/app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Page.php +++ b/app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Page.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Catalog/Model/Config.php b/app/code/core/Mage/Catalog/Model/Config.php index bc3874d164..24fb4e86ae 100644 --- a/app/code/core/Mage/Catalog/Model/Config.php +++ b/app/code/core/Mage/Catalog/Model/Config.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Catalog/Model/Convert.php b/app/code/core/Mage/Catalog/Model/Convert.php index cdb69298fa..1f8561687a 100644 --- a/app/code/core/Mage/Catalog/Model/Convert.php +++ b/app/code/core/Mage/Catalog/Model/Convert.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Catalog/Model/Convert/Adapter/Catalog.php b/app/code/core/Mage/Catalog/Model/Convert/Adapter/Catalog.php index c5a3d84e71..cc772b867e 100644 --- a/app/code/core/Mage/Catalog/Model/Convert/Adapter/Catalog.php +++ b/app/code/core/Mage/Catalog/Model/Convert/Adapter/Catalog.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) diff --git a/app/code/core/Mage/Catalog/Model/Convert/Adapter/Product.php b/app/code/core/Mage/Catalog/Model/Convert/Adapter/Product.php index 3e71c922f7..9db009e1ba 100644 --- a/app/code/core/Mage/Catalog/Model/Convert/Adapter/Product.php +++ b/app/code/core/Mage/Catalog/Model/Convert/Adapter/Product.php @@ -12,6 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) @@ -443,7 +449,14 @@ public function save() return $this; } - public function saveRow($importData) + /** + * Save product (import) + * + * @param array $importData + * @throws Mage_Core_Exception + * @return bool + */ + public function saveRow(array $importData) { $product = $this->getProductModel(); $product->setData(array()); @@ -638,155 +651,31 @@ public function saveRow($importData) $product->save(); return true; - - - -// static $import, $product, $stockItem; - $mem = memory_get_usage(); $origMem = $mem; $memory = $mem; - -// if (!$product) { -// $import = Mage::getModel('dataflow/import'); -// $product = Mage::getModel('catalog/product'); -// $stockItem = Mage::getModel('cataloginventory/stock_item'); -// } - - $product = $this->getProduct(); - $stockItem = $this->getStockItem(); - - @set_time_limit(240); - -// $row = unserialize($args['row']['value']); - $row = $args; - $newMem = memory_get_usage(); $memory .= ', '.($newMem-$mem); $mem = $newMem; - - - - $product->importFromTextArray($row); - //echo '
    ';
-        //print_r($product->getData());
-        $newMem = memory_get_usage(); $memory .= ', '.($newMem-$mem); $mem = $newMem;
-
-
-        if (!$product->getData()) {
-            return;
-        }
-
-        try {
-            $product->save();
-            $productId= $this->_productId = $product->getId();
-            $product->unsetData();
-
-            $newMem = memory_get_usage(); $memory .= ', '.($newMem-$mem); $mem = $newMem;
-            if ($stockItem) {
-                $stockItem->loadByProduct($productId);
-                if (!$stockItem->getId()) {
-                    $stockItem->setProductId($productId)->setStockId(1);
-                }
-                foreach ($row['row'] as $field=>$value) {
-                    if (in_array($field, $this->_inventoryFields)) {
-                        if ($value != '') $stockItem->setData($field, $value);
-                    }
-                }
-                $stockItem->save();
-                $stockItem->unsetData();
-            }
-
-            $newMem = memory_get_usage(); $memory .= ', '.($newMem-$mem); $mem = $newMem;
-
-            $newMem = memory_get_usage(); $memory .= ', '.($newMem-$mem); $mem = $newMem;
-
-            $newMem = memory_get_usage(); $memory .= ', '.($newMem-$mem); $mem = $newMem;
-
-            $newMem = memory_get_usage(); $memory .= ' = '.($newMem-$origMem); $mem = $newMem;
-
-
-        } catch (Exception $e) {
-
-        }
-        unset($row);
-        return array('memory'=>$memory);
     }
 
-   public function saveRowSilently($args)
+    /**
+     * Silently save product (import)
+     *
+     * @param array $
+     * @return bool
+     */
+    public function saveRowSilently(array $importData)
     {
-//        static $import, $product, $stockItem;
-        $mem = memory_get_usage(); $origMem = $mem; $memory = $mem;
-
-//        if (!$product) {
-//            $import = Mage::getModel('dataflow/import');
-//            $product = Mage::getModel('catalog/product');
-//            $stockItem = Mage::getModel('cataloginventory/stock_item');
-//        }
-
-        $product = $this->getProduct();
-        $stockItem = $this->getStockItem();
-
-        @set_time_limit(240);
-
-//        $row = unserialize($args['row']['value']);
-        $row = $args;
-        $newMem = memory_get_usage(); $memory .= ', '.($newMem-$mem); $mem = $newMem;
-
-
-
-        $product->importFromTextArraySilently($row);
-        //echo '
    ';
-        //print_r($product->getData());
-        $newMem = memory_get_usage(); $memory .= ', '.($newMem-$mem); $mem = $newMem;
-
-
-        if (!$product->getData()) {
-            return;
-        }
-
         try {
-            $product->save();
-            $productId= $this->_productId = $product->getId();
-            $product->unsetData();
-
-            $newMem = memory_get_usage(); $memory .= ', '.($newMem-$mem); $mem = $newMem;
-            if ($stockItem) {
-                $stockItem->loadByProduct($productId);
-                if (!$stockItem->getId()) {
-                    $stockItem->setProductId($productId)->setStockId(1);
-                }
-                foreach ($row['row'] as $field=>$value) {
-                    if (in_array($field, $this->_inventoryFields)) {
-                        if ($value != '') $stockItem->setData($field, $value);
-                    }
-                }
-                $stockItem->save();
-                $stockItem->unsetData();
-            }
-
-            $newMem = memory_get_usage(); $memory .= ', '.($newMem-$mem); $mem = $newMem;
-
-            $newMem = memory_get_usage(); $memory .= ', '.($newMem-$mem); $mem = $newMem;
-
-            $newMem = memory_get_usage(); $memory .= ', '.($newMem-$mem); $mem = $newMem;
-
-            $newMem = memory_get_usage(); $memory .= ' = '.($newMem-$origMem); $mem = $newMem;
-
-
-        } catch (Exception $e) {
-
+            $result = $this->saveRow($importData);
+            return $result;
+        }
+        catch (Exception $e) {
+            return false;
         }
-        unset($row);
-        return array('memory'=>$memory);
-    }
-
-    function setInventoryItems($items)
-    {
-        $this->_inventoryItems = $items;
-    }
-
-    function getInventoryItems()
-    {
-        return $this->_inventoryItems;
     }
 
-    function getProductId()
+    /**
+     * Process after import data
+     *
+     */
+    public function finish()
     {
-        return $this->_productId;
+        Mage::dispatchEvent('catalog_product_import_after', array());
     }
 }
diff --git a/app/code/core/Mage/Catalog/Model/Convert/Parser/Product.php b/app/code/core/Mage/Catalog/Model/Convert/Parser/Product.php
index 1684ba9c2c..5dfd3c3955 100644
--- a/app/code/core/Mage/Catalog/Model/Convert/Parser/Product.php
+++ b/app/code/core/Mage/Catalog/Model/Convert/Parser/Product.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/Model/Design.php b/app/code/core/Mage/Catalog/Model/Design.php
index 8490abf8a9..23f4bca1a6 100644
--- a/app/code/core/Mage/Catalog/Model/Design.php
+++ b/app/code/core/Mage/Catalog/Model/Design.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/Model/Entity/Attribute.php b/app/code/core/Mage/Catalog/Model/Entity/Attribute.php
index b3808b2369..e030631984 100644
--- a/app/code/core/Mage/Catalog/Model/Entity/Attribute.php
+++ b/app/code/core/Mage/Catalog/Model/Entity/Attribute.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -27,6 +33,18 @@ class Mage_Catalog_Model_Entity_Attribute extends Mage_Eav_Model_Entity_Attribut
 {
     protected $_eventPrefix = 'catalog_entity_attribute';
     protected $_eventObject = 'attribute';
+    const MODULE_NAME = 'Mage_Catalog';
+
+    /**
+     * Processing object before save data
+     *
+     * @return Mage_Core_Model_Abstract
+     */
+    protected function _beforeSave()
+    {
+        $this->setData('modulePrefix', self::MODULE_NAME);
+        return parent::_beforeSave();
+    }
 
     /**
      * Processing object after save data
diff --git a/app/code/core/Mage/Catalog/Model/Entity/Product/Attribute/Design/Options/Container.php b/app/code/core/Mage/Catalog/Model/Entity/Product/Attribute/Design/Options/Container.php
index a837eb23f3..e04600b01a 100644
--- a/app/code/core/Mage/Catalog/Model/Entity/Product/Attribute/Design/Options/Container.php
+++ b/app/code/core/Mage/Catalog/Model/Entity/Product/Attribute/Design/Options/Container.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Eav
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -33,4 +39,27 @@ public function __construct()
     {
         $this->_configNodePath = 'global/catalog/product/design/options_container';
     }
+
+    /**
+     * Get a text for option value
+     *
+     * @param string|integer $value
+     * @return string
+     */
+    public function getOptionText($value)
+    {
+        $options = $this->getAllOptions();
+        if (sizeof($options) > 0) {
+            foreach ($options as $option) {
+                if (isset($option['value']) && $option['value'] == $value) {
+                    return $option['label'];
+                }
+            }
+        }
+        if (isset($options[$value])) {
+            return $option[$value];
+        }
+        return false;
+    }
+
 }
\ No newline at end of file
diff --git a/app/code/core/Mage/Catalog/Model/Entity/Product/Attribute/Frontend/Image.php b/app/code/core/Mage/Catalog/Model/Entity/Product/Attribute/Frontend/Image.php
index 31fff6f0a2..090ecefaf5 100644
--- a/app/code/core/Mage/Catalog/Model/Entity/Product/Attribute/Frontend/Image.php
+++ b/app/code/core/Mage/Catalog/Model/Entity/Product/Attribute/Frontend/Image.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/Model/Layer.php b/app/code/core/Mage/Catalog/Model/Layer.php
index 34c678eb92..1e66289dba 100644
--- a/app/code/core/Mage/Catalog/Model/Layer.php
+++ b/app/code/core/Mage/Catalog/Model/Layer.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/Model/Layer/Filter/Abstract.php b/app/code/core/Mage/Catalog/Model/Layer/Filter/Abstract.php
index 019e4dfca1..7344e840f8 100644
--- a/app/code/core/Mage/Catalog/Model/Layer/Filter/Abstract.php
+++ b/app/code/core/Mage/Catalog/Model/Layer/Filter/Abstract.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/Model/Layer/Filter/Attribute.php b/app/code/core/Mage/Catalog/Model/Layer/Filter/Attribute.php
index 15f02c1647..06c38991f8 100644
--- a/app/code/core/Mage/Catalog/Model/Layer/Filter/Attribute.php
+++ b/app/code/core/Mage/Catalog/Model/Layer/Filter/Attribute.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/Model/Layer/Filter/Category.php b/app/code/core/Mage/Catalog/Model/Layer/Filter/Category.php
index 861bcd9a1d..3cdc9b069d 100644
--- a/app/code/core/Mage/Catalog/Model/Layer/Filter/Category.php
+++ b/app/code/core/Mage/Catalog/Model/Layer/Filter/Category.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/Model/Layer/Filter/Item.php b/app/code/core/Mage/Catalog/Model/Layer/Filter/Item.php
index 3e65856c63..d6eff447ff 100644
--- a/app/code/core/Mage/Catalog/Model/Layer/Filter/Item.php
+++ b/app/code/core/Mage/Catalog/Model/Layer/Filter/Item.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/Model/Layer/Filter/Price.php b/app/code/core/Mage/Catalog/Model/Layer/Filter/Price.php
index 0743098961..9b697f8665 100644
--- a/app/code/core/Mage/Catalog/Model/Layer/Filter/Price.php
+++ b/app/code/core/Mage/Catalog/Model/Layer/Filter/Price.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category    Mage
  * @package     Mage_Catalog
  * @copyright   Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/Model/Layer/State.php b/app/code/core/Mage/Catalog/Model/Layer/State.php
index 077d13cce1..e3ad710931 100644
--- a/app/code/core/Mage/Catalog/Model/Layer/State.php
+++ b/app/code/core/Mage/Catalog/Model/Layer/State.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/Model/Observer.php b/app/code/core/Mage/Catalog/Model/Observer.php
index bd8a76befb..29ee6dc4b2 100644
--- a/app/code/core/Mage/Catalog/Model/Observer.php
+++ b/app/code/core/Mage/Catalog/Model/Observer.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -59,7 +65,12 @@ public function storeGroupSave($observer)
     public function categoryMove($observer)
     {
         $categoryId = $observer->getEvent()->getCategoryId();
+        $prevParentId = $observer->getEvent()->getPrevParentId();
+        $parentId = $observer->getEvent()->getParentId();
         Mage::getModel('catalog/url')->refreshCategoryRewrite($categoryId);
+        $model = Mage::getModel('catalog/category')->load($prevParentId)->save();
+        $model = Mage::getModel('catalog/category')->load($parentId)->save();
+        $model = null;
         return $this;
     }
 
diff --git a/app/code/core/Mage/Catalog/Model/Product.php b/app/code/core/Mage/Catalog/Model/Product.php
index 2cf7b560de..803cce1949 100644
--- a/app/code/core/Mage/Catalog/Model/Product.php
+++ b/app/code/core/Mage/Catalog/Model/Product.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -371,41 +377,18 @@ protected function _afterSave()
 
     protected function _beforeDelete()
     {
-        $this->_substractQtyFromQuotes();
         $this->cleanCache();
         $this->_protectFromNonAdmin();
         return parent::_beforeDelete();
     }
 
     /**
-     * Substract this product from all quotes quantities
-     *
-     * @throws Exception
+     * deprecated
+     * @see Mage_Sales_Model_Observer::substractQtyFromQuotes()
      */
     protected function _substractQtyFromQuotes()
     {
-        // get all quotes and store ids, in which the product may be
-        /*
-        SELECT qi.item_id, qi.qty, qi.quote_id, q.store_id, q.items_qty, q.items_count
-        FROM sales_flat_quote_item qi
-            INNER JOIN sales_flat_quote q ON qi.quote_id=q.entity_id
-        WHERE qi.product_id=?d
-        */
-        $quotesCollection = Mage::getModel('sales/quote')->getCollection();
-        $quoteItemsCollection = Mage::getModel('sales/quote_item')->getCollection()
-            ->resetJoinQuotes($quotesCollection->getResource()->getMainTable(), $this->getId());
-        $quotesStores = $quoteItemsCollection->getConnection()->fetchAll($quoteItemsCollection->getSelect());
-
-        foreach ($quotesStores as $quoteStore) {
-            // substract quantity from the quote
-            $quoteItem = Mage::getModel('sales/quote')
-                ->setId($quoteStore['quote_id'])
-                ->setItemsCount((int)$quoteStore['items_count'] - 1)
-                ->setItemsQty((int)$quoteStore['items_qty'] - (int)$quoteStore['qty'])
-                ->setStoreId($quoteStore['store_id']) // it is used in _beforeSave()
-            ;
-            $quoteItem->save();
-        }
+        // kept for legacy purposes
     }
 
     protected function _afterLoad()
@@ -558,6 +541,20 @@ public function getRelatedProductCollection()
         return $collection;
     }
 
+    /**
+     * Retrieve collection related link
+     */
+    public function getRelatedLinkCollection()
+    {
+        $collection = $this->getLinkInstance()->useRelatedLinks()
+            ->getLinkCollection();
+        $collection->setProduct($this);
+        $collection->addLinkTypeIdFilter();
+        $collection->addProductIdFilter();
+        $collection->joinAttributes();
+        return $collection;
+    }
+
     /**
      * Retrieve array of up sell products
      *
@@ -605,7 +602,21 @@ public function getUpSellProductCollection()
     }
 
     /**
-     * Retrieve array of cross sell roducts
+     * Retrieve collection up sell link
+     */
+    public function getUpSellLinkCollection()
+    {
+        $collection = $this->getLinkInstance()->useUpSellLinks()
+            ->getLinkCollection();
+        $collection->setProduct($this);
+        $collection->addLinkTypeIdFilter();
+        $collection->addProductIdFilter();
+        $collection->joinAttributes();
+        return $collection;
+    }
+
+    /**
+     * Retrieve array of cross sell products
      *
      * @return array
      */
@@ -650,6 +661,34 @@ public function getCrossSellProductCollection()
         return $collection;
     }
 
+    /**
+     * Retrieve collection cross sell link
+     */
+    public function getCrossSellLinkCollection()
+    {
+        $collection = $this->getLinkInstance()->useCrossSellLinks()
+            ->getLinkCollection();
+        $collection->setProduct($this);
+        $collection->addLinkTypeIdFilter();
+        $collection->addProductIdFilter();
+        $collection->joinAttributes();
+        return $collection;
+    }
+
+    /**
+     * Retrieve collection grouped link
+     */
+    public function getGroupedLinkCollection()
+    {
+        $collection = $this->getLinkInstance()->useGroupedLinks()
+            ->getLinkCollection();
+        $collection->setProduct($this);
+        $collection->addLinkTypeIdFilter();
+        $collection->addProductIdFilter();
+        $collection->joinAttributes();
+        return $collection;
+    }
+
 /*******************************************************************************
  ** Media API
  */
@@ -755,6 +794,62 @@ public function duplicate()
         }
         $newProduct->setProductOptions($newOptionsArray);
 
+        /* Prepare Related*/
+        $data = array();
+        $this->getLinkInstance()->useRelatedLinks();
+        $attributes = array();
+        foreach ($this->getLinkInstance()->getAttributes() as $_attribute) {
+            if (isset($_attribute['code'])) {
+                $attributes[]=$_attribute['code'];
+            }
+        }
+        foreach ($this->getRelatedLinkCollection() as $_link) {
+            $data[$_link->getLinkedProductId()] = $_link->toArray($attributes);
+        }
+        $newProduct->setRelatedLinkData($data);
+
+        /* Prepare UpSell*/
+        $data = array();
+        $this->getLinkInstance()->useUpSellLinks();
+        $attributes = array();
+        foreach ($this->getLinkInstance()->getAttributes() as $_attribute) {
+            if (isset($_attribute['code'])) {
+                $attributes[]=$_attribute['code'];
+            }
+        }
+        foreach ($this->getUpSellLinkCollection() as $_link) {
+            $data[$_link->getLinkedProductId()] = $_link->toArray($attributes);
+        }
+        $newProduct->setUpSellLinkData($data);
+
+        /* Prepare Cross Sell */
+        $data = array();
+        $this->getLinkInstance()->useCrossSellLinks();
+        $attributes = array();
+        foreach ($this->getLinkInstance()->getAttributes() as $_attribute) {
+            if (isset($_attribute['code'])) {
+                $attributes[]=$_attribute['code'];
+            }
+        }
+        foreach ($this->getCrossSellLinkCollection() as $_link) {
+            $data[$_link->getLinkedProductId()] = $_link->toArray($attributes);
+        }
+        $newProduct->setCrossSellLinkData($data);
+
+        /* Prepare Grouped */
+        $data = array();
+        $this->getLinkInstance()->useGroupedLinks();
+        $attributes = array();
+        foreach ($this->getLinkInstance()->getAttributes() as $_attribute) {
+            if (isset($_attribute['code'])) {
+                $attributes[]=$_attribute['code'];
+            }
+        }
+        foreach ($this->getGroupedLinkCollection() as $_link) {
+            $data[$_link->getLinkedProductId()] = $_link->toArray($attributes);
+        }
+        $newProduct->setGroupedLinkData($data);
+
         $newId = $newProduct->getId();
 
         $newProduct->save();
@@ -885,280 +980,6 @@ public function getUrlPath($category=null)
         return $this->_urlModel->getUrlPath($this, $category);
     }
 
-    public function getImageUrl()
-    {
-        return $this->_urlModel->getImageUrl($this);
-    }
-
-    public function getCustomImageUrl($size, $extension=null, $watermark=null)
-    {
-        return $this->_urlModel->getCustomImageUrl($this, $size, $extension, $watermark);
-    }
-
-    public function getSmallImageUrl()
-    {
-        return $this->_urlModel->getSmallImageUrl($this);
-    }
-
-    public function getCustomSmallImageUrl($size, $extension=null, $watermark=null)
-    {
-        return $this->_urlModel->getCustomSmallImageUrl($this, $size, $extension, $watermark);
-    }
-
-    public function getThumbnailUrl()
-    {
-        return $this->_urlModel->getThumbnailUrl($this);
-    }
-
-    public function importFromTextArray(array $row)
-    {
-        $hlp = Mage::helper('catalog');
-        $line = $row['i'];
-        $row = $row['row'];
-        $isError = false;
-        $this->unsetData();
-        $catalogConfig = Mage::getSingleton('catalog/config');
-        unset($row['entity_id']);
-        $productId = null;
-        // validate SKU
-        if (empty($row['sku'])) {
-            //$this->printError($hlp->__('SKU is required'), $line);
-            //return ;
-            $this->addError($hlp->__('SKU is required line: %s', $line));
-        } else {
-            $productId = $this->getIdBySku($row['sku']);
-        }
-
-        if ($productId) {
-            $this->unsetData();
-            $this->load($productId);
-            if (isset($row['store'])) {
-                $storeId = Mage::app()->getStore($row['store'])->getId();
-                if ($storeId) $this->setStoreId($storeId);
-            }
-        } else {
-            if ($row['store'] && $storeId = Mage::app()->getStore($row['store'])->getId()) {
-                $this->setStoreId($storeId);
-            } else {
-                $this->setStoreId(0);
-            }
-
-            // if attribute_set not set use default
-            if (empty($row['attribute_set'])) {
-                $row['attribute_set'] = !empty($row['attribute_set_id']) ? $row['attribute_set_id'] : 'Default';
-            }
-
-            if ($row['attribute_set']) {
-                // get attribute_set_id, if not throw error
-                $attributeSetId = $catalogConfig->getAttributeSetId('catalog_product', $row['attribute_set']);
-            }
-            if (!isset($attributeSetId)) {
-//                $this->printError($hlp->__("Invalid attribute set specified"), $line);
-//                return;
-                  $this->addError($hlp->__("Invalid attribute set specified line: %s", $line));
-            }
-
-            $this->setAttributeSetId($attributeSetId);
-
-            if (empty($row['type'])) {
-                $row['type'] = !empty($row['type_id']) ? $row['type_id'] : 'Simple Product';
-            }
-            // get product type_id, if not throw error
-            $typeId = $catalogConfig->getProductTypeId($row['type']);
-            if (!$typeId) {
-                  $this->addError($hlp->__("Invalid product type specified line: %s", $line));
-//                $this->printError($hlp->__("Invalid product type specified"), $line);
-//                return;
-            }
-            $this->setTypeId($typeId);
-        }
-
-        if ($errors = $this->getErrors()) {
-            $this->unsetData();
-            $this->printError(join("
    ",$errors));
-            $this->resetErrors();
-            return;
-        }
-
-        $entity = $this->getResource();
-
-        //print_r($entity);
-        foreach ($row as $field=>$value) {
-            $attribute = $entity->getAttribute($field);
-            if (!$attribute) {
-                continue;
-            }
-
-            if ($attribute->usesSource()) {
-                $source = $attribute->getSource();
-                $optionId = $catalogConfig->getSourceOptionId($source, $value);
-                if (is_null($optionId)) {
-                    $this->printError($hlp->__("Invalid attribute option specified for attribute attribute %s (%s)", $field, $value), $line);
-                }
-                $value = $optionId;
-            }
-
-            $this->setData($field, $value);
-        }
-
-        $postedStores = array(0=>0);
-        if (isset($row['store'])) {
-            foreach (explode(',', $row['store']) as $store) {
-                $storeId = Mage::app()->getStore($store)->getId();
-                if (!$this->hasStoreId()) {
-                    $this->setStoreId($storeId);
-                }
-                $postedStores[$storeId] = $this->getStoreId();
-            }
-        }
-
-        $this->setPostedStores($postedStores);
-
-        if (isset($row['categories'])) {
-            $this->setCategoryIds($row['categories']);
-        }
-        return $this;
-    }
-
-    public function importFromTextArraySilently(array $row)
-    {
-        $hlp = Mage::helper('catalog');
-        $line = $row['i'];
-        $row = $row['row'];
-        $isError = false;
-        $this->unsetData();
-        $catalogConfig = Mage::getSingleton('catalog/config');
-        unset($row['entity_id']);
-        $productId = null;
-        // validate SKU
-        if (empty($row['sku'])) {
-            //$this->printError($hlp->__('SKU is required'), $line);
-            //return ;
-            $this->addError($hlp->__('SKU is required line: %s', $line));
-        } else {
-            $productId = $this->getIdBySku($row['sku']);
-        }
-
-        if ($productId) {
-            $this->unsetData();
-            $this->load($productId);
-            if (isset($row['store'])) {
-                $storeId = Mage::app()->getStore($row['store'])->getId();
-                if ($storeId) $this->setStoreId($storeId);
-            }
-        } else {
-            if ($row['store'] && $storeId = Mage::app()->getStore($row['store'])->getId()) {
-                $this->setStoreId($storeId);
-            } else {
-                $this->setStoreId(0);
-            }
-
-            // if attribute_set not set use default
-            if (empty($row['attribute_set'])) {
-                $row['attribute_set'] = !empty($row['attribute_set_id']) ? $row['attribute_set_id'] : 'Default';
-            }
-
-            if ($row['attribute_set']) {
-                // get attribute_set_id, if not throw error
-                $attributeSetId = $catalogConfig->getAttributeSetId('catalog_product', $row['attribute_set']);
-            }
-            if (!isset($attributeSetId)) {
-//                $this->printError($hlp->__("Invalid attribute set specified"), $line);
-//                return;
-                  $this->addError($hlp->__("Invalid attribute set specified line: %s", $line));
-            }
-
-            $this->setAttributeSetId($attributeSetId);
-
-            if (empty($row['type'])) {
-                $row['type'] = !empty($row['type_id']) ? $row['type_id'] : 'Simple Product';
-            }
-            // get product type_id, if not throw error
-            $typeId = $catalogConfig->getProductTypeId($row['type']);
-            if (!$typeId) {
-                  $this->addError($hlp->__("Invalid product type specified line: %s", $line));
-//                $this->printError($hlp->__("Invalid product type specified"), $line);
-//                return;
-            }
-            $this->setTypeId($typeId);
-        }
-
-        if ($errors = $this->getErrors()) {
-            $this->unsetData();
-//            $this->printError(join("
    ",$errors));
-            $this->resetErrors();
-            return false;
-        }
-
-        $entity = $this->getResource();
-
-        //print_r($entity);
-        foreach ($row as $field=>$value) {
-            $attribute = $entity->getAttribute($field);
-            if (!$attribute) {
-                continue;
-            }
-
-            if ($attribute->usesSource()) {
-                $source = $attribute->getSource();
-                $optionId = $catalogConfig->getSourceOptionId($source, $value);
-                if (is_null($optionId)) {
-                    //$this->printError($hlp->__("Invalid attribute option specified for attribute attribute %s (%s)", $field, $value), $line);
-                }
-                $value = $optionId;
-            }
-
-            $this->setData($field, $value);
-        }
-
-        $postedStores = array(0=>0);
-        if (isset($row['store'])) {
-            foreach (explode(',', $row['store']) as $store) {
-                $storeId = Mage::app()->getStore($store)->getId();
-                if (!$this->hasStoreId()) {
-                    $this->setStoreId($storeId);
-                }
-                $postedStores[$storeId] = $this->getStoreId();
-            }
-        }
-
-        $this->setPostedStores($postedStores);
-
-        if (isset($row['categories'])) {
-            $this->setCategoryIds($row['categories']);
-        }
-        return $this;
-    }
-
-    function addError($error)
-    {
-        $this->_errors[] = $error;
-    }
-
-    function getErrors()
-    {
-        return $this->_errors;
-    }
-
-    function resetErrors()
-    {
-        $this->_errors = array();
-    }
-
-    function printError($error, $line = null)
-    {
-        if ($error == null) return false;
-        $img = 'error_msg_icon.gif';
-        $liStyle = 'background-color:#FDD; ';
-        echo '
  • ';
-        echo '';
-        echo $error;
-        if ($line) {
-            echo ', Line: '.$line.'';
-        }
-        echo "
    • ";
-    }
-
     public function addAttributeUpdate($code, $value, $store)
     {
         $oldValue = $this->getData($code);
@@ -1402,4 +1223,47 @@ public function canBeShowInCategory($categoryId)
     {
         return $this->_getResource()->canBeShowInCategory($this, $categoryId);
     }
+
+
+    public function getAvailableInCategories()
+    {
+        $allCategories = array();
+        if (is_null($this->getData('_available_in_categories'))) {
+            $assigned = $this->getCategoryIds();
+            foreach ($assigned as $one) {
+                $allCategories[] = $one;
+                $anchors = Mage::getModel('catalog/category')->load($one)->getAnchorsAbove();
+                foreach ($anchors as $anchor) {
+                	$allCategories[] = $anchor;
+                }
+            }
+
+            $this->setData('_available_in_categories', $allCategories);
+        }
+        return $this->getData('_available_in_categories');
+    }
+
+    /**
+     * Deprecated since 1.1.5
+     */
+    public function getImageUrl()
+    {
+        return (string)Mage::helper('catalog/image')->init($this, 'image')->resize(265);
+    }
+
+    /**
+     * Deprecated since 1.1.5
+     */
+    public function getSmallImageUrl($width = 88, $height = 77)
+    {
+        return (string)Mage::helper('catalog/image')->init($this, 'small_image')->resize($width, $height);
+    }
+
+    /**
+     * Deprecated since 1.1.5
+     */
+    public function getThumbnailUrl($width = 75, $height = 75)
+    {
+        return (string)Mage::helper('catalog/image')->init($this, 'thumbnail')->resize($width, $height);
+    }
 }
\ No newline at end of file
diff --git a/app/code/core/Mage/Catalog/Model/Product/Api.php b/app/code/core/Mage/Catalog/Model/Product/Api.php
index 7d69240a38..98c7a0af87 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Api.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Api.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Api.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Api.php
index 014f46e418..b7fc5eddf6 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Api.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Api.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -92,22 +98,14 @@ public function options($attributeId, $store = null)
         if (!$attribute->getId()) {
             $this->_fault('not_exists');
         }
-
-        $result = array();
+        $options = array();
         if ($attribute->usesSource()) {
-            foreach ($attribute->getSource()->getAllOptions() as $optionId=>$optionValue) {
-                if (is_array($optionValue)) {
-                    $result[] = $optionValue;
-                } else {
-                    $result[] = array(
-                        'value' => $optionId,
-                        'label' => $optionValue
-                    );
-                }
-            }
+            $options = Mage::getResourceModel('eav/entity_attribute_option_collection')
+                ->setAttributeFilter($attribute->getId())
+                ->setStoreFilter()
+                ->load()
+                ->toOptionArray();
         }
-
-        return $result;
+        return $options;
     }
-
 } // Class Mage_Catalog_Model_Product_Attribute_Api End
\ No newline at end of file
diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Media.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Media.php
index 91030d50d5..26c5d5f09b 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Media.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Media.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Price.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Price.php
index 26815096ae..30c5022bb0 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Price.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Price.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Startdate.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Startdate.php
index b7c55e3ee4..2aa25a8051 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Startdate.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Startdate.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -36,8 +42,8 @@ public function beforeSave($object)
         $startDate = $object->getData($attributeName);
 
         if ($startDate=='' && $object->getSpecialPrice()) {
-            //$startDate = Mage::app()->getLocale()->date();
-            $startDate = Mage::getModel('core/date')->gmtDate();
+            $startDate = Mage::app()->getLocale()->date();
+//            $startDate = Mage::getModel('core/date')->gmtDate('');
         }
 
         $object->setData($attributeName, $startDate);
diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Tierprice.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Tierprice.php
index e30ffd175c..0895ec9d54 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Tierprice.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Tierprice.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Urlkey.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Urlkey.php
index 7a29cc63df..7b4fb10c46 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Urlkey.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Urlkey.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Frontend/Image.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Frontend/Image.php
index 9cbb68d336..a2ccb76175 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Frontend/Image.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Frontend/Image.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Media/Api.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Media/Api.php
index 365cdf3445..b61dfea825 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Media/Api.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Media/Api.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Set/Api.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Set/Api.php
index 27d939aba5..b6786c99c1 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Set/Api.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Set/Api.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Tierprice/Api.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Tierprice/Api.php
index 947f895423..049f3fd74e 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Tierprice/Api.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Tierprice/Api.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/Model/Product/Compare/Item.php b/app/code/core/Mage/Catalog/Model/Product/Compare/Item.php
index 56ca8c8d69..6853476223 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Compare/Item.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Compare/Item.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/Model/Product/Compare/List.php b/app/code/core/Mage/Catalog/Model/Product/Compare/List.php
index 78c0c60db5..071397aaaf 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Compare/List.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Compare/List.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/Model/Product/Image.php b/app/code/core/Mage/Catalog/Model/Product/Image.php
index d4c334426a..c7d497cf86 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Image.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Image.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/Model/Product/Link.php b/app/code/core/Mage/Catalog/Model/Product/Link.php
index 79fa769c77..9591452b7c 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Link.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Link.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -91,6 +97,15 @@ public function getProductCollection()
         return $collection;
     }
 
+    /**
+     * Retrieve link collection
+     */
+    public function getLinkCollection()
+    {
+        $collection = Mage::getResourceModel('catalog/product_link_collection')
+            ->setLinkModel($this);
+        return $collection;
+    }
 
     public function getAttributes($type=null)
     {
diff --git a/app/code/core/Mage/Catalog/Model/Product/Link/Api.php b/app/code/core/Mage/Catalog/Model/Product/Link/Api.php
index ae79999f10..d9151ec002 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Link/Api.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Link/Api.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/Model/Product/Media/Config.php b/app/code/core/Mage/Catalog/Model/Product/Media/Config.php
index f507206f47..0d6e4b3184 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Media/Config.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Media/Config.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/Model/Product/Option.php b/app/code/core/Mage/Catalog/Model/Product/Option.php
index aa039a7d39..ee4a811e54 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Option.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Option.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -318,16 +324,17 @@ public function deleteTitles($option_id)
      * get Product Option Collection
      *
      * @param Mage_Catalog_Model_Product $product
-     * @return unknown
+     * @return Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Collection
      */
     public function getProductOptionCollection(Mage_Catalog_Model_Product $product)
     {
         $collection = $this->getCollection()
             ->addFieldToFilter('product_id', $product->getId())
-            ->getOptions($product->getStoreId())
+            ->addTitleToResult($product->getStoreId())
+            ->addPriceToResult($product->getStoreId())
             ->setOrder('sort_order', 'asc')
             ->setOrder('title', 'asc')
-            ->addValuesToResult();
+            ->addValuesToResult($product->getStoreId());
 
         return $collection;
     }
diff --git a/app/code/core/Mage/Catalog/Model/Product/Option/Value.php b/app/code/core/Mage/Catalog/Model/Product/Option/Value.php
index 00dc5c7c8e..ec3a9b154b 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Option/Value.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Option/Value.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/Model/Product/Status.php b/app/code/core/Mage/Catalog/Model/Product/Status.php
index 80f9730230..40600cf563 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Status.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Status.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/Model/Product/Type.php b/app/code/core/Mage/Catalog/Model/Product/Type.php
index 3c95c62034..462b5c5bdc 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Type.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Type.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/Model/Product/Type/Abstract.php b/app/code/core/Mage/Catalog/Model/Product/Type/Abstract.php
index 69f0957105..2848f39c3e 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Type/Abstract.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Type/Abstract.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/Model/Product/Type/Api.php b/app/code/core/Mage/Catalog/Model/Product/Type/Api.php
index 67b9ce31b7..064e76403b 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Type/Api.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Type/Api.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/Model/Product/Type/Configurable.php b/app/code/core/Mage/Catalog/Model/Product/Type/Configurable.php
index bee3743896..8ac64416a9 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Type/Configurable.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Type/Configurable.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -37,6 +43,7 @@ class Mage_Catalog_Model_Product_Type_Configurable extends Mage_Catalog_Model_Pr
      */
     protected $_usedProductAttributeIds = null;
     protected $_usedProductAttributes   = null;
+    protected $_usedAttributes          = null;
     protected $_configurableAttributes  = null;
     protected $_usedProductIds  = null;
     protected $_usedProducts    = null;
@@ -123,8 +130,11 @@ public function getUsedProductAttributes()
     {
         if (is_null($this->_usedProductAttributes)) {
             $this->_usedProductAttributes = array();
+            $this->_usedAttributes = array();
             foreach ($this->getConfigurableAttributes() as $attribute) {
-                $this->_usedProductAttributes[$attribute->getProductAttribute()->getId()] = $attribute->getProductAttribute();
+                $id = $attribute->getProductAttribute()->getId();
+                $this->_usedProductAttributes[$id] = $attribute->getProductAttribute();
+                $this->_usedAttributes[$id] = $attribute;
             }
         }
         return $this->_usedProductAttributes;
@@ -348,15 +358,15 @@ public function getSelectedAttributesInfo()
         Varien_Profiler::start('CONFIGURABLE:'.__METHOD__);
         if ($attributesOption = $this->getProduct()->getCustomOption('attributes')) {
             $data = unserialize($attributesOption->getValue());
-            $usedAttributes = $this->getUsedProductAttributes();
+            $this->getUsedProductAttributeIds();
 
             foreach ($data as $attributeId => $attributeValue) {
-                if (isset($usedAttributes[$attributeId])) {
-                    $attribute = $usedAttributes[$attributeId];
-                    $label = $attribute->getFrontend()->getLabel();
-
-                    if ($attribute->getSourceModel()) {
-                        $value = $attribute->getSource()->getOptionText($attributeValue);
+                if (isset($this->_usedAttributes[$attributeId])) {
+                    $attribute = $this->_usedAttributes[$attributeId];
+                    $label = $attribute->getLabel();
+                    $value = $attribute->getProductAttribute();
+                    if ($value->getSourceModel()) {
+                        $value = $value->getSource()->getOptionText($attributeValue);
                     }
                     else {
                         $value = '';
diff --git a/app/code/core/Mage/Catalog/Model/Product/Type/Configurable/Attribute.php b/app/code/core/Mage/Catalog/Model/Product/Type/Configurable/Attribute.php
index 393f934e0b..f43bf9a0ad 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Type/Configurable/Attribute.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Type/Configurable/Attribute.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/Model/Product/Type/Configurable/Price.php b/app/code/core/Mage/Catalog/Model/Product/Type/Configurable/Price.php
index 610242b4c8..c1b53ade40 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Type/Configurable/Price.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Type/Configurable/Price.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/Model/Product/Type/Grouped.php b/app/code/core/Mage/Catalog/Model/Product/Type/Grouped.php
index 24ee1d49c5..1c8be8f2f6 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Type/Grouped.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Type/Grouped.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/Model/Product/Type/Price.php b/app/code/core/Mage/Catalog/Model/Product/Type/Price.php
index 2e18dd43ef..26f00626f7 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Type/Price.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Type/Price.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -28,6 +34,8 @@
 class Mage_Catalog_Model_Product_Type_Price
 {
 
+    static $attributeCache = array();
+
     /**
      * Default action to get price of product
      *
diff --git a/app/code/core/Mage/Catalog/Model/Product/Type/Simple.php b/app/code/core/Mage/Catalog/Model/Product/Type/Simple.php
index bd87e2df7d..87464fad2f 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Type/Simple.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Type/Simple.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/Model/Product/Type/Virtual.php b/app/code/core/Mage/Catalog/Model/Product/Type/Virtual.php
index a37459c4ff..176ab1e075 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Type/Virtual.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Type/Virtual.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/Model/Product/Url.php b/app/code/core/Mage/Catalog/Model/Product/Url.php
index 97928f037b..026d89c7fb 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Url.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Url.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -151,66 +157,4 @@ public function getUrlPath($product, $category=null)
 
         return $path;
     }
-
-    public function getImageUrl($product)
-    {
-        $url = false;
-        if (!$this->_validImage($product->getImage())) {
-            $url = Mage::getDesign()->getSkinUrl('images/no_image.jpg');
-        }
-        elseif ($attribute = $product->getResource()->getAttribute('image')) {
-            $url = $attribute->getFrontend()->getUrl($product);
-        }
-        return $url;
-    }
-
-    public function getCustomImageUrl($product, $size, $extension=null, $watermark=null)
-    {
-        $url = false;
-        if ($attribute = $this->_validImage($product->getResource()->getAttribute('image'))) {
-            $url = Mage::getModel('media/image')
-                    ->setConfig(Mage::getSingleton('catalog/product_media_config'))
-                    ->getSpecialLink($attribute, $size, $extension, $watermark);
-        }
-        return $url;
-    }
-
-    public function getSmallImageUrl($product)
-    {
-        $url = false;
-        if (!$this->_validImage($product->getSmallImage())) {
-            $url = Mage::getDesign()->getSkinUrl('images/no_image.jpg');
-        }
-        elseif ($attribute = $product->getResource()->getAttribute('small_image')) {
-            $url = $attribute->getFrontend()->getUrl($product);
-        }
-        return $url;
-    }
-
-    public function getCustomSmallImageUrl($product, $size, $extension=null, $watermark=null)
-    {
-        $url = false;
-        if ($attribute = $this->_validImage($product->getData('small_image'))) {
-            try {
-                $url = Mage::getModel('media/image')
-                        ->setConfig(Mage::getSingleton('catalog/product_media_config'))
-                        ->getSpecialLink($attribute, $size, $extension, $watermark);
-            } catch (Exception $e) {
-                $url = false;
-            }
-        }
-        return $url;
-    }
-
-    public function getThumbnailUrl($product)
-    {
-        $url = false;
-        if (!$this->_validImage($product->getThumbnail())) {
-            $url = Mage::getDesign()->getSkinUrl('images/no_image.jpg');
-        }
-        elseif ($attribute = $product->getResource()->getAttribute('thumbnail')) {
-            $url = $attribute->getFrontend()->getUrl($product);
-        }
-        return $url;
-    }
 }
\ No newline at end of file
diff --git a/app/code/core/Mage/Catalog/Model/Product/Visibility.php b/app/code/core/Mage/Catalog/Model/Product/Visibility.php
index b4a368dafa..d59a6ba219 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Visibility.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Visibility.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/Model/Product/Website.php b/app/code/core/Mage/Catalog/Model/Product/Website.php
index 5c43d8750b..0b67239d3a 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Website.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Website.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Attribute.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Attribute.php
index 1dbf2fafe2..f1669593e0 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Attribute.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Attribute.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Abstract.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Abstract.php
index 28e9521bd7..ffec9ba494 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Abstract.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Abstract.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category.php
index e3010a623e..2fc62d3a63 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -76,6 +82,17 @@ protected function _getTree()
 
     protected function _beforeDelete(Varien_Object $object){
         parent::_beforeDelete($object);
+
+        $toUpdateChild = explode('/',substr($object->getPath(),0,strrpos($object->getPath(),'/')));
+         $child = $this->getChildrenCount($object->getId());
+         $child+=1; 
+        // BUG here
+        $this->_getWriteAdapter()->update(
+		        $this->getEntityTable(),
+		        array('children_count'=>new Zend_Db_Expr('`children_count`-'.$child)),
+		        $this->_getWriteAdapter()->quoteInto('entity_id IN(?)', $toUpdateChild))
+      		  ;
+
         if ($child = $this->_getTree()->getNodeById($object->getId())) {
             $children = $child->getChildren();
             foreach ($children as $child) {
@@ -92,8 +109,22 @@ protected function _beforeSave(Varien_Object $object)
 
         if (!$object->getId()) {
             $object->setPosition($this->_getMaxPosition($object->getPath()) + 1);
-            $object->setLevel(count(explode('/', $object->getPath())));
+            $path  = explode('/', $object->getPath());
+            $level = count($path);
+            $object->setLevel($level);
+            if ($level) {
+                $object->setParentId($path[$level - 1]);
+            }
             $object->setPath($object->getPath() . '/');
+
+           $toUpdateChild = explode('/',$object->getPath());
+
+            $this->_getWriteAdapter()->update(
+		        $this->getEntityTable(),
+		        array('children_count'=>new Zend_Db_Expr('`children_count`+1')),
+		        $this->_getWriteAdapter()->quoteInto('entity_id IN(?)', $toUpdateChild))
+      		  ;
+
         }
         return $this;
     }
@@ -111,10 +142,31 @@ protected function _afterSave(Varien_Object $object)
             //$this->save($object);
         }
         $categoryIds = explode('/', $object->getPath());
+
+
+
+
         $this->refreshProductIndex($categoryIds);
+        //$this->_saveCountChidren($object);
         return parent::_afterSave($object);
     }
 
+    protected function _saveCountChidren($object)
+    {
+        $chidren = $object->getChildren();
+        if (strlen($chidren)>0) {
+            $chidrenCount = count(explode(',', $chidren));
+        } else {
+            $chidrenCount = 0;
+        }
+        $this->_getWriteAdapter()->update($this->getEntityTable(),
+            array('children_count'=>$chidrenCount),
+            $this->_getWriteAdapter()->quoteInto('entity_id=?', $object->getId())
+        );
+
+        return $this;
+    }
+
     protected function _savePath($object)
     {
         if ($object->getId()) {
@@ -294,7 +346,7 @@ public function getStoreIds($category)
             $stores[$store->getId()] = $store->getId();
         }
 
-        $entityStoreId = $this->getStoreId();
+        $entityStoreId = $category->getStoreId();
         if (!in_array($entityStoreId, $stores)) {
             array_unshift($stores, $entityStoreId);
         }
@@ -318,9 +370,45 @@ public function getProductsPosition($category)
         $positions = $this->_getWriteAdapter()->fetchPairs($select);
         return $positions;
     }
+    
+    public function getChildrenCount($categoryId)
+    {
+        $select = $this->_getReadAdapter()->select()
+            ->from($this->getEntityTable(), 'children_count')
+            ->where('entity_id=?', $categoryId);
+
+        $child = $this->_getReadAdapter()->fetchOne($select);
+        
+        return $child;
+    }
 
-    public function move(Mage_Catalog_Model_Category $category, $newParentId)
+   // public function move(Mage_Catalog_Model_Category $category, $newParentId)
+    public function move($categoryId, $newParentId)
     {
+        $category   = Mage::getModel('catalog/category')->load($categoryId);
+        $oldParent  = $category->getParentCategory();
+        $newParent  = Mage::getModel('catalog/category')->load($newParentId);
+        
+        $child = $this->getChildrenCount($category->getId());
+        $child+=1;
+
+
+        $toUpdateChild = explode('/',$newParent->getPath());
+        $this->_getWriteAdapter()->update(
+		        $this->getEntityTable(),
+		        array('children_count'=>new Zend_Db_Expr('`children_count`+' . $child)),
+		        $this->_getWriteAdapter()->quoteInto('entity_id IN(?)', $toUpdateChild))
+      		  ;
+
+      	$toUpdateChild = explode('/', $oldParent->getPath());
+      	$this->_getWriteAdapter()->update(
+		        $this->getEntityTable(),
+		        array('children_count'=>new Zend_Db_Expr('`children_count`-' . $child)),
+		        $this->_getWriteAdapter()->quoteInto('entity_id IN(?)', $toUpdateChild))
+      		  ;
+        return ;
+
+
         $oldStoreId = $category->getStoreId();
         $parent = Mage::getModel('catalog/category')
             ->setStoreId($category->getStoreId())
@@ -329,7 +417,6 @@ public function move(Mage_Catalog_Model_Category $category, $newParentId)
         $newParent = Mage::getModel('catalog/category')
             ->setStoreId($category->getStoreId())
             ->load($newParentId);
-
         $oldParentStores = $parent->getStoreIds();
         $newParentStores = $newParent->getStoreIds();
 
@@ -421,10 +508,10 @@ public function refreshProductIndex($categoryIds = array())
             ->order('level')
             ->order('path');
         if (is_array($categoryIds) && !empty($categoryIds)) {
-        	$select->where('entity_id IN (?)', $categoryIds);
+            $select->where('entity_id IN (?)', $categoryIds);
         }
         elseif (is_numeric($categoryIds)) {
-        	$select->where('entity_id=?', $categoryIds);
+            $select->where('entity_id=?', $categoryIds);
         }
 
         $categories = $this->_getWriteAdapter()->fetchAll($select);
@@ -447,4 +534,34 @@ public function refreshProductIndex($categoryIds = array())
         }
         return $this;
     }
-}
\ No newline at end of file
+
+    public function findWhereAttributeIs($entityIdsFilter, $attribute, $expectedValue)
+    {
+        $select = $this->_getReadAdapter()->select()
+            ->from($attribute->getBackend()->getTable(), array('entity_id'))
+            ->where('attribute_id = ?', $attribute->getId())
+            ->where('value = ?', $expectedValue)
+            ->where('entity_id in (?)', $entityIdsFilter);
+
+        return $this->_getReadAdapter()->fetchCol($select);
+    }
+
+    public function getProductCount($category)
+    {
+
+        $productTable =Mage::getSingleton('core/resource')->getTableName('catalog/category_product');
+
+            $select =  $this->getReadConnection()->select();
+            $select->from(
+                    array('main_table'=>$productTable),
+                    array(new Zend_Db_Expr('COUNT(main_table.product_id)'))
+                )
+                ->where('main_table.category_id = ?', $category->getId())
+                ->group('main_table.category_id');
+
+            $counts =$this->getReadConnection()->fetchOne($select);
+
+            return intval($counts);
+
+    }
+}
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Frontend/Image.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Frontend/Image.php
index ceb6378a7f..4a6ba10ab5 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Frontend/Image.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Frontend/Image.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Source/Layout.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Source/Layout.php
index 8fbeb36891..0eafe68f62 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Source/Layout.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Source/Layout.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Source/Mode.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Source/Mode.php
index 08d1da8724..10aa66e84d 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Source/Mode.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Source/Mode.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Source/Page.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Source/Page.php
index 665c5c97aa..4064d4a345 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Source/Page.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Source/Page.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Collection.php
index c052f5e1e5..b3bb93403a 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Collection.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Collection.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Tree.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Tree.php
index a850f5ee49..855584b7b8 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Tree.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Tree.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -114,7 +120,9 @@ public function addCollectionData($collection=null, $sorted=false, $exclude=arra
             $collection->load();
 
             foreach ($collection as $category) {
-                $this->getNodeById($category->getId())->addData($category->getData());
+                if ($this->getNodeById($category->getId())) {
+                    $this->getNodeById($category->getId())->addData($category->getData());
+                }
             }
         }
 
@@ -243,9 +251,97 @@ protected function _getDefaultCollection($sorted=false)
      *
      */
     public function move($category, $newParent, $prevNode = null) {
+        Mage::getResourceSingleton('catalog/category')->move($category->getId(), $newParent->getId());
         parent::move($category, $newParent, $prevNode);
         Mage::app()->getCache()->clean(Zend_Cache::CLEANING_MODE_MATCHING_TAG,
             array(Mage_Catalog_Model_Category::CACHE_TAG));
     }
 
+    /**
+     * Load whole category tree, that will include specified categories ids.
+     *
+     * @param array $ids
+     * @param bool $addCollectionData
+     * @return Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Tree
+     */
+    public function loadByIds($ids, $addCollectionData = true)
+    {
+        // load first two levels, if no ids specified
+        if (empty($ids)) {
+            $select = $this->_conn->select()
+                ->from($this->_table, 'entity_id')
+                ->where('`level` <= 2');
+            $ids = $this->_conn->fetchCol($select);
+        }
+        if (!is_array($ids)) {
+            $ids = array($ids);
+        }
+        foreach ($ids as $key => $id) {
+            $ids[$key] = (int)$id;
+        }
+
+        // collect paths of specified IDs and prepare to collect all their parents and neighbours
+        $select = $this->_conn->select()
+            ->from($this->_table, array('path', 'level'))
+            ->where(sprintf('entity_id IN (%s)', implode(', ', $ids)));
+        $where = array('`level`=0' => true);
+        foreach ($this->_conn->fetchAll($select) as $item) {
+            $path  = explode('/', $item['path']);
+            $level = (int)$item['level'];
+            while ($level > 0)
+            {
+                $path[count($path) - 1] = '%';
+                $where[sprintf("`level`=%d AND `path` LIKE '%s'", $level, implode('/', $path))] = true;
+                array_pop($path);
+                $level--;
+            }
+        }
+        $where = array_keys($where);
+
+        // get all required records
+        if ($addCollectionData) {
+            $select = $this->_getDefaultCollection($this->_orderField)
+                ->getSelect();
+            // add attributes to select
+            foreach (array('name', 'url_key', 'is_active') as $attributeCode) {
+                $attribute = Mage::getResourceSingleton('catalog/category')->getAttribute($attributeCode);
+                $tableAs   = "_$attributeCode";
+                $select->joinLeft(
+                    array($tableAs => $attribute->getBackend()->getTable()),
+                    sprintf('`%1$s`.entity_id=e.entity_id AND `%1$s`.attribute_id=%2$d AND `%1$s`.entity_type_id=e.entity_type_id',
+                        $tableAs, $attribute->getData('attribute_id')
+                    ),
+                    array($attributeCode => 'value')
+                );
+            }
+            // count products qty
+            $select->joinLeft(array('_category_product' => Mage::getSingleton('core/resource')->getTableName('catalog/category_product')),
+                'e.entity_id=_category_product.category_id',
+                array('product_count' => 'COUNT(_category_product.product_id)')
+            )
+            ->group('e.entity_id');
+        }
+        else {
+            $select = clone $this->_select;
+            $select->order($this->_orderField . ' ASC');
+        }
+        $select->where(implode(' OR ', $where));
+
+        // get array of records and add them as nodes to the tree
+        $arrNodes = $this->_conn->fetchAll($select);
+        if (!$arrNodes) {
+            return false;
+        }
+        $childrenItems = array();
+        foreach ($arrNodes as $nodeInfo) {
+            $pathToParent = explode('/', $nodeInfo[$this->_pathField]);
+            array_pop($pathToParent);
+            $pathToParent = implode('/', $pathToParent);
+            $childrenItems[$pathToParent][] = $nodeInfo;
+        }
+        $this->addChildNodes($childrenItems, '', null);
+
+        return $this;
+    }
+
 }
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Collection/Abstract.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Collection/Abstract.php
index 7cf87d4607..ae93f0aadb 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Collection/Abstract.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Collection/Abstract.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product.php
index 5961ac1c06..0ae14b229f 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -221,6 +227,13 @@ public function refreshIndex($product)
             $categoriesSelect = $this->_getWriteAdapter()->select()->from($this->getTable('catalog/category'))
                 ->where('entity_id IN (?)', $categoryIds);
             $categoriesInfo = $this->_getWriteAdapter()->fetchAll($categoriesSelect);
+
+            // get categories positions (bug #6940)
+            $select = $this->_getWriteAdapter()->select()
+                ->from($this->getTable('catalog/category_product'), array('category_id', 'position'))
+                ->where('product_id=' . $product->getId());
+            $categoriesPositions = $this->_getWriteAdapter()->fetchPairs($select);
+
             $indexCategoryIds = array();
             foreach ($categoriesInfo as $categoryInfo) {
                 $ids = explode('/', $categoryInfo['path']);
@@ -232,7 +245,7 @@ public function refreshIndex($product)
                 $data = array(
                     'category_id'   => $categoryId,
                     'product_id'    => $product->getId(),
-                    'position'      => 0,
+                    'position'      => (isset($categoriesPositions[(int)$categoryId]) ? $categoriesPositions[(int)$categoryId] : 0),
                     'is_parent'     => in_array($categoryId, $categoryIds)
                 );
                 $this->_getWriteAdapter()->insert($this->getTable('catalog/category_product_index'), $data);
@@ -268,10 +281,17 @@ public function refreshEnabledIndex($store=null, $product=null)
         if (is_null($store) && is_null($product)) {
             Mage::throwException(Mage::helper('catalog')->__('For reindex enabled product(s) you need specify store or product'));
         }
-        elseif (is_null($product)) {
+        elseif (is_null($product) || is_array($product)) {
             $storeId    = $store->getId();
             $websiteId  = $store->getWebsiteId();
-        	$this->_getWriteAdapter()->delete($indexTable, 'store_id='.$storeId);
+
+            $productsCondition = '';
+            $deleteCondition = '';
+            if (is_array($product) && !empty($product)) {
+                $productsCondition  = $this->_getWriteAdapter()->quoteInto(' AND t_v_default.entity_id IN (?)', $product);
+                $deleteCondition    = $this->_getWriteAdapter()->quoteInto(' AND product_id IN (?)', $product);
+            }
+        	$this->_getWriteAdapter()->delete($indexTable, 'store_id='.$storeId.$deleteCondition);
         	$query = "INSERT INTO $indexTable
             SELECT
                 t_v_default.entity_id, {$storeId}, IFNULL(t_v.value, t_v_default.value)
@@ -286,7 +306,7 @@ public function refreshEnabledIndex($store=null, $product=null)
             LEFT JOIN {$statusTable} AS `t_s`
                 ON (t_s.entity_id = t_v_default.entity_id) AND (t_s.attribute_id='{$statusAttributeId}') AND (t_s.store_id='{$storeId}')
             WHERE
-                t_v_default.attribute_id='{$visibilityAttributeId}' AND t_v_default.store_id=0
+                t_v_default.attribute_id='{$visibilityAttributeId}' AND t_v_default.store_id=0{$productsCondition}
                 AND (IFNULL(t_s.value, t_s_default.value)=".Mage_Catalog_Model_Product_Status::STATUS_ENABLED.")";
         	$this->_getWriteAdapter()->query($query);
         }
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Gallery.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Gallery.php
index e19b311e18..9b13420cda 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Gallery.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Gallery.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Image.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Image.php
index 280fdb8490..f2dbb4dfa8 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Image.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Image.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Media.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Media.php
index ce38df5925..e17ce09999 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Media.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Media.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Tierprice.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Tierprice.php
index f90eb28d0c..5e1d617604 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Tierprice.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Tierprice.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Urlkey.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Urlkey.php
index 0663eb60a5..72fd9b7edf 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Urlkey.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Urlkey.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Frontend/Image.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Frontend/Image.php
index b8effbf73a..2327017246 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Frontend/Image.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Frontend/Image.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Frontend/Tierprice.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Frontend/Tierprice.php
index 453165145a..90d4af60fa 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Frontend/Tierprice.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Frontend/Tierprice.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Collection.php
index ba398973b1..51f2e5cc2e 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Collection.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Collection.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -559,9 +565,11 @@ public function addTaxPercents(){
 
     protected function _addTaxPercents(){
         $classToRate = array();
-
         $request = Mage::getSingleton('tax/calculation')->getRateRequest();
         foreach ($this as &$item) {
+            if (null === $item->getTaxClassId()) {
+                $item->setTaxClassId($item->getMinimalTaxClassId());
+            }
             if (!isset($classToRate[$item->getTaxClassId()])) {
                 $request->setProductClassId($item->getTaxClassId());
                 $classToRate[$item->getTaxClassId()] = Mage::getSingleton('tax/calculation')->getRate($request);
@@ -630,9 +638,9 @@ public function setVisibility($visibility)
 
     public function setOrder($attribute, $dir='desc')
     {
-        if ($attribute == 'price') {
+        $storeId = Mage::app()->getStore()->getId();
+        if ($attribute == 'price' && $storeId != 0) {
             $customerGroup = Mage::getSingleton('customer/session')->getCustomer()->getCustomerGroupId();
-            $storeId = Mage::app()->getStore()->getId();
 
             $priceAttributeId = $this->getAttribute('price')->getId();
 
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Compare/Item.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Compare/Item.php
index 5bee812917..db31b69dc7 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Compare/Item.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Compare/Item.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Compare/Item/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Compare/Item/Collection.php
index b65688f7b6..599edcd201 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Compare/Item/Collection.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Compare/Item/Collection.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Link.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Link.php
index 75f918764e..6504af76d6 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Link.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Link.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Link/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Link/Collection.php
new file mode 100644
index 0000000000..623b1aa3d7
--- /dev/null
+++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Link/Collection.php
@@ -0,0 +1,142 @@
+
+ */
+class Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Collection
+    extends Mage_Core_Model_Mysql4_Collection_Abstract
+{
+    protected $_product;
+    protected $_linkModel;
+    protected $_linkTypeId;
+
+    protected function _construct()
+    {
+        $this->_init('catalog/product_link');
+    }
+
+    /**
+     * Declare link model and initialize type attributes join
+     *
+     * @param   Mage_Catalog_Model_Product_Link $linkModel
+     * @return  Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Collection
+     */
+    public function setLinkModel($linkModel)
+    {
+        $this->_linkModel = $linkModel;
+        if ($linkModel->getLinkTypeId()) {
+            $this->_linkTypeId = $linkModel->getLinkTypeId();
+        }
+        return $this;
+    }
+    
+    /**
+     * Retrieve collection link model
+     *
+     * @return  Mage_Catalog_Model_Product_Link
+     */
+    public function getLinkModel()
+    {
+        return $this->_linkModel;
+    }
+    
+    /**
+     * Initialize collection parent product and add limitation join
+     *
+     * @param   Mage_Catalog_Model_Product $product
+     * @return  Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Collection
+     */
+    public function setProduct($product)
+    {
+        $this->_product = $product;
+        return $this;
+    }
+
+    /**
+     * Retrieve collection base product object
+     *
+     * @return Mage_Catalog_Model_Product
+     */
+    public function getProduct()
+    {
+        return $this->_product;
+    }
+    
+    /**
+     * Add link's type to filter
+     *
+     * @return Mage_Catalog_Model_Product
+     */
+    public function addLinkTypeIdFilter()
+    {
+        if ($this->_linkTypeId) {
+            $this->addFieldToFilter("link_type_id", $this->_linkTypeId);
+        }
+        return $this;
+    }
+
+    /**
+     * Add product to filter
+     *
+     * @return Mage_Catalog_Model_Product
+     */
+    public function addProductIdFilter()
+    {
+        if ($this->getProduct() && $this->getProduct()->getId()) {
+            $this->addFieldToFilter("product_id", $this->getProduct()->getId());
+        }
+        return $this;
+    }
+    
+    /**
+     * Join attributes
+     *
+     * @return Mage_Catalog_Model_Product
+     */
+    public function joinAttributes()
+    {
+        if ($this->getLinkModel()) {
+            $attributes = $this->getLinkModel()->getAttributes();
+            $attributesByType = array();
+            foreach ($attributes as $attribute) {
+                $table = $this->getLinkModel()->getAttributeTypeTable($attribute['type']);
+                $alias = 'link_attribute_'.$attribute['code'].'_'.$attribute['type'];
+                $this->getSelect()->joinLeft(
+                    array($alias => $table),
+                    $alias.'.link_id=main_table.link_id AND '.$alias.'.product_link_attribute_id='.$attribute['id'],
+                    array($attribute['code'] => 'value')
+                );
+            }
+        }
+        return $this;
+    }
+}
\ No newline at end of file
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Link/Product/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Link/Product/Collection.php
index 0805481de8..1783a76ebc 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Link/Product/Collection.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Link/Product/Collection.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option.php
index 2f4e95df19..40184f502e 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -122,6 +128,11 @@ protected function _afterSave(Mage_Core_Model_Abstract $object)
                         }
                     }// end foreach()
                 }
+            } elseif ($scope == Mage_Core_Model_Store::PRICE_SCOPE_WEBSITE && $object->getData('scope', 'price')) {
+                $this->_getWriteAdapter()->delete(
+                    $priceTable,
+                    $this->_getWriteAdapter()->quoteInto('option_id = '.$object->getId().' AND store_id = ?', $object->getStoreId())
+                );
             }
         }
 
@@ -170,6 +181,11 @@ protected function _afterSave(Mage_Core_Model_Abstract $object)
                             'title' => $object->getTitle()
                 ));
             }
+        } elseif ($object->getData('scope', 'title')) {
+            $this->_getWriteAdapter()->delete(
+                $titleTable,
+                $this->_getWriteAdapter()->quoteInto('option_id = '.$object->getId().' AND store_id = ?', $object->getStoreId())
+            );
         }
 
         return parent::_afterSave($object);
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option/Collection.php
index 77981fe9b9..5aa3794178 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option/Collection.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option/Collection.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -36,23 +42,6 @@ protected function _construct()
 
     public function getOptions($store_id)
     {
-/*
-SELECT
-    `main_table`.option_id,
-    `main_table`.type,
-    IFNULL(`option_title`.title,`default_option_title`.title) option_title,
-    IFNULL(option_price.price, default_option_price.price) option_price,
-    IFNULL(option_price.price_type, default_option_price.price_type) option_price_type
-FROM
-    catalog_product_option AS main_table
-    left join catalog_product_option_price as default_option_price ON default_option_price.option_id=main_table.option_id AND (default_option_price.store_id='0')
-    left join catalog_product_option_price as  option_price ON option_price.option_id=main_table.option_id AND option_price.store_id=1
-    inner join catalog_product_option_title AS default_option_title ON default_option_title.option_id = main_table.option_id
-    left join catalog_product_option_title AS option_title ON option_title.option_id = main_table.option_id AND option_title.store_id = 1
-WHERE
-    (product_id = '141') AND (default_option_title.store_id = '0')
-*/
-
         $this->getSelect()
             ->joinLeft(array('default_option_price'=>$this->getTable('catalog/product_option_price')),
                 '`default_option_price`.option_id=`main_table`.option_id AND '.$this->getConnection()->quoteInto('`default_option_price`.store_id=?',0),
@@ -103,8 +92,11 @@ public function addPriceToResult($store_id)
         return $this;
     }
 
-    public function addValuesToResult()
+    public function addValuesToResult($storeId = null)
     {
+        if (null === $storeId) {
+            $storeId = Mage::app()->getStore()->getId();
+        }
         $optionIds = array();
         foreach ($this as $option) {
             $optionIds[] = $option->getId();
@@ -112,8 +104,8 @@ public function addValuesToResult()
         if (!empty($optionIds)) {
             $values = Mage::getModel('catalog/product_option_value')
                 ->getCollection()
-                ->addTitleToResult(Mage::app()->getStore()->getId())
-                ->addPriceToResult(Mage::app()->getStore()->getId())
+                ->addTitleToResult($storeId)
+                ->addPriceToResult($storeId)
                 ->addOptionToFilter($optionIds)
                 ->setOrder('sort_order', 'asc')
                 ->setOrder('title', 'asc');
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option/Value.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option/Value.php
index 368767ac87..450de4c9de 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option/Value.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option/Value.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -113,13 +119,18 @@ protected function _afterSave(Mage_Core_Model_Abstract $object)
                     }
                 }// end of foreach()
             }
+        } elseif ($scope == Mage_Core_Model_Store::PRICE_SCOPE_WEBSITE && $object->getData('scope', 'price')) {
+            $this->_getWriteAdapter()->delete(
+                $priceTable,
+                $this->_getWriteAdapter()->quoteInto('option_type_id = '.$object->getId().' AND store_id = ?', $object->getStoreId())
+            );
         }
 
         //title
         if (!$object->getData('scope', 'title')) {
             $statement = $this->_getReadAdapter()->select()
                 ->from($titleTable)
-                ->where('option_type_id = '.$object->getId().' and store_id = ?', 0);
+                ->where('option_type_id = '.$object->getId().' AND store_id = ?', 0);
 
             if ($this->_getReadAdapter()->fetchOne($statement)) {
                 if ($object->getStoreId() == '0') {
@@ -143,7 +154,7 @@ protected function _afterSave(Mage_Core_Model_Abstract $object)
         if ($object->getStoreId() != '0' && !$object->getData('scope', 'title')) {
             $statement = $this->_getReadAdapter()->select()
                 ->from($titleTable)
-                ->where('option_type_id = '.$object->getId().' and store_id = ?', $object->getStoreId());
+                ->where('option_type_id = '.$object->getId().' AND store_id = ?', $object->getStoreId());
 
             if ($this->_getReadAdapter()->fetchOne($statement)) {
                 $this->_getWriteAdapter()->update(
@@ -160,6 +171,11 @@ protected function _afterSave(Mage_Core_Model_Abstract $object)
                             'title' => $object->getTitle()
                 ));
             }
+        } elseif ($object->getData('scope', 'title')) {
+            $this->_getWriteAdapter()->delete(
+                $titleTable,
+                $this->_getWriteAdapter()->quoteInto('option_type_id = '.$object->getId().' AND store_id = ?', $object->getStoreId())
+            );
         }
 
         return parent::_afterSave($object);
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option/Value/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option/Value/Collection.php
index ff6a0b3c44..08ba205850 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option/Value/Collection.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option/Value/Collection.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Status.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Status.php
index 9fb568d682..bc79a9a0f5 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Status.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Status.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable.php
index 4b830b6ff2..ad52a2ae89 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable/Attribute.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable/Attribute.php
index f9c43d70ff..34df3d48c3 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable/Attribute.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable/Attribute.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable/Attribute/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable/Attribute/Collection.php
index 654e872f55..bde956408c 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable/Attribute/Collection.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable/Attribute/Collection.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable/Product/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable/Product/Collection.php
index d9bcb0a9e9..129d1a169b 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable/Product/Collection.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable/Product/Collection.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Website.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Website.php
index 82be8c7a0a..000ab3a65a 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Website.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Website.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -32,6 +38,16 @@ protected function _construct()
         $this->_init('catalog/product_website', 'product_id');
     }
 
+    /**
+     * Get catalog product resource model
+     *
+     * @return Mage_Catalog_Model_Resource_Eav_Mysql4_Product
+     */
+    protected function _getProductResource()
+    {
+        return Mage::getResourceSingleton('catalog/product');
+    }
+
     /**
      * Removes products from websites
      *
@@ -85,17 +101,24 @@ public function addProducts($websiteIds, $productIds)
 
         // Before adding of products we should remove it old rows with same ids
         $this->removeProducts($websiteIds, $productIds);
-
-        foreach ($productIds as $productId) {
-            if ((int) $productId == 0) {
-                continue;
-            }
-            foreach ($websiteIds as $websiteId) {
+        foreach ($websiteIds as $websiteId) {
+            foreach ($productIds as $productId) {
+                if ((int) $productId == 0) {
+                    continue;
+                }
                 $this->_getWriteAdapter()->insert($this->getMainTable(), array(
                     'product_id' => $productId,
                     'website_id' => $websiteId
                 ));
             }
+            /**
+             * Refresh product enabled index
+             */
+            $storeIds = Mage::app()->getWebsite($websiteId)->getStoreIds();
+            foreach ($storeIds as $storeId) {
+                $store = Mage::app()->getStore($storeId);
+            	$this->_getProductResource()->refreshEnabledIndex($store, $productIds);
+            }
         }
 
         $this->_getWriteAdapter()->commit();
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Sendfriend.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Sendfriend.php
index c0eb89f291..3a8ba8348b 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Sendfriend.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Sendfriend.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Sendfriend/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Sendfriend/Collection.php
index 0ff683f0a4..7c6f443a96 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Sendfriend/Collection.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Sendfriend/Collection.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Setup.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Setup.php
index 8e9a4fda34..5e24a04788 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Setup.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Setup.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -493,6 +499,25 @@ public function getDefaultEntities()
                         'visible_on_front'  => false,
                         'unique'            => false,
                     ),
+                    'children_count' => array(
+                        'type'              => 'static',
+                        'backend'           => '',
+                        'frontend'          => '',
+                        'label'             => 'Children Count',
+                        'input'             => '',
+                        'class'             => '',
+                        'source'            => '',
+                        'global'            => Mage_Catalog_Model_Resource_Eav_Attribute::SCOPE_GLOBAL,
+                        'visible'           => false,
+                        'required'          => false,
+                        'user_defined'      => false,
+                        'default'           => '',
+                        'searchable'        => false,
+                        'filterable'        => false,
+                        'comparable'        => false,
+                        'visible_on_front'  => false,
+                        'unique'            => false,
+                    )
                 ),
             ),
             'catalog_product' => array(
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Url.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Url.php
index af2d929669..a8e2c87c7e 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Url.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Url.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -202,9 +208,7 @@ public function saveRewrite($rewriteData, $rewrite)
                 $this->_getWriteAdapter()->insert($this->getMainTable(), $rewriteData);
             }
             catch (Exception $e) {
-                var_dump($rewriteData);
-                echo $e;
-                die();
+                Mage::throwException(Mage::helper('catalog')->__('Url rewrie save problem.'));
             }
         }
         unset($rewriteData);
diff --git a/app/code/core/Mage/Catalog/Model/Sendfriend.php b/app/code/core/Mage/Catalog/Model/Sendfriend.php
index 0e44a6186b..02b6acb127 100644
--- a/app/code/core/Mage/Catalog/Model/Sendfriend.php
+++ b/app/code/core/Mage/Catalog/Model/Sendfriend.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/Model/Session.php b/app/code/core/Mage/Catalog/Model/Session.php
index 770589a6c7..bb3ffb481b 100644
--- a/app/code/core/Mage/Catalog/Model/Session.php
+++ b/app/code/core/Mage/Catalog/Model/Session.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/Model/Url.php b/app/code/core/Mage/Catalog/Model/Url.php
index 9d92aeff54..1baf1765ba 100644
--- a/app/code/core/Mage/Catalog/Model/Url.php
+++ b/app/code/core/Mage/Catalog/Model/Url.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/controllers/CategoryController.php b/app/code/core/Mage/Catalog/controllers/CategoryController.php
index 47c795702d..7c9b535db8 100644
--- a/app/code/core/Mage/Catalog/controllers/CategoryController.php
+++ b/app/code/core/Mage/Catalog/controllers/CategoryController.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/controllers/IndexController.php b/app/code/core/Mage/Catalog/controllers/IndexController.php
index 99efe65eb4..52f81f6ef4 100644
--- a/app/code/core/Mage/Catalog/controllers/IndexController.php
+++ b/app/code/core/Mage/Catalog/controllers/IndexController.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/controllers/Product/CompareController.php b/app/code/core/Mage/Catalog/controllers/Product/CompareController.php
index 088428dd82..22a07068aa 100644
--- a/app/code/core/Mage/Catalog/controllers/Product/CompareController.php
+++ b/app/code/core/Mage/Catalog/controllers/Product/CompareController.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/controllers/ProductController.php b/app/code/core/Mage/Catalog/controllers/ProductController.php
index 920e0e2172..f702f1a4f4 100644
--- a/app/code/core/Mage/Catalog/controllers/ProductController.php
+++ b/app/code/core/Mage/Catalog/controllers/ProductController.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/controllers/Seo/SitemapController.php b/app/code/core/Mage/Catalog/controllers/Seo/SitemapController.php
index 30a1272378..2f195dc214 100644
--- a/app/code/core/Mage/Catalog/controllers/Seo/SitemapController.php
+++ b/app/code/core/Mage/Catalog/controllers/Seo/SitemapController.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/etc/api.xml b/app/code/core/Mage/Catalog/etc/api.xml
index 0a1c39a323..1b9f2c6129 100644
--- a/app/code/core/Mage/Catalog/etc/api.xml
+++ b/app/code/core/Mage/Catalog/etc/api.xml
@@ -13,6 +13,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category    Mage
  * @package     Mage_Catalog
  * @copyright   Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/etc/config.xml b/app/code/core/Mage/Catalog/etc/config.xml
index 95b142bc57..1261b5cd2f 100644
--- a/app/code/core/Mage/Catalog/etc/config.xml
+++ b/app/code/core/Mage/Catalog/etc/config.xml
@@ -13,6 +13,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -22,7 +28,7 @@
 
     
         
-            0.7.50
+            0.7.52
         
     
 
diff --git a/app/code/core/Mage/Catalog/etc/convert.xml b/app/code/core/Mage/Catalog/etc/convert.xml
index bc44d38064..ef616f8268 100644
--- a/app/code/core/Mage/Catalog/etc/convert.xml
+++ b/app/code/core/Mage/Catalog/etc/convert.xml
@@ -13,6 +13,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/etc/system.xml b/app/code/core/Mage/Catalog/etc/system.xml
index 42a6cba65b..b35b17dbd8 100644
--- a/app/code/core/Mage/Catalog/etc/system.xml
+++ b/app/code/core/Mage/Catalog/etc/system.xml
@@ -13,6 +13,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -54,7 +60,7 @@
                             1
                             1
                         
-                        
+                        
                             
                             comma separated
                             text
@@ -67,7 +73,7 @@
 
 
 
-                        
+                        
                             
                             must be accessibility in values list
                             text
@@ -78,7 +84,7 @@
                             1
                         
 
-                        
+                        
                             
                             comma separated
                             text
@@ -89,7 +95,7 @@
                             1
                         
 
-                        
+                        
                             
                             must be accessibility in values list
                             text
@@ -132,7 +138,7 @@
                     1
                     1
                     
-                        
+                        
                             
                             text
                             3
@@ -141,7 +147,7 @@
                             1
                             cache refresh needed
                         
-                        
+                        
                             
                             text
                             2
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-install-0.7.0.php
index 804138b588..6a8b0dc559 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-install-0.7.0.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-install-0.7.0.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -523,6 +529,8 @@
     CONSTRAINT `FK_CATALOG_PRODUCT_ENABLED_INDEX_STORE` FOREIGN KEY (`store_id`) REFERENCES `{$installer->getTable('core_store')}` (`store_id`) ON DELETE CASCADE ON UPDATE CASCADE
   ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
+ALTER TABLE `{$this->getTable('catalog_category_entity')}` ADD `children_count` INT NOT NULL;
+
 ");
 
 }
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.6.40-0.7.0.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.6.40-0.7.0.php
index 3ce3f37e68..cf6b0e4ea4 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.6.40-0.7.0.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.6.40-0.7.0.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.0-0.7.1.php
index a907d2f763..d277f07a90 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.0-0.7.1.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.0-0.7.1.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.1-0.7.2.php
index a624b28e28..480aa3562a 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.1-0.7.2.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.1-0.7.2.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.11-0.7.12.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.11-0.7.12.php
index 59527657ba..e4a3de1e81 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.11-0.7.12.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.11-0.7.12.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.12-0.7.13.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.12-0.7.13.php
index 47fa66dadf..6051721b09 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.12-0.7.13.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.12-0.7.13.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.13-0.7.14.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.13-0.7.14.php
index e745bd0dcf..37475fca4e 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.13-0.7.14.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.13-0.7.14.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.14-0.7.15.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.14-0.7.15.php
index 064d49d2d1..d22e5f9f1d 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.14-0.7.15.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.14-0.7.15.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.15-0.7.16.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.15-0.7.16.php
index 2e308b2e31..8163d84063 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.15-0.7.16.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.15-0.7.16.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.16-0.7.17.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.16-0.7.17.php
index 47fa66dadf..6051721b09 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.16-0.7.17.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.16-0.7.17.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.17-0.7.18.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.17-0.7.18.php
index eff106a34f..359dcea1b2 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.17-0.7.18.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.17-0.7.18.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.18-0.7.19.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.18-0.7.19.php
index 455f3b8e4a..c2fd149405 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.18-0.7.19.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.18-0.7.19.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.19-0.7.20.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.19-0.7.20.php
index 59527657ba..e4a3de1e81 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.19-0.7.20.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.19-0.7.20.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.2-0.7.3.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.2-0.7.3.php
index 88faa89423..f0375db6b8 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.2-0.7.3.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.2-0.7.3.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.20-0.7.21.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.20-0.7.21.php
index 5788237f70..b452e0ebba 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.20-0.7.21.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.20-0.7.21.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.21-0.7.22.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.21-0.7.22.php
index 15110b667a..16ca9c38a6 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.21-0.7.22.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.21-0.7.22.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.22-0.7.23.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.22-0.7.23.php
index f3e73390d1..caa2534333 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.22-0.7.23.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.22-0.7.23.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.23-0.7.24.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.23-0.7.24.php
index fd744e1c2c..594ec2f3ac 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.23-0.7.24.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.23-0.7.24.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.24-0.7.25.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.24-0.7.25.php
index c0810c86f9..569341770d 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.24-0.7.25.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.24-0.7.25.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.25-0.7.26.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.25-0.7.26.php
index c0810c86f9..569341770d 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.25-0.7.26.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.25-0.7.26.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.26-0.7.27.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.26-0.7.27.php
index 295d947923..ae5b10de5f 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.26-0.7.27.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.26-0.7.27.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.27-0.7.28.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.27-0.7.28.php
index a5e37acef2..f1d8c2cd84 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.27-0.7.28.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.27-0.7.28.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.28-0.7.29.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.28-0.7.29.php
index 41b9055ca8..c67894ad34 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.28-0.7.29.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.28-0.7.29.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.29-0.7.30.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.29-0.7.30.php
index a76e91619c..4678ed7261 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.29-0.7.30.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.29-0.7.30.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.30-0.7.31.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.30-0.7.31.php
index adda0fedc2..8f291b78e5 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.30-0.7.31.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.30-0.7.31.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.31-0.7.32.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.31-0.7.32.php
index 092c900cd8..65a2d2df57 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.31-0.7.32.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.31-0.7.32.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.32-0.7.33.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.32-0.7.33.php
index ad11ea996f..5e50803690 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.32-0.7.33.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.32-0.7.33.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.33-0.7.34.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.33-0.7.34.php
index 092779c60d..9d2ebf7d4d 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.33-0.7.34.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.33-0.7.34.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.34-0.7.35.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.34-0.7.35.php
index b73481fe89..845debc2ef 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.34-0.7.35.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.34-0.7.35.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.35-0.7.36.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.35-0.7.36.php
index 3531c09e2f..4df2d15d62 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.35-0.7.36.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.35-0.7.36.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.36-0.7.37.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.36-0.7.37.php
index 039b0c0d07..e33085d7f0 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.36-0.7.37.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.36-0.7.37.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.37-0.7.38.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.37-0.7.38.php
index 2edbf1bfb9..9d7936031f 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.37-0.7.38.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.37-0.7.38.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.38-0.7.39.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.38-0.7.39.php
index 24a8f9770e..5872d2cb8f 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.38-0.7.39.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.38-0.7.39.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.39-0.7.40.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.39-0.7.40.php
index f640f6fd5c..75642ad4cf 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.39-0.7.40.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.39-0.7.40.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.4-0.7.5.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.4-0.7.5.php
index e871762185..3cafdbd9c7 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.4-0.7.5.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.4-0.7.5.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.40-0.7.41.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.40-0.7.41.php
index 45692d131c..baa9942d09 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.40-0.7.41.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.40-0.7.41.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.41-0.7.42.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.41-0.7.42.php
index 09eb489701..645b13dca4 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.41-0.7.42.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.41-0.7.42.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.42-0.7.43.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.42-0.7.43.php
index 0a7855c57e..6d9e44c943 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.42-0.7.43.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.42-0.7.43.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.43-0.7.44.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.43-0.7.44.php
index 1d75c08d39..735e8319b3 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.43-0.7.44.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.43-0.7.44.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.44-0.7.45.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.44-0.7.45.php
index 98c813b2a0..c12c489e53 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.44-0.7.45.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.44-0.7.45.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.45-0.7.46.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.45-0.7.46.php
index 93d46f3551..c071b7253e 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.45-0.7.46.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.45-0.7.46.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.46-0.7.47.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.46-0.7.47.php
index 3e6855a377..af854ff0af 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.46-0.7.47.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.46-0.7.47.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.47-0.7.48.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.47-0.7.48.php
index 4ce3bd2340..4f3b4bc4c6 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.47-0.7.48.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.47-0.7.48.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.48-0.7.49.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.48-0.7.49.php
index 49c48c2fa3..6a9b4a4aaf 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.48-0.7.49.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.48-0.7.49.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.49-0.7.50.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.49-0.7.50.php
index d2a9f36fff..f76445e60c 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.49-0.7.50.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.49-0.7.50.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.5-0.7.6.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.5-0.7.6.php
index 6afdf9c7bf..98e27e1492 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.5-0.7.6.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.5-0.7.6.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.50-0.7.51.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.50-0.7.51.php
new file mode 100644
index 0000000000..7fff4855aa
--- /dev/null
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.50-0.7.51.php
@@ -0,0 +1,44 @@
+startSetup();
+
+$this->getConnection()->addColumn($this->getTable('catalog_category_entity'), 'children_count', 'INT NOT NULL');
+
+$sql    = "SELECT * FROM `{$this->getTable('catalog_category_entity')}`";
+$data   = $this->getConnection()->fetchAll($sql);
+
+foreach ($data as $row) {
+    $sql    = "SELECT COUNT(*) FROM `{$this->getTable('catalog_category_entity')}` WHERE `path` REGEXP '^{$row['path']}\/([0-9]+)$'";
+    $count  = (int) $this->getConnection()->fetchOne($sql);
+
+    $this->run("UPDATE `{$this->getTable('catalog_category_entity')}`
+        SET `children_count` = $count
+        WHERE `entity_id` = {$row['entity_id']}");
+}
+
+$this->endSetup();
\ No newline at end of file
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.51-0.7.52.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.51-0.7.52.php
new file mode 100644
index 0000000000..39b3fde500
--- /dev/null
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.51-0.7.52.php
@@ -0,0 +1,51 @@
+startSetup();
+$table = $this->getTable('catalog/category_entity');
+$tableTmp = $table . "_tmp";
+$this->run("DROP TABLE IF EXISTS `{$tableTmp}`");
+
+$this->run("CREATE TABLE `{$tableTmp}` (
+  `entity_id` int(10) unsigned NOT NULL auto_increment,
+  `children_count` int(11) NOT NULL,
+  PRIMARY KEY  (`entity_id`)
+) ENGINE=InnoDB;
+");
+
+$this->run("INSERT INTO {$tableTmp} (SELECT e.entity_id, COUNT( ee.entity_id ) as children_count
+FROM `{$table}` e
+INNER JOIN `{$table}` ee ON ee.path LIKE CONCAT( e.path, '/%' )
+GROUP BY e.entity_id)");
+
+$this->run("UPDATE {$table}, {$tableTmp}
+SET {$table}.children_count = {$tableTmp}.children_count
+WHERE {$table}.entity_id = {$tableTmp}.entity_id");
+
+$this->run("DROP TABLE `{$tableTmp}`");
+
+$this->endSetup();
\ No newline at end of file
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.6-0.7.7.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.6-0.7.7.php
index 59527657ba..e4a3de1e81 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.6-0.7.7.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.6-0.7.7.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.7-0.7.8.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.7-0.7.8.php
index d7f5511a64..8af7c61439 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.7-0.7.8.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.7-0.7.8.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.8-0.7.9.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.8-0.7.9.php
index 35b520957a..fb73cecf5e 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.8-0.7.9.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.8-0.7.9.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/CatalogIndex/Model/Attribute.php b/app/code/core/Mage/CatalogIndex/Model/Attribute.php
index 69f01c09ba..7ebad38387 100644
--- a/app/code/core/Mage/CatalogIndex/Model/Attribute.php
+++ b/app/code/core/Mage/CatalogIndex/Model/Attribute.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_CatalogIndex
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/CatalogIndex/Model/Catalog/Index/Flag.php b/app/code/core/Mage/CatalogIndex/Model/Catalog/Index/Flag.php
new file mode 100644
index 0000000000..a825d921b8
--- /dev/null
+++ b/app/code/core/Mage/CatalogIndex/Model/Catalog/Index/Flag.php
@@ -0,0 +1,52 @@
+getState()) {
+            case self::STATE_QUEUED:
+                $this->setFlagData($this->getQueueInfo());
+                break;
+
+            case self::STATE_RUNNING:
+                $this->setFlagData(getmypid());
+                break;
+
+            default:
+                break;
+        }
+
+        return parent::_beforeSave();
+    }
+}
\ No newline at end of file
diff --git a/app/code/core/Mage/CatalogIndex/Model/Catalog/Index/Kill/Flag.php b/app/code/core/Mage/CatalogIndex/Model/Catalog/Index/Kill/Flag.php
new file mode 100644
index 0000000000..26dc707bd6
--- /dev/null
+++ b/app/code/core/Mage/CatalogIndex/Model/Catalog/Index/Kill/Flag.php
@@ -0,0 +1,29 @@
+getFlagData() == getmypid());
+    }
+}
\ No newline at end of file
diff --git a/app/code/core/Mage/CatalogIndex/Model/Data/Abstract.php b/app/code/core/Mage/CatalogIndex/Model/Data/Abstract.php
index c37733abd7..c624a641a7 100644
--- a/app/code/core/Mage/CatalogIndex/Model/Data/Abstract.php
+++ b/app/code/core/Mage/CatalogIndex/Model/Data/Abstract.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_CatalogIndex
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -187,6 +193,26 @@ public function getMinimalPrice($products, $store)
         return $data;
     }
 
+    /**
+     * Get tax class id for a product
+     *
+     * @param int $productId
+     * @param Mage_Core_Model_Store $store
+     * @return int
+     */
+    public function getTaxClassId($productId, $store)
+    {
+        $attributeId = Mage::getSingleton('eav/entity_attribute')->getIdByCode('catalog_product', 'tax_class_id');
+        $taxClassId  = $this->getResource()->getAttributeData(array($productId), array($attributeId), $store->getId());
+        if (is_array($taxClassId) && isset($taxClassId[0]['value'])) {
+            $taxClassId = $taxClassId[0]['value'];
+        }
+        else {
+            $taxClassId = 0;
+        }
+        return $taxClassId;
+    }
+
     /**
      * Return tier data for specified products in specified store
      *
diff --git a/app/code/core/Mage/CatalogIndex/Model/Data/Configurable.php b/app/code/core/Mage/CatalogIndex/Model/Data/Configurable.php
index 17e36a12cd..7a66d3b1bb 100644
--- a/app/code/core/Mage/CatalogIndex/Model/Data/Configurable.php
+++ b/app/code/core/Mage/CatalogIndex/Model/Data/Configurable.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_CatalogIndex
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -67,8 +73,8 @@ protected function _getLinkSettings()
     {
         return array(
                     'table'=>'catalog/product_super_link',
-                    'parent_field'=>'product_id',
-                    'child_field'=>'parent_id',
+                    'parent_field'=>'parent_id',
+                    'child_field'=>'product_id',
                     );
     }
 }
\ No newline at end of file
diff --git a/app/code/core/Mage/CatalogIndex/Model/Data/Grouped.php b/app/code/core/Mage/CatalogIndex/Model/Data/Grouped.php
index 085d3fb397..f52e29c45e 100644
--- a/app/code/core/Mage/CatalogIndex/Model/Data/Grouped.php
+++ b/app/code/core/Mage/CatalogIndex/Model/Data/Grouped.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_CatalogIndex
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/CatalogIndex/Model/Data/Simple.php b/app/code/core/Mage/CatalogIndex/Model/Data/Simple.php
index cbfdf0c083..2007ef7fee 100644
--- a/app/code/core/Mage/CatalogIndex/Model/Data/Simple.php
+++ b/app/code/core/Mage/CatalogIndex/Model/Data/Simple.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_CatalogIndex
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/CatalogIndex/Model/Data/Virtual.php b/app/code/core/Mage/CatalogIndex/Model/Data/Virtual.php
index ba5da84a28..f4a6730d25 100644
--- a/app/code/core/Mage/CatalogIndex/Model/Data/Virtual.php
+++ b/app/code/core/Mage/CatalogIndex/Model/Data/Virtual.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_CatalogIndex
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/CatalogIndex/Model/Indexer.php b/app/code/core/Mage/CatalogIndex/Model/Indexer.php
index 88f3146fd1..badb0e5030 100644
--- a/app/code/core/Mage/CatalogIndex/Model/Indexer.php
+++ b/app/code/core/Mage/CatalogIndex/Model/Indexer.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_CatalogIndex
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -104,10 +110,17 @@ protected function _addFilterableAttributesToCollection($collection)
     }
 */
 
-    public function buildEntityFilter($attributes, $values, &$filteredAttributes)
+    protected function _getBaseToSpecifiedCurrencyRate($code)
+    {
+        return Mage::app()->getStore()->getBaseCurrency()->getRate($code);;
+    }
+
+    public function buildEntityFilter($attributes, $values, &$filteredAttributes, $productCollection)
     {
         $filter = array();
         $store = Mage::app()->getStore()->getId();
+        $taxClassJoined = false;
+        $currentStoreCurrency = Mage::app()->getStore()->getCurrentCurrencyCode();
 
         foreach ($attributes as $attribute) {
             $code = $attribute->getAttributeCode();
@@ -127,13 +140,30 @@ public function buildEntityFilter($attributes, $values, &$filteredAttributes)
                                 $filter[$code]->where('attribute_id = ?', $attribute->getId());
                             }
                             if (is_array($values[$code])) {
+                                $additionalCalculations = '';
+                                $rateConversion = 1;
                                 if (isset($values[$code]['from']) && isset($values[$code]['to'])) {
 
                                     if ($values[$code]['from']) {
                                         if (!is_numeric($values[$code]['from'])) {
                                             $values[$code]['from'] = date("Y-m-d H:i:s", strtotime($values[$code]['from']));
                                         }
-                                        $filter[$code]->where('value >= ?', $values[$code]['from']);
+
+                                        if ($attribute->getFrontendInput() == 'price') {
+                                            if (isset($values[$code]['currency'])) {
+                                                $rateConversion = $this->_getBaseToSpecifiedCurrencyRate($values[$code]['currency']);
+                                            } else {
+                                                $rateConversion = $this->_getBaseToSpecifiedCurrencyRate($currentStoreCurrency);
+                                            }
+
+                                            if (!$taxClassJoined) {
+                                                Mage::helper('tax')->joinTaxClass($productCollection->getSelect(), $store, 'e');
+                                                $taxClassJoined = true;
+                                                $additionalCalculations = Mage::helper('tax')
+                                                    ->getPriceTaxSql('value', 'IFNULL(tax_class_c.value, tax_class_d.value)');
+                                            }
+                                        }
+                                        $filter[$code]->where("(value{$additionalCalculations})*{$rateConversion} >= ?", $values[$code]['from']);
                                     }
 
 
@@ -141,7 +171,21 @@ public function buildEntityFilter($attributes, $values, &$filteredAttributes)
                                         if (!is_numeric($values[$code]['to'])) {
                                             $values[$code]['to'] = date("Y-m-d H:i:s", strtotime($values[$code]['to']));
                                         }
-                                        $filter[$code]->where('value <= ?', $values[$code]['to']);
+                                        if ($attribute->getFrontendInput() == 'price') {
+                                            if (isset($values[$code]['currency'])) {
+                                                $rateConversion = $this->_getBaseToSpecifiedCurrencyRate($values[$code]['currency']);
+                                            } else {
+                                                $rateConversion = $this->_getBaseToSpecifiedCurrencyRate($currentStoreCurrency);
+                                            }
+
+                                            if (!$taxClassJoined) {
+                                                Mage::helper('tax')->joinTaxClass($productCollection->getSelect(), $store, 'e');
+                                                $taxClassJoined = true;
+                                                $additionalCalculations = Mage::helper('tax')
+                                                    ->getPriceTaxSql('value', 'IFNULL(tax_class_c.value, tax_class_d.value)');
+                                            }
+                                        }
+                                        $filter[$code]->where("(value{$additionalCalculations})*{$rateConversion} <= ?", $values[$code]['to']);
                                     }
                                 } else {
                                     $filter[$code]->where('value in (?)', $values[$code]);
@@ -298,77 +342,108 @@ public function reindexAttributes($attribute = null)
 
     public function plainReindex($products = null, $attributes = null, $stores = null)
     {
-        $attributeCodes = $priceAttributeCodes = array();
-        $status = Mage_Catalog_Model_Product_Status::STATUS_ENABLED;
-        $visibility = array(
-            Mage_Catalog_Model_Product_Visibility::VISIBILITY_BOTH,
-            Mage_Catalog_Model_Product_Visibility::VISIBILITY_IN_CATALOG,
-            Mage_Catalog_Model_Product_Visibility::VISIBILITY_IN_SEARCH,
-        );
-
-        if (is_null($stores)) {
-            $stores = $this->_getStores();
-        } else if ($stores instanceof Mage_Core_Model_Store) {
-            $stores = array($stores);
-        } else if (!is_array($stores)) {
-            Mage::throwException('Invalid stores supplied for indexing');
+        $flag = Mage::getModel('catalogindex/catalog_index_flag')->loadSelf();
+        if ($flag->getState() == Mage_CatalogIndex_Model_Catalog_Index_Flag::STATE_RUNNING) {
+            $kill = Mage::getModel('catalogindex/catalog_index_kill_flag')->loadSelf();
+            if ($kill->checkIsThisProcess()) {
+                $kill->delete();
+                return $this;
+            }
+        } else if ($flag->getState() == Mage_CatalogIndex_Model_Catalog_Index_Flag::STATE_QUEUED) {
+            $flag->setState(Mage_CatalogIndex_Model_Catalog_Index_Flag::STATE_RUNNING)->save();
         }
 
-        if (is_null($attributes)) {
-            $priceAttributeCodes = $this->_indexers['price']->getIndexableAttributeCodes();
-            $attributeCodes = $this->_indexers['eav']->getIndexableAttributeCodes();
-        } else if ($attributes instanceof Mage_Eav_Model_Entity_Attribute_Abstract) {
-            if ($this->_indexers['eav']->isAttributeIndexable($attributes)) {
-                $attributeCodes[] = $attributes->getAttributeId();
-            }
-            if ($this->_indexers['price']->isAttributeIndexable($attributes)) {
-                $priceAttributeCodes[] = $attributes->getAttributeId();
+        try {
+            $attributeCodes = $priceAttributeCodes = array();
+            $status = Mage_Catalog_Model_Product_Status::STATUS_ENABLED;
+            $visibility = array(
+                Mage_Catalog_Model_Product_Visibility::VISIBILITY_BOTH,
+                Mage_Catalog_Model_Product_Visibility::VISIBILITY_IN_CATALOG,
+                Mage_Catalog_Model_Product_Visibility::VISIBILITY_IN_SEARCH,
+            );
+
+            if (is_null($stores)) {
+                $stores = $this->_getStores();
+            } else if ($stores instanceof Mage_Core_Model_Store) {
+                $stores = array($stores);
+            } else if (!is_array($stores)) {
+                Mage::throwException('Invalid stores supplied for indexing');
             }
-        } else if ($attributes == self::REINDEX_TYPE_PRICE) {
-            $priceAttributeCodes = $this->_indexers['price']->getIndexableAttributeCodes();
-        } else if ($attributes == self::REINDEX_TYPE_ATTRIBUTE) {
-            $attributeCodes = $this->_indexers['eav']->getIndexableAttributeCodes();
-        } else {
-            Mage::throwException('Invalid attributes supplied for indexing');
-        }
 
-        $this->_getResource()->clear($attributeCodes, $priceAttributeCodes, count($priceAttributeCodes)>0, count($priceAttributeCodes)>0, count($priceAttributeCodes)>0, $products, $stores);
-        foreach ($stores as $store) {
-            $collection = Mage::getModel('catalog/product')
-                ->getCollection()
-                ->addAttributeToFilter('status', $status)
-                ->addAttributeToFilter('visibility', $visibility)
-                ->addStoreFilter($store);
-            /* @var $collection Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Collection */
-
-            if ($products instanceof Mage_Catalog_Model_Product) {
-                $collection->addIdFilter($products->getId());
-            } else if (is_array($products) || is_numeric($products)) {
-                $collection->addIdFilter($products);
+            if (is_null($attributes)) {
+                $priceAttributeCodes = $this->_indexers['price']->getIndexableAttributeCodes();
+                $attributeCodes = $this->_indexers['eav']->getIndexableAttributeCodes();
+            } else if ($attributes instanceof Mage_Eav_Model_Entity_Attribute_Abstract) {
+                if ($this->_indexers['eav']->isAttributeIndexable($attributes)) {
+                    $attributeCodes[] = $attributes->getAttributeId();
+                }
+                if ($this->_indexers['price']->isAttributeIndexable($attributes)) {
+                    $priceAttributeCodes[] = $attributes->getAttributeId();
+                }
+            } else if ($attributes == self::REINDEX_TYPE_PRICE) {
+                $priceAttributeCodes = $this->_indexers['price']->getIndexableAttributeCodes();
+            } else if ($attributes == self::REINDEX_TYPE_ATTRIBUTE) {
+                $attributeCodes = $this->_indexers['eav']->getIndexableAttributeCodes();
+            } else {
+                Mage::throwException('Invalid attributes supplied for indexing');
             }
-            $productIds = $collection->getAllIds();
 
-            if (!$productIds)
-                continue;
+            $this->_getResource()->clear($attributeCodes, $priceAttributeCodes, count($priceAttributeCodes)>0, count($priceAttributeCodes)>0, count($priceAttributeCodes)>0, $products, $stores);
+            foreach ($stores as $store) {
+                $collection = Mage::getModel('catalog/product')
+                    ->getCollection()
+                    ->addAttributeToFilter('status', $status)
+                    ->addAttributeToFilter('visibility', $visibility)
+                    ->addStoreFilter($store);
+                /* @var $collection Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Collection */
+
+                if ($products instanceof Mage_Catalog_Model_Product) {
+                    $collection->addIdFilter($products->getId());
+                } else if (is_array($products) || is_numeric($products)) {
+                    $collection->addIdFilter($products);
+                }
+                $productIds = $collection->getAllIds();
 
-            $step = 1000;
-            $productCount = count($productIds);
-            for ($i=0;$i<$productCount/$step;$i++) {
-                $stepData = array_slice($productIds, $i*$step, $step);
+                if (!$productIds)
+                    continue;
 
-                if (count($attributeCodes)) {
-                    $this->_getResource()->reindexAttributes($stepData, $attributeCodes, $store);
-                }
+                $step = 1000;
+                $productCount = count($productIds);
+                for ($i=0;$i<$productCount/$step;$i++) {
+                    $this->_getResource()->beginTransaction();
 
-                if (count($priceAttributeCodes)) {
-                    $this->_getResource()->reindexPrices($stepData, $priceAttributeCodes, $store);
+                    $stepData = array_slice($productIds, $i*$step, $step);
 
-                    $this->_getResource()->reindexTiers($stepData, $store);
-                    $this->_getResource()->reindexFinalPrices($stepData, $store);
-                    $this->_getResource()->reindexMinimalPrices($stepData, $store);
+                    if (count($attributeCodes)) {
+                        $this->_getResource()->reindexAttributes($stepData, $attributeCodes, $store);
+                    }
+
+                    if (count($priceAttributeCodes)) {
+                        $this->_getResource()->reindexPrices($stepData, $priceAttributeCodes, $store);
+
+                        $this->_getResource()->reindexTiers($stepData, $store);
+                        $this->_getResource()->reindexFinalPrices($stepData, $store);
+                        $this->_getResource()->reindexMinimalPrices($stepData, $store);
+                    }
+                    Mage::getResourceSingleton('catalog/product')->refreshEnabledIndex($store, $stepData);
+                    $kill = Mage::getModel('catalogindex/catalog_index_kill_flag')->loadSelf();
+                    if ($kill->checkIsThisProcess()) {
+                        $this->_getResource()->rollBack();
+                        $kill->delete();
+                    } else {
+                        $this->_getResource()->commit();
+                    }
                 }
             }
+        } catch (Exception $e) {
+            $flag->delete();
+            throw $e;
         }
+
+        if ($flag->getState() == Mage_CatalogIndex_Model_Catalog_Index_Flag::STATE_RUNNING) {
+            $flag->delete();
+        }
+
         return $this;
     }
 }
\ No newline at end of file
diff --git a/app/code/core/Mage/CatalogIndex/Model/Indexer/Abstract.php b/app/code/core/Mage/CatalogIndex/Model/Indexer/Abstract.php
index 67bd4e0cdd..c193dce538 100644
--- a/app/code/core/Mage/CatalogIndex/Model/Indexer/Abstract.php
+++ b/app/code/core/Mage/CatalogIndex/Model/Indexer/Abstract.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_CatalogIndex
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/CatalogIndex/Model/Indexer/Eav.php b/app/code/core/Mage/CatalogIndex/Model/Indexer/Eav.php
index 9b195f0206..ccf67dd406 100644
--- a/app/code/core/Mage/CatalogIndex/Model/Indexer/Eav.php
+++ b/app/code/core/Mage/CatalogIndex/Model/Indexer/Eav.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_CatalogIndex
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/CatalogIndex/Model/Indexer/Interface.php b/app/code/core/Mage/CatalogIndex/Model/Indexer/Interface.php
index ee97a9c1b1..ece595ca64 100644
--- a/app/code/core/Mage/CatalogIndex/Model/Indexer/Interface.php
+++ b/app/code/core/Mage/CatalogIndex/Model/Indexer/Interface.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_CatalogIndex
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/CatalogIndex/Model/Indexer/Minimalprice.php b/app/code/core/Mage/CatalogIndex/Model/Indexer/Minimalprice.php
index 65c855d9b1..c02efd44d5 100644
--- a/app/code/core/Mage/CatalogIndex/Model/Indexer/Minimalprice.php
+++ b/app/code/core/Mage/CatalogIndex/Model/Indexer/Minimalprice.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_CatalogIndex
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -68,8 +74,9 @@ public function createIndexData(Mage_Catalog_Model_Product $object)
             $associated = $object->getTypeInstance()->getAssociatedProducts();
             $searchEntityId = array();
 
-            foreach ($associated as $product)
+            foreach ($associated as $product) {
                 $searchEntityId[] = $product->getId();
+            }
         }
 
         if (!count($searchEntityId)) {
diff --git a/app/code/core/Mage/CatalogIndex/Model/Indexer/Price.php b/app/code/core/Mage/CatalogIndex/Model/Indexer/Price.php
index f0c5cf989a..e2c9f5f4d7 100644
--- a/app/code/core/Mage/CatalogIndex/Model/Indexer/Price.php
+++ b/app/code/core/Mage/CatalogIndex/Model/Indexer/Price.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_CatalogIndex
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/CatalogIndex/Model/Indexer/Tierprice.php b/app/code/core/Mage/CatalogIndex/Model/Indexer/Tierprice.php
index 1680ec4d8a..31ca149138 100644
--- a/app/code/core/Mage/CatalogIndex/Model/Indexer/Tierprice.php
+++ b/app/code/core/Mage/CatalogIndex/Model/Indexer/Tierprice.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_CatalogIndex
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Abstract.php b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Abstract.php
index d7c96c85b3..d85300dc8e 100644
--- a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Abstract.php
+++ b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Abstract.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_CatalogIndex
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Attribute.php b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Attribute.php
index 13c0281376..cd86230070 100644
--- a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Attribute.php
+++ b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Attribute.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_CatalogIndex
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Data/Abstract.php b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Data/Abstract.php
index 2fccddcb76..b644766cba 100644
--- a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Data/Abstract.php
+++ b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Data/Abstract.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_CatalogIndex
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Data/Configurable.php b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Data/Configurable.php
index 733630d7c2..8d1bc5ddbc 100644
--- a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Data/Configurable.php
+++ b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Data/Configurable.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_CatalogIndex
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -34,10 +40,10 @@ protected function _prepareLinkFetchSelect($store, $table, $idField, $whereField
         $statusAttribute = Mage::getSingleton('eav/entity_attribute')->getIdByCode('catalog_product', 'status');
 
         $this->_getLinkSelect()
-            ->joinLeft(array('s'=>$this->getTable('cataloginventory/stock_item')), "s.product_id={$idField}", array())
+            ->joinLeft(array('s'=>$this->getTable('cataloginventory/stock_item')), "s.product_id=l.{$idField}", array())
             ->where('s.is_in_stock = 1')
-            ->joinLeft(array('a'=>$this->getTable('catalog/product') . '_int'), "a.entity_id={$idField} AND a.store_id = {$store} AND a.attribute_id = '{$statusAttribute}'", array())
-            ->joinLeft(array('d'=>$this->getTable('catalog/product') . '_int'), "d.entity_id={$idField} AND d.store_id = 0 AND d.attribute_id = '{$statusAttribute}'", array())
+            ->joinLeft(array('a'=>$this->getTable('catalog/product') . '_int'), "a.entity_id=l.{$idField} AND a.store_id = {$store} AND a.attribute_id = '{$statusAttribute}'", array())
+            ->joinLeft(array('d'=>$this->getTable('catalog/product') . '_int'), "d.entity_id=l.{$idField} AND d.store_id = 0 AND d.attribute_id = '{$statusAttribute}'", array())
             ->where('a.value = 1 OR (a.value is null AND d.value = 1)');
     }
 }
\ No newline at end of file
diff --git a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Data/Grouped.php b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Data/Grouped.php
index 99cb25d3ad..0712d3292c 100644
--- a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Data/Grouped.php
+++ b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Data/Grouped.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_CatalogIndex
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -33,17 +39,23 @@ public function getMinimalPrice($products, $priceAttributes, $store)
         $result = array();
         $fields = array('customer_group_id', 'minimal_value'=>'MIN(value)');
         $select = $this->_getReadAdapter()->select()
-            ->from(array('base'=>$this->getTable('catalogindex/price')), $fields)
+            ->from(array('base'=>$this->getTable('catalogindex/price')), array(
+                'customer_group_id', 'minimal_value' => 'value', 'tax_class_id'
+            ))
             ->where('base.entity_id in (?)', $products)
             ->where('base.attribute_id in (?)', $priceAttributes)
             ->where('base.store_id = ?', $store)
-            ->group('base.customer_group_id');
+            ->order(array('customer_group_id', 'value'));
+        $select = $this->_getReadAdapter()->select()
+            ->from(array('blah' => new Zend_Db_Expr("({$select})")))
+            ->group(new Zend_Db_Expr(1));
         $visible = $this->_getReadAdapter()->fetchAll($select);
 
         $groups = Mage::getSingleton('catalogindex/retreiver')->getCustomerGroups();
         $stores = Mage::getModel('core/store')->getCollection()->setLoadDefault(false)->load();
         foreach ($groups as $group) {
-            $resultMinimal = null;
+            $resultMinimal    = null;
+            $resultTaxClassId = 0;
             $customerGroup = $group->getId();
             $storeObject = $stores->getItemById($store);
 
@@ -52,11 +64,9 @@ public function getMinimalPrice($products, $priceAttributes, $store)
                 $retreiver = Mage::getSingleton('catalogindex/retreiver')->getRetreiver($type);
                 foreach ($typeIds as $id) {
                     $finalPrice = $retreiver->getFinalPrice($id, $storeObject, $group);
-
-                    if (!is_null($resultMinimal)) {
-                        $resultMinimal = min($resultMinimal, $finalPrice);
-                    } else {
-                        $resultMinimal = $finalPrice;
+                    if ((null === $resultMinimal) || ($finalPrice < $resultMinimal)) {
+                        $resultMinimal    = $finalPrice;
+                        $resultTaxClassId = $retreiver->getTaxClassId($id, $storeObject);
                     }
 
                     $tiers = $retreiver->getTierPrices($id, $storeObject);
@@ -64,10 +74,9 @@ public function getMinimalPrice($products, $priceAttributes, $store)
                         if ($tier['customer_group_id'] != $customerGroup && !$tier['all_groups']) {
                             continue;
                         }
-                        if (!is_null($resultMinimal)) {
-                            $resultMinimal = min($resultMinimal, $tier['value']);
-                        } else {
-                            $resultMinimal = $tier['value'];
+                        if ((null === $resultMinimal) || ($tier['value'] < $resultMinimal)) {
+                            $resultMinimal    = $tier['value'];
+                            $resultTaxClassId = $retreiver->getTaxClassId($tier['entity_id'], $storeObject);
                         }
                     }
                 }
@@ -78,15 +87,16 @@ public function getMinimalPrice($products, $priceAttributes, $store)
                     continue;
                 }
 
-                if (is_null($resultMinimal)) {
+                if ((null === $resultMinimal) || ($one['minimal_value'] < $resultMinimal)) {
                     $resultMinimal = $one['minimal_value'];
+                    $taxClassId    = $one['tax_class_id'];
                 } else {
-                    $resultMinimal = min($one['minimal_value'], $resultMinimal);
+                    $taxClassId = $resultTaxClassId;
                 }
             }
 
             if (!is_null($resultMinimal)){
-                $result[] = array('customer_group_id'=>$customerGroup, 'minimal_value'=>$resultMinimal);
+                $result[] = array('customer_group_id'=>$customerGroup, 'minimal_value'=>$resultMinimal, 'tax_class_id' => $taxClassId);
             }
         }
         return $result;
diff --git a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer.php b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer.php
index 82bf28454b..6af809eb7d 100644
--- a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer.php
+++ b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_CatalogIndex
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -160,7 +166,7 @@ public function reindexPrices($products, $attributeIds, $store)
     public function reindexFinalPrices($products, $store, $forcedId = null)
     {
         $priceAttribute = Mage::getSingleton('eav/entity_attribute')->getIdByCode('catalog_product', 'price');
-        $this->_beginInsert('catalogindex/price', array('entity_id', 'store_id', 'customer_group_id', 'value', 'attribute_id'));
+        $this->_beginInsert('catalogindex/price', array('entity_id', 'store_id', 'customer_group_id', 'value', 'attribute_id', 'tax_class_id'));
 
         $productTypes = Mage::getSingleton('catalogindex/retreiver')->assignProductTypes($products);
         foreach ($productTypes as $type=>$products) {
@@ -176,13 +182,13 @@ public function reindexFinalPrices($products, $store, $forcedId = null)
                 }
                 foreach (Mage::getModel('catalogindex/retreiver')->getCustomerGroups() as $group) {
                     $finalPrice = $retreiver->getFinalPrice($product, $store, $group);
-
+                    $taxClassId = $retreiver->getTaxClassId($product, $store);
                     $id = $product;
                     if (!is_null($forcedId))
                         $id = $forcedId;
 
                     if (false !== $finalPrice && false !== $id && false !== $store->getId() && false !== $group->getId() && false !== $priceAttribute) {
-                        $this->_insert('catalogindex/price', array($id, $store->getId(), $group->getId(), $finalPrice, $priceAttribute));
+                        $this->_insert('catalogindex/price', array($id, $store->getId(), $group->getId(), $finalPrice, $priceAttribute, $taxClassId));
                     }
                 }
             }
@@ -192,7 +198,7 @@ public function reindexFinalPrices($products, $store, $forcedId = null)
 
     public function reindexMinimalPrices($products, $store)
     {
-        $this->_beginInsert('catalogindex/minimal_price', array('store_id', 'entity_id', 'customer_group_id', 'value'));
+        $this->_beginInsert('catalogindex/minimal_price', array('store_id', 'entity_id', 'customer_group_id', 'value', 'tax_class_id'));
         $this->clear(false, false, true, false, false, $products, $store);
         $products = Mage::getSingleton('catalogindex/retreiver')->assignProductTypes($products);
 
@@ -212,7 +218,10 @@ public function reindexMinimalPrices($products, $store)
 
                 if (is_array($minimal)) {
                     foreach ($minimal as $price) {
-                        $this->_insert('catalogindex/minimal_price', array($store->getId(), $id, $price['customer_group_id'], $price['minimal_value']));
+                        if (!isset($price['tax_class_id'])) {
+                            $price['tax_class_id'] = 0;
+                        }
+                        $this->_insert('catalogindex/minimal_price', array($store->getId(), $id, $price['customer_group_id'], $price['minimal_value'], $price['tax_class_id']));
                     }
                 }
             }
diff --git a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Abstract.php b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Abstract.php
index 1a4141d7d0..1d56482ae7 100644
--- a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Abstract.php
+++ b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Abstract.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_CatalogIndex
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Eav.php b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Eav.php
index 3e2a66a986..bf4d0bad4d 100644
--- a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Eav.php
+++ b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Eav.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_CatalogIndex
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Minimalprice.php b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Minimalprice.php
index f3c769311b..1c4c776837 100644
--- a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Minimalprice.php
+++ b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Minimalprice.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_CatalogIndex
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Price.php b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Price.php
index fd95eca127..e2e2f07800 100644
--- a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Price.php
+++ b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Price.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_CatalogIndex
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Price.php b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Price.php
index 3454e7d75d..144d658656 100644
--- a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Price.php
+++ b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Price.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_CatalogIndex
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -59,22 +65,7 @@ public function getCustomerGroupId()
 
     protected function _getTaxRateConditions($tableName = 'main_table')
     {
-        return Mage::helper('tax')->getPriceTaxSql($tableName . '.value', 'IFNULL(tax_class_c.value, tax_class_d.value)');
-    }
-
-    protected function _joinTaxClass($select, $priceTable='main_table')
-    {
-        $taxClassAttribute = Mage::getModel('eav/entity_attribute')->loadByCode('catalog_product', 'tax_class_id');
-        $select->joinLeft(
-            array('tax_class_d'=>$taxClassAttribute->getBackend()->getTable()),
-            "tax_class_d.entity_id = {$priceTable}.entity_id AND tax_class_d.attribute_id = '{$taxClassAttribute->getId()}'
-            AND tax_class_d.store_id = 0",
-             array());
-        $select->joinLeft(
-            array('tax_class_c'=>$taxClassAttribute->getBackend()->getTable()),
-            "tax_class_c.entity_id = {$priceTable}.entity_id AND tax_class_c.attribute_id = '{$taxClassAttribute->getId()}'
-            AND tax_class_c.store_id = '{$this->getStoreId()}'",
-            array());
+        return Mage::helper('tax')->getPriceTaxSql($tableName . '.value', $this->getStoreId(), 'IFNULL(tax_class_c.value, tax_class_d.value)');
     }
 
     public function getMaxValue($attribute = null, $entitySelect)
@@ -87,7 +78,7 @@ public function getMaxValue($attribute = null, $entitySelect)
             ->join(array('price_table'=>$this->getMainTable()), 'price_table.entity_id=e.entity_id', array())
             ->where('price_table.store_id = ?', $this->getStoreId())
             ->where('price_table.attribute_id = ?', $attribute->getId());
-        $this->_joinTaxClass($select, 'price_table');
+        Mage::helper('tax')->joinTaxClass($select, $this->getStoreId(), 'price_table');
 
         if ($attribute->getAttributeCode() == 'price')
             $select->where('price_table.customer_group_id = ?', $this->getCustomerGroupId());
@@ -132,7 +123,7 @@ public function getCount($range, $attribute, $entitySelect)
             ->group('range')
             ->where('price_table.store_id = ?', $this->getStoreId())
             ->where('price_table.attribute_id = ?', $attribute->getId());
-        $this->_joinTaxClass($select, 'price_table');
+        Mage::helper('tax')->joinTaxClass($select, $this->getStoreId(), 'price_table');
 
         if ($attribute->getAttributeCode() == 'price')
             $select->where('price_table.customer_group_id = ?', $this->getCustomerGroupId());
@@ -157,7 +148,7 @@ public function getFilteredEntities($range, $index, $attribute, $entityIdsFilter
             ->where($tableName . '.store_id = ?', $this->getStoreId())
             ->where($tableName . '.attribute_id = ?', $attribute->getId());
 
-        $this->_joinTaxClass($select, $tableName);
+        Mage::helper('tax')->joinTaxClass($select, $this->getStoreId(), $tableName);
         if ($attribute->getAttributeCode() == 'price')
             $select->where($tableName . '.customer_group_id = ?', $this->getCustomerGroupId());
 
@@ -173,7 +164,7 @@ public function getMinimalPrices($ids)
             return array();
         }
         $select = $this->_getReadAdapter()->select();
-        $select->from(array('price_table'=>$this->getTable('catalogindex/minimal_price')), array('price_table.entity_id', 'value'=>"(price_table.value)"))
+        $select->from(array('price_table'=>$this->getTable('catalogindex/minimal_price')), array('price_table.entity_id', 'value'=>"(price_table.value)", 'tax_class_id'=>'(price_table.tax_class_id)'))
             ->where('price_table.entity_id in (?)', $ids)
             ->where('price_table.store_id = ?', $this->getStoreId())
             ->where('price_table.customer_group_id = ?', $this->getCustomerGroupId());
diff --git a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Retreiver.php b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Retreiver.php
index fe608b0d59..345a0651ca 100644
--- a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Retreiver.php
+++ b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Retreiver.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_CatalogIndex
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/CatalogIndex/Model/Observer.php b/app/code/core/Mage/CatalogIndex/Model/Observer.php
index b7853a4cdd..ed03275f1a 100644
--- a/app/code/core/Mage/CatalogIndex/Model/Observer.php
+++ b/app/code/core/Mage/CatalogIndex/Model/Observer.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_CatalogIndex
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -107,4 +113,12 @@ public function catalogProductImportAfter(Varien_Event_Observer $observer)
     {
         Mage::getSingleton('catalogindex/indexer')->plainReindex();
     }
+
+    public function runQueuedIndexing()
+    {
+        $flag = Mage::getModel('catalogindex/catalog_index_flag')->loadSelf();
+        if ($flag->getState() == Mage_CatalogIndex_Model_Catalog_Index_Flag::STATE_QUEUED) {
+            Mage::getSingleton('catalogindex/indexer')->plainReindex();
+        }
+    }
 }
diff --git a/app/code/core/Mage/CatalogIndex/Model/Price.php b/app/code/core/Mage/CatalogIndex/Model/Price.php
index 96b98b49b8..b986be1cad 100644
--- a/app/code/core/Mage/CatalogIndex/Model/Price.php
+++ b/app/code/core/Mage/CatalogIndex/Model/Price.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_CatalogIndex
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -57,6 +63,7 @@ public function addMinimalPrices(Mage_Catalog_Model_Resource_Eav_Mysql4_Product_
             $item = $collection->getItemById($row['entity_id']);
             if ($item) {
                 $item->setData('minimal_price', $row['value']);
+                $item->setData('minimal_tax_class_id', $row['tax_class_id']);
             }
         }
     }
diff --git a/app/code/core/Mage/CatalogIndex/Model/Retreiver.php b/app/code/core/Mage/CatalogIndex/Model/Retreiver.php
index 8f1cdbacdf..0c78580f48 100644
--- a/app/code/core/Mage/CatalogIndex/Model/Retreiver.php
+++ b/app/code/core/Mage/CatalogIndex/Model/Retreiver.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_CatalogIndex
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/CatalogIndex/etc/config.xml b/app/code/core/Mage/CatalogIndex/etc/config.xml
index 39899a9a7a..794974288f 100644
--- a/app/code/core/Mage/CatalogIndex/etc/config.xml
+++ b/app/code/core/Mage/CatalogIndex/etc/config.xml
@@ -13,6 +13,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_CatalogIndex
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -22,7 +28,7 @@
 
     
         
-            0.7.6
+            0.7.7
         
     
 
@@ -181,6 +187,10 @@
                 0 2 * * *
                 catalogindex/observer::reindexAll
             
+            
+                * * * * *
+                catalogindex/observer::runQueuedIndexing
+            
         
     
 
diff --git a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-install-0.7.0.php
index 119598789a..fccf181200 100644
--- a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-install-0.7.0.php
+++ b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-install-0.7.0.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_CatalogIndex
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.0-0.7.1.php
index 4b031f3bcd..542f6c2464 100644
--- a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.0-0.7.1.php
+++ b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.0-0.7.1.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_CatalogIndex
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.1-0.7.2.php
index 4619c9d8c1..12509522b2 100644
--- a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.1-0.7.2.php
+++ b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.1-0.7.2.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_CatalogIndex
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.2-0.7.3.php b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.2-0.7.3.php
index 22710f4728..4594e44725 100644
--- a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.2-0.7.3.php
+++ b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.2-0.7.3.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_CatalogIndex
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.3-0.7.4.php b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.3-0.7.4.php
index 2c3cdee089..825ec7444b 100644
--- a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.3-0.7.4.php
+++ b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.3-0.7.4.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_CatalogIndex
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.4-0.7.5.php b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.4-0.7.5.php
index 09e037cb22..0702d4eae0 100644
--- a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.4-0.7.5.php
+++ b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.4-0.7.5.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.5-0.7.6.php b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.5-0.7.6.php
index c2342d97fa..f634c46ace 100644
--- a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.5-0.7.6.php
+++ b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.5-0.7.6.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_CatalogIndex
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.6-0.7.7.php b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.6-0.7.7.php
new file mode 100644
index 0000000000..cb6e6d2785
--- /dev/null
+++ b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.6-0.7.7.php
@@ -0,0 +1,43 @@
+startSetup();
+
+$installer->run("
+    ALTER TABLE {$installer->getTable('catalogindex_price')}
+    ADD COLUMN `tax_class_id` smallint(6) NOT NULL DEFAULT 0;
+");
+
+$installer->run("
+    ALTER TABLE {$installer->getTable('catalogindex_minimal_price')}
+    ADD COLUMN `tax_class_id` smallint(6) NOT NULL DEFAULT 0;
+");
+
+$installer->endSetup();
diff --git a/app/code/core/Mage/CatalogInventory/Helper/Data.php b/app/code/core/Mage/CatalogInventory/Helper/Data.php
index 090f83317b..4447ac4630 100644
--- a/app/code/core/Mage/CatalogInventory/Helper/Data.php
+++ b/app/code/core/Mage/CatalogInventory/Helper/Data.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_CatalogInventory
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock.php b/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock.php
index f39e1a28c9..689ba1fc86 100644
--- a/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock.php
+++ b/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_CatalogInventory
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock/Item.php b/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock/Item.php
index ab09b621e4..92b1736907 100644
--- a/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock/Item.php
+++ b/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock/Item.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_CatalogInventory
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock/Item/Collection.php b/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock/Item/Collection.php
index b95f517fb9..6057fd57ac 100644
--- a/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock/Item/Collection.php
+++ b/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock/Item/Collection.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_CatalogInventory
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/CatalogInventory/Model/Observer.php b/app/code/core/Mage/CatalogInventory/Model/Observer.php
index 1e820cc014..4df3df7a0d 100644
--- a/app/code/core/Mage/CatalogInventory/Model/Observer.php
+++ b/app/code/core/Mage/CatalogInventory/Model/Observer.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_CatalogInventory
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -123,7 +129,7 @@ protected function _prepareItemForSave($item, $product)
             && is_null($product->getData('stock_data/use_config_backorders'))) {
             $item->setData('use_config_backorders', false);
         }
-		if (!is_null($product->getData('stock_data/notify_stock_qty'))
+        if (!is_null($product->getData('stock_data/notify_stock_qty'))
             && is_null($product->getData('stock_data/use_config_notify_stock_qty'))) {
             $item->setData('use_config_notify_stock_qty', false);
         }
@@ -157,13 +163,14 @@ public function checkQuoteItemQty($observer)
             foreach ($options as $option) {
                 /* @var $option Mage_Sales_Model_Quote_Item_Option */
                 $optionQty = $qty * $option->getValue();
+                $increaseOptionQty = ($item->getQtyToAdd() ? $item->getQtyToAdd() : $qty) * $option->getValue();
 
                 $stockItem = $option->getProduct()->getStockItem();
                 /* @var $stockItem Mage_CatalogInventory_Model_Stock_Item */
                 if (!$stockItem instanceof Mage_CatalogInventory_Model_Stock_Item) {
                     Mage::throwException(Mage::helper('cataloginventory')->__('Stock item for Product in option is not valid'));
                 }
-                $qtyForCheck = $this->_getProductQtyForCheck($option->getProduct()->getId(), $optionQty);
+                $qtyForCheck = $this->_getProductQtyForCheck($option->getProduct()->getId(), $increaseOptionQty);
                 $result = $stockItem->checkQuoteItemQty($optionQty, $qtyForCheck);
 
                 if (!is_null($result->getItemIsQtyDecimal())) {
@@ -196,10 +203,11 @@ public function checkQuoteItemQty($observer)
             }
 
             if ($item->getParentItem()) {
-            	$qtyForCheck = $item->getParentItem()->getQty()*$qty;
+                $qtyForCheck = $item->getParentItem()->getQty()*$qty;
             }
             else {
-            	$qtyForCheck = $this->_getProductQtyForCheck($item->getProduct()->getId(), $qty);
+                $increaseQty = $item->getQtyToAdd() ? $item->getQtyToAdd() : $qty;
+                $qtyForCheck = $this->_getProductQtyForCheck($item->getProduct()->getId(), $increaseQty);
             }
 
             $result = $stockItem->checkQuoteItemQty($qty, $qtyForCheck);
@@ -240,9 +248,9 @@ protected function _getProductQtyForCheck($productId, $itemQty)
     {
         $qty = $itemQty;
         if (isset($this->_checkedProductsQty[$productId])) {
-        	$qty+= $this->_checkedProductsQty[$productId];
+            $qty += $this->_checkedProductsQty[$productId];
         }
-    	$this->_checkedProductsQty[$productId] = $qty;
+        $this->_checkedProductsQty[$productId] = $qty;
         return $qty;
     }
 
@@ -311,9 +319,14 @@ public function createOrderItem($observer)
     public function cancelOrderItem($observer)
     {
         $item = $observer->getEvent()->getItem();
-        if ($item->getId() && ($productId = $item->getProductId()) && ($qty = $item->getQtyToShip())) {
+
+        $children = $item->getChildrenItems();
+        $qty = $item->getQtyOrdered() - max($item->getQtyShipped(), $item->getQtyInvoiced()) - $item->getQtyCanceled();
+
+        if ($item->getId() && ($productId = $item->getProductId()) && empty($children) && $qty) {
             Mage::getSingleton('cataloginventory/stock')->backItemQty($productId, $qty);
         }
+
         return $this;
     }
 
diff --git a/app/code/core/Mage/CatalogInventory/Model/Source/Backorders.php b/app/code/core/Mage/CatalogInventory/Model/Source/Backorders.php
index 1290041370..d6c745eba6 100644
--- a/app/code/core/Mage/CatalogInventory/Model/Source/Backorders.php
+++ b/app/code/core/Mage/CatalogInventory/Model/Source/Backorders.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Adminhtml
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/CatalogInventory/Model/Stock.php b/app/code/core/Mage/CatalogInventory/Model/Stock.php
index c87c9a0613..c63039714d 100644
--- a/app/code/core/Mage/CatalogInventory/Model/Stock.php
+++ b/app/code/core/Mage/CatalogInventory/Model/Stock.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_CatalogInventory
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/CatalogInventory/Model/Stock/Item.php b/app/code/core/Mage/CatalogInventory/Model/Stock/Item.php
index e8cb8dfa44..e5fafc26d0 100644
--- a/app/code/core/Mage/CatalogInventory/Model/Stock/Item.php
+++ b/app/code/core/Mage/CatalogInventory/Model/Stock/Item.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_CatalogInventory
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -236,6 +242,7 @@ public function checkQty($qty)
      * Checking quote item quantity
      *
      * @param   mixed $qty
+     * @param   mixed $summaryQty
      * @return  Varien_Object
      */
     public function checkQuoteItemQty($qty, $summaryQty)
@@ -243,8 +250,6 @@ public function checkQuoteItemQty($qty, $summaryQty)
         $result = new Varien_Object();
         $result->setHasError(false);
 
-        $helper = Mage::helper('cataloginventory');
-
         if (!is_numeric($qty)) {
             $qty = Mage::app()->getLocale()->getNumber($qty);
         }
@@ -269,8 +274,8 @@ public function checkQuoteItemQty($qty, $summaryQty)
 
         if (!$this->getIsInStock()) {
             $result->setHasError(true)
-                ->setMessage($helper->__('This product is currently out of stock.'))
-                ->setQuoteMessage($helper->__('Some of the products are currently out of stock'))
+                ->setMessage(Mage::helper('cataloginventory')->__('This product is currently out of stock.'))
+                ->setQuoteMessage(Mage::helper('cataloginventory')->__('Some of the products are currently out of stock'))
                 ->setQuoteMessageIndex('stock');
             $result->setItemUseOldQty(true);
             return $result;
@@ -278,36 +283,44 @@ public function checkQuoteItemQty($qty, $summaryQty)
 
         if ($this->getMinSaleQty() && $summaryQty < $this->getMinSaleQty()) {
             $result->setHasError(true)
-                ->setMessage($helper->__('The minimum quantity allowed for purchase is %s.', $this->getMinSaleQty() * 1))
-                ->setQuoteMessage($helper->__('Some of the products cannot be ordered in the requested quantity'))
+                ->setMessage(Mage::helper('cataloginventory')->__('The minimum quantity allowed for purchase is %s.', $this->getMinSaleQty() * 1))
+                ->setQuoteMessage(Mage::helper('cataloginventory')->__('Some of the products cannot be ordered in the requested quantity'))
                 ->setQuoteMessageIndex('qty');
             return $result;
         }
 
         if ($this->getMaxSaleQty() && $summaryQty>$this->getMaxSaleQty()) {
             $result->setHasError(true)
-                ->setMessage($helper->__('The maximum quantity allowed for purchase is %s.', $this->getMaxSaleQty() * 1))
-                ->setQuoteMessage($helper->__('Some of the products can not be ordered in requested quantity'))
+                ->setMessage(Mage::helper('cataloginventory')->__('The maximum quantity allowed for purchase is %s.', $this->getMaxSaleQty() * 1))
+                ->setQuoteMessage(Mage::helper('cataloginventory')->__('Some of the products can not be ordered in requested quantity'))
                 ->setQuoteMessageIndex('qty');
             return $result;
         }
 
-        if ($this->checkQty($summaryQty)) {
-            if (($this->getQty() - $summaryQty < 0) && ($this->getBackorders() == Mage_CatalogInventory_Model_Stock::BACKORDERS_YES)) {
-                if ($this->getProduct()) {
-                    $result->setMessage('set_data', $helper->__('This product is not available in the requested quantity. %s of the items will be backordered.',
-                        ($this->getQty() > 0) ? ($qty - $this->getQty()) * 1 : $qty * 1,
-                        $this->getProduct()->getName()));
-                }
-            }
-        }
-        else {
+        if (!$this->checkQty($summaryQty)) {
+            $message = Mage::helper('cataloginventory')->__('The requested quantity for "%s" is not available.', $this->getProduct()->getName());
             $result->setHasError(true)
-                ->setMessage($helper->__('The requested quantity is not available'))
-                ->setQuoteMessage($helper->__('The requested quantity for "%s" is not available.', $this->getProduct()->getName()))
+                ->setMessage($message)
+                ->setQuoteMessage($message)
                 ->setQuoteMessageIndex('qty');
             return $result;
         }
+        else {
+            if (($this->getQty() - $summaryQty) < 0) {
+                if ($this->getProduct()) {
+                    $backorderQty = ($this->getQty() > 0) ? ($qty - $this->getQty()) * 1 : $qty * 1;
+                    $result->setItemBackorders($backorderQty);
+                    if ($this->getBackorders() == Mage_CatalogInventory_Model_Stock::BACKORDERS_YES) {
+                        $result->setMessage(Mage::helper('cataloginventory')->__('This product is not available in the requested quantity. %d of the items will be backordered.',
+                            $backorderQty,
+                            $this->getProduct()->getName())
+                            )
+                        ;
+                    }
+                }
+            }
+            // no return intentionally
+        }
 
         /**
          * Check quantity type
@@ -323,7 +336,6 @@ public function checkQuoteItemQty($qty, $summaryQty)
          * Adding stock data to quote item
          */
         $result->setItemQty($qty);
-        $result->setItemBackorders($qty);
 
         return $result;
     }
diff --git a/app/code/core/Mage/CatalogInventory/Model/Stock/Item/Api.php b/app/code/core/Mage/CatalogInventory/Model/Stock/Item/Api.php
index 4408324da4..d81903ba33 100644
--- a/app/code/core/Mage/CatalogInventory/Model/Stock/Item/Api.php
+++ b/app/code/core/Mage/CatalogInventory/Model/Stock/Item/Api.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_CatalogInventory
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/CatalogInventory/etc/api.xml b/app/code/core/Mage/CatalogInventory/etc/api.xml
index 4e468d3640..00c314d710 100644
--- a/app/code/core/Mage/CatalogInventory/etc/api.xml
+++ b/app/code/core/Mage/CatalogInventory/etc/api.xml
@@ -13,6 +13,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category    Mage
  * @package     Mage_Catalog
  * @copyright   Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/CatalogInventory/etc/config.xml b/app/code/core/Mage/CatalogInventory/etc/config.xml
index 76228ab0c9..64fedb4f64 100644
--- a/app/code/core/Mage/CatalogInventory/etc/config.xml
+++ b/app/code/core/Mage/CatalogInventory/etc/config.xml
@@ -13,6 +13,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_CatalogRule
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/CatalogInventory/etc/system.xml b/app/code/core/Mage/CatalogInventory/etc/system.xml
index f8acbd3562..2c7d4c25a4 100644
--- a/app/code/core/Mage/CatalogInventory/etc/system.xml
+++ b/app/code/core/Mage/CatalogInventory/etc/system.xml
@@ -13,6 +13,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_CatalogRule
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -31,7 +37,8 @@
             0
             
                 
-                    
+                    <strong>Please note</strong>, that these Settings are applicable to cart line Items, not the whole Cart.
+                    
                     text
                     1
                     1
@@ -83,7 +90,7 @@
                             0
                         
                         
-                            
+                            
                             text
                             5
                             1
diff --git a/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-install-0.7.0.php
index bbd78c2b14..172b7aaa26 100644
--- a/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-install-0.7.0.php
+++ b/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-install-0.7.0.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_CatalogInventory
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.0-0.7.1.php
index 9942013587..664682cf7d 100644
--- a/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.0-0.7.1.php
+++ b/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.0-0.7.1.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_CatalogInventory
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.1-0.7.2.php
index fad612984e..504d2afb0c 100644
--- a/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.1-0.7.2.php
+++ b/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.1-0.7.2.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_CatalogInventory
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/CatalogRule/Helper/Data.php b/app/code/core/Mage/CatalogRule/Helper/Data.php
index 2d9c07a1e3..d826f61c7b 100644
--- a/app/code/core/Mage/CatalogRule/Helper/Data.php
+++ b/app/code/core/Mage/CatalogRule/Helper/Data.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_CatalogRule
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/CatalogRule/Model/Mysql4/Rule.php b/app/code/core/Mage/CatalogRule/Model/Mysql4/Rule.php
index 71b3b8ad5f..28eb1bafd1 100644
--- a/app/code/core/Mage/CatalogRule/Model/Mysql4/Rule.php
+++ b/app/code/core/Mage/CatalogRule/Model/Mysql4/Rule.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_CatalogRule
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -145,14 +151,37 @@ public function getRuleProductsForDateRange($fromDate, $toDate, $productId=null)
         $priceAttr = Mage::getSingleton('eav/config')->getAttribute('catalog_product', 'price');
 
         $select = $read->select()
-            ->from($priceAttr->getBackend()->getTable(), array('entity_id', 'value'))
+            ->from($priceAttr->getBackend()->getTable(), array('entity_id', 'store_id', 'value'))
             ->where('attribute_id=?', $priceAttr->getAttributeId())
-            ->where('entity_id in (?)', $productIds);
+            ->where('entity_id in (?)', $productIds)
+            ->order('store_id');
+
+        $prices = $read->fetchAll($select);
+
+        /**
+         * Prepare price information per website
+         */
+        $productPrices = array();
+        foreach ($prices as $index => $priceData) {
+        	$websiteId = Mage::app()->getStore($priceData['store_id'])->getWebsiteId();
+
+        	if (!isset($productPrices[$priceData['entity_id']])) {
+        		$productPrices[$priceData['entity_id']] = array(
+                    'default'    => $priceData['value'],
+                    'websites'   => array($websiteId=>$priceData['value'])
+        		);
+        	}
+        	else {
+                $productPrices[$priceData['entity_id']]['websites'][$websiteId] = $priceData['value'];
+        	}
+        }
 
-        $prices = $read->fetchAssoc($select);
         foreach ($ruleProducts as &$p) {
-            if (isset($prices[$p['product_id']]['value'])) {
-                $p['price'] = $prices[$p['product_id']]['value'];
+        	if (isset($productPrices[$p['product_id']]['websites'][$p['website_id']])) {
+                $p['price'] = $productPrices[$p['product_id']]['websites'][$p['website_id']];
+        	}
+            elseif (isset($productPrices[$p['product_id']]['default'])) {
+                $p['price'] = $productPrices[$p['product_id']]['default'];
             }
         }
 
diff --git a/app/code/core/Mage/CatalogRule/Model/Mysql4/Rule/Collection.php b/app/code/core/Mage/CatalogRule/Model/Mysql4/Rule/Collection.php
index 5078485555..f80483299d 100644
--- a/app/code/core/Mage/CatalogRule/Model/Mysql4/Rule/Collection.php
+++ b/app/code/core/Mage/CatalogRule/Model/Mysql4/Rule/Collection.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_CatalogRule
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/CatalogRule/Model/Mysql4/Rule/Product/Price.php b/app/code/core/Mage/CatalogRule/Model/Mysql4/Rule/Product/Price.php
index d3e2bc52f4..8cb6583925 100644
--- a/app/code/core/Mage/CatalogRule/Model/Mysql4/Rule/Product/Price.php
+++ b/app/code/core/Mage/CatalogRule/Model/Mysql4/Rule/Product/Price.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_SalesRule
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/CatalogRule/Model/Mysql4/Rule/Product/Price/Collection.php b/app/code/core/Mage/CatalogRule/Model/Mysql4/Rule/Product/Price/Collection.php
index fc007f3a99..3211a96b46 100644
--- a/app/code/core/Mage/CatalogRule/Model/Mysql4/Rule/Product/Price/Collection.php
+++ b/app/code/core/Mage/CatalogRule/Model/Mysql4/Rule/Product/Price/Collection.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_SalesRule
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/CatalogRule/Model/Observer.php b/app/code/core/Mage/CatalogRule/Model/Observer.php
index ede82f5c33..d00faf8cfb 100644
--- a/app/code/core/Mage/CatalogRule/Model/Observer.php
+++ b/app/code/core/Mage/CatalogRule/Model/Observer.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_CatalogRule
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/CatalogRule/Model/Rule.php b/app/code/core/Mage/CatalogRule/Model/Rule.php
index 5f838c7aaf..f916661670 100644
--- a/app/code/core/Mage/CatalogRule/Model/Rule.php
+++ b/app/code/core/Mage/CatalogRule/Model/Rule.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_CatalogRule
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/CatalogRule/Model/Rule/Action/Collection.php b/app/code/core/Mage/CatalogRule/Model/Rule/Action/Collection.php
index 1d38778941..d6882496eb 100644
--- a/app/code/core/Mage/CatalogRule/Model/Rule/Action/Collection.php
+++ b/app/code/core/Mage/CatalogRule/Model/Rule/Action/Collection.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_CatalogRule
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/CatalogRule/Model/Rule/Action/Product.php b/app/code/core/Mage/CatalogRule/Model/Rule/Action/Product.php
index 358b933f7c..adfc54ddbd 100644
--- a/app/code/core/Mage/CatalogRule/Model/Rule/Action/Product.php
+++ b/app/code/core/Mage/CatalogRule/Model/Rule/Action/Product.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_CatalogRule
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/CatalogRule/Model/Rule/Condition/Combine.php b/app/code/core/Mage/CatalogRule/Model/Rule/Condition/Combine.php
index 4253cb9949..153074222b 100644
--- a/app/code/core/Mage/CatalogRule/Model/Rule/Condition/Combine.php
+++ b/app/code/core/Mage/CatalogRule/Model/Rule/Condition/Combine.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_CatalogRule
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/CatalogRule/Model/Rule/Condition/Product.php b/app/code/core/Mage/CatalogRule/Model/Rule/Condition/Product.php
index f5a0ea83f1..f62bb21d91 100644
--- a/app/code/core/Mage/CatalogRule/Model/Rule/Condition/Product.php
+++ b/app/code/core/Mage/CatalogRule/Model/Rule/Condition/Product.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_CatalogRule
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -118,7 +124,7 @@ public function getValueAfterElementHtml()
         }
 
         if (!empty($image)) {
-            $html = '';
+            $html = '';
         }
         return $html;
     }
@@ -245,6 +251,10 @@ public function validate(Varien_Object $object)
             return $this->validateAttribute($value);
         }
 
+        if ($this->getAttribute() == 'category_ids') {
+            return $this->validateAttribute($object->getAvailableInCategories());
+        }
+
         return parent::validate($object);
     }
 }
\ No newline at end of file
diff --git a/app/code/core/Mage/CatalogRule/etc/config.xml b/app/code/core/Mage/CatalogRule/etc/config.xml
index dcc67ca8de..a98ec3ea32 100644
--- a/app/code/core/Mage/CatalogRule/etc/config.xml
+++ b/app/code/core/Mage/CatalogRule/etc/config.xml
@@ -13,6 +13,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_CatalogRule
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-install-0.7.0.php
index b3229f50cc..b4fcf0a07f 100644
--- a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-install-0.7.0.php
+++ b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-install-0.7.0.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_CatalogRule
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.0-0.7.1.php
index ca7c536615..1a35fed426 100644
--- a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.0-0.7.1.php
+++ b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.0-0.7.1.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_CatalogRule
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.1-0.7.2.php
index be8be1dafc..d9502f917a 100644
--- a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.1-0.7.2.php
+++ b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.1-0.7.2.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_CatalogRule
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.2-0.7.3.php b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.2-0.7.3.php
index 57c02aa29c..5e0ae82774 100644
--- a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.2-0.7.3.php
+++ b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.2-0.7.3.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_CatalogRule
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/CatalogSearch/Block/Advanced/Form.php b/app/code/core/Mage/CatalogSearch/Block/Advanced/Form.php
index 75ab41fa44..10d8f994ab 100644
--- a/app/code/core/Mage/CatalogSearch/Block/Advanced/Form.php
+++ b/app/code/core/Mage/CatalogSearch/Block/Advanced/Form.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_CatalogSearch
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -97,6 +103,43 @@ public function getAttributeValue($attribute, $part=null)
         return $value;
     }
 
+    public function getAvailableCurrencies()
+    {
+        $currencies = $this->getData('_currencies');
+        if (is_null($currencies)) {
+            $currencies = array();
+            $codes = Mage::app()->getStore()->getAvailableCurrencyCodes(true);
+            if (is_array($codes) && count($codes)) {
+                $rates = Mage::getModel('directory/currency')->getCurrencyRates(
+                    Mage::app()->getStore()->getBaseCurrency(),
+                    $codes
+                );
+
+                foreach ($codes as $code) {
+                    if (isset($rates[$code])) {
+                        $currencies[$code] = $code;
+                    }
+                }
+            }
+
+            $this->setData('currencies', $currencies);
+        }
+        return $currencies;
+    }
+
+    public function getCurrencyCount()
+    {
+        return count($this->getAvailableCurrencies());
+    }
+
+    public function getCurrency($attribute)
+    {
+        return Mage::app()->getStore()->getCurrentCurrencyCode();
+
+        $baseCurrency = Mage::app()->getStore()->getBaseCurrency()->getCurrencyCode();
+        return $this->getAttributeValue($attribute, 'currency') ? $this->getAttributeValue($attribute, 'currency') : $baseCurrency;
+    }
+
     /**
      * Retrieve attribute input type
      *
@@ -115,6 +158,10 @@ public function getAttributeInputType($attribute)
             return 'yesno';
         }
 
+        if ($imputType == 'price') {
+            return 'price';
+        }
+
         if ($dataType == 'int' || $dataType == 'decimal') {
             return 'number';
         }
diff --git a/app/code/core/Mage/CatalogSearch/Block/Advanced/Result.php b/app/code/core/Mage/CatalogSearch/Block/Advanced/Result.php
index 8bd1a3d83f..257e8db582 100644
--- a/app/code/core/Mage/CatalogSearch/Block/Advanced/Result.php
+++ b/app/code/core/Mage/CatalogSearch/Block/Advanced/Result.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_CatalogSearch
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/CatalogSearch/Block/Autocomplete.php b/app/code/core/Mage/CatalogSearch/Block/Autocomplete.php
index 2bcfbba49c..6c436bd7b7 100644
--- a/app/code/core/Mage/CatalogSearch/Block/Autocomplete.php
+++ b/app/code/core/Mage/CatalogSearch/Block/Autocomplete.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_CatalogSearch
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/CatalogSearch/Block/Result.php b/app/code/core/Mage/CatalogSearch/Block/Result.php
index a12fde8468..7069384cae 100644
--- a/app/code/core/Mage/CatalogSearch/Block/Result.php
+++ b/app/code/core/Mage/CatalogSearch/Block/Result.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_CatalogSearch
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/CatalogSearch/Block/Term.php b/app/code/core/Mage/CatalogSearch/Block/Term.php
index fe5eb4a8b1..9b3b1b0703 100644
--- a/app/code/core/Mage/CatalogSearch/Block/Term.php
+++ b/app/code/core/Mage/CatalogSearch/Block/Term.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/CatalogSearch/Helper/Data.php b/app/code/core/Mage/CatalogSearch/Helper/Data.php
index 69e99f20e4..8e9053222b 100644
--- a/app/code/core/Mage/CatalogSearch/Helper/Data.php
+++ b/app/code/core/Mage/CatalogSearch/Helper/Data.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_CatalogSearch
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -130,15 +136,4 @@ public function getAdvancedSearchUrl()
     {
         return $this->_getUrl('catalogsearch/advanced');
     }
-    public function getCustomImageUrl($product, $type='')
-    {
-        switch ($type) {
-            case 'small':
-                return $this->getSmallImageUrl($product);
-            case 'thumbnail':
-                return $this->getThumbnailImageUrl($product);
-            default:
-                return $product->getImageUrl();
-        }
-    }
 }
diff --git a/app/code/core/Mage/CatalogSearch/Model/Advanced.php b/app/code/core/Mage/CatalogSearch/Model/Advanced.php
index e3df597c2c..046d19b891 100644
--- a/app/code/core/Mage/CatalogSearch/Model/Advanced.php
+++ b/app/code/core/Mage/CatalogSearch/Model/Advanced.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_CatalogSearch
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -58,7 +64,7 @@ public function addFilters($values){
         $attributes = $this->getAttributes();
         $allConditions = array();
         $filteredAttributes = array();
-        $indexFilters = Mage::getModel('catalogindex/indexer')->buildEntityFilter($attributes, $values, $filteredAttributes);
+        $indexFilters = Mage::getModel('catalogindex/indexer')->buildEntityFilter($attributes, $values, $filteredAttributes, $this->getProductCollection());
         foreach ($indexFilters as $filter) {
             $this->getProductCollection()->addFieldToFilter('entity_id', array('in'=>new Zend_Db_Expr($filter)));
         }
@@ -87,6 +93,8 @@ public function addFilters($values){
                         } else {
                             $condition = $value;
                         }
+                    } elseif ($attribute->getFrontendInput() == 'boolean') {
+                        $condition = array('in' => array(0,1));
                     }
                 }
             }
@@ -121,15 +129,23 @@ private function addSearchCriteria($attribute, $value)
         $name = $attribute->getFrontend()->getLabel();
 
         if (is_array($value) && (isset($value['from']) || isset($value['to']))){
+            if (isset($value['currency'])) {
+                $currencyModel = Mage::getModel('directory/currency')->load($value['currency']);
+                $from = $currencyModel->format($value['from'], array(), false);
+                $to = $currencyModel->format($value['to'], array(), false);
+            } else {
+                $currencyModel = null;
+            }
+
             if ($value['from'] > 0 && $value['to'] > 0) {
                 // -
-                $value = sprintf('%s - %s', $value['from'], $value['to']);
+                $value = sprintf('%s - %s', ($currencyModel ? $from : $value['from']), ($currencyModel ? $to : $value['to']));
             } elseif ($value['from'] > 0) {
                 // and more
-                $value = Mage::helper('catalogsearch')->__('%s and greater', $value['from']);
+                $value = Mage::helper('catalogsearch')->__('%s and greater', ($currencyModel ? $from : $value['from']));
             } elseif ($value['to'] > 0) {
                 // to
-                $value = Mage::helper('catalogsearch')->__('up to %s', $value['to']);
+                $value = Mage::helper('catalogsearch')->__('up to %s', ($currencyModel ? $to : $value['to']));
             }
         }
 
@@ -164,6 +180,7 @@ public function getProductCollection(){
             $this->_productCollection = Mage::getResourceModel('catalogsearch/advanced_collection')
                 ->addAttributeToSelect(Mage::getSingleton('catalog/config')->getProductAttributes())
                 ->addMinimalPrice()
+                ->addTaxPercents()
                 ->addStoreFilter();
                 Mage::getSingleton('catalog/product_status')->addVisibleFilterToCollection($this->_productCollection);
                 Mage::getSingleton('catalog/product_visibility')->addVisibleInSearchFilterToCollection($this->_productCollection);
diff --git a/app/code/core/Mage/CatalogSearch/Model/Mysql4/Advanced/Collection.php b/app/code/core/Mage/CatalogSearch/Model/Mysql4/Advanced/Collection.php
index b490fbcab8..bff34011b5 100644
--- a/app/code/core/Mage/CatalogSearch/Model/Mysql4/Advanced/Collection.php
+++ b/app/code/core/Mage/CatalogSearch/Model/Mysql4/Advanced/Collection.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/CatalogSearch/Model/Mysql4/Query.php b/app/code/core/Mage/CatalogSearch/Model/Mysql4/Query.php
index 1e81dd9e2a..0bcb246baa 100644
--- a/app/code/core/Mage/CatalogSearch/Model/Mysql4/Query.php
+++ b/app/code/core/Mage/CatalogSearch/Model/Mysql4/Query.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_CatalogSearch
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/CatalogSearch/Model/Mysql4/Query/Collection.php b/app/code/core/Mage/CatalogSearch/Model/Mysql4/Query/Collection.php
index 79d974dab6..86b5aaf6de 100644
--- a/app/code/core/Mage/CatalogSearch/Model/Mysql4/Query/Collection.php
+++ b/app/code/core/Mage/CatalogSearch/Model/Mysql4/Query/Collection.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_CatalogSearch
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/CatalogSearch/Model/Mysql4/Search/Collection.php b/app/code/core/Mage/CatalogSearch/Model/Mysql4/Search/Collection.php
index bea9ab639a..966f1bda35 100644
--- a/app/code/core/Mage/CatalogSearch/Model/Mysql4/Search/Collection.php
+++ b/app/code/core/Mage/CatalogSearch/Model/Mysql4/Search/Collection.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_CatalogSearch
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -59,7 +65,7 @@ protected function _getAttributesCollection()
 
     protected function _isAttributeTextAndSearchable($attribute)
     {
-        if (($attribute->getIsSearchable() && $attribute->getFrontendInput() != 'select')
+        if (($attribute->getIsSearchable() && !in_array($attribute->getFrontendInput(), array('select', 'multiselect')))
             && (in_array($attribute->getBackendType(), array('varchar', 'text')) || $attribute->getBackendType() == 'static')) {
             return true;
         }
@@ -68,7 +74,7 @@ protected function _isAttributeTextAndSearchable($attribute)
 
     protected function _hasAttributeOptionsAndSearchable($attribute)
     {
-        if ($attribute->getIsSearchable() && $attribute->getFrontendInput() == 'select') {
+        if ($attribute->getIsSearchable() && in_array($attribute->getFrontendInput(), array('select', 'multiselect'))) {
             return true;
         }
 
@@ -119,7 +125,7 @@ protected function _getSearchEntityIdsSql($query)
         }
 
         if ($sql = $this->_getSearchInOptionSql($query)) {
-            $selects[] = $sql;
+            $selects[] = "SELECT * FROM ({$sql}) AS inoptionsql"; // inheritant unions may be inside
         }
         //die(print_r($selects));
         $sql = implode(' UNION ', $selects);
@@ -130,19 +136,20 @@ protected function _getSearchEntityIdsSql($query)
      * Retrieve SQL for search entities by option
      *
      * @param unknown_type $query
-     * @return unknown
+     * @return string
      */
     protected function _getSearchInOptionSql($query)
     {
-        $attributeIds = array();
-        $table = '';
+        $attributeIds    = array();
+        $attributeTables = array();
+        $storeId = (int)$this->getStoreId();
 
         /**
          * Collect attributes with options
          */
         foreach ($this->_getAttributesCollection() as $attribute) {
             if ($this->_hasAttributeOptionsAndSearchable($attribute)) {
-                $table = $attribute->getBackend()->getTable();
+                $attributeTables[$attribute->getFrontendInput()] = $attribute->getBackend()->getTable();
                 $attributeIds[] = $attribute->getId();
             }
         }
@@ -150,40 +157,64 @@ protected function _getSearchInOptionSql($query)
             return false;
         }
 
-        $optionTable = Mage::getSingleton('core/resource')->getTableName('eav/attribute_option');
-        $optionValueTable = Mage::getSingleton('core/resource')->getTableName('eav/attribute_option_value');
+        $resource = Mage::getSingleton('core/resource');
+        $optionTable      = $resource->getTableName('eav/attribute_option');
+        $optionValueTable = $resource->getTableName('eav/attribute_option_value');
+        $attributesTable  = $resource->getTableName('eav/attribute');
 
         /**
          * Select option Ids
          */
         $select = $this->getConnection()->select()
-            ->from(array('default'=>$optionValueTable), array('option_id','option.attribute_id', 'store_id'=>'IFNULL(store.store_id, default.store_id)'))
+            ->from(array('default'=>$optionValueTable), array('option_id','option.attribute_id', 'store_id'=>'IFNULL(store.store_id, default.store_id)', 'a.frontend_input'))
             ->joinLeft(array('store'=>$optionValueTable),
-                $this->getConnection()->quoteInto('store.option_id=default.option_id AND store.store_id=?', $this->getStoreId()),
+                $this->getConnection()->quoteInto('store.option_id=default.option_id AND store.store_id=?', $storeId),
                 array())
             ->join(array('option'=>$optionTable),
                 'option.option_id=default.option_id',
                 array())
+            ->join(array('a' => $attributesTable), 'option.attribute_id=a.attribute_id', array())
             ->where('default.store_id=0')
-            ->where('option.attribute_id IN (?)', $attributeIds);
-
-        $searchCondition = 'IFNULL(store.value, default.value) LIKE :search_query';
-        $select->where($searchCondition);
-
+            ->where('option.attribute_id IN (?)', $attributeIds)
+            ->where('IFNULL(store.value, default.value) LIKE :search_query');
         $options = $this->getConnection()->fetchAll($select, array('search_query'=>$this->_searchQuery));
-
         if (empty($options)) {
             return false;
         }
 
-        $cond = array();
+        // build selects of entity ids for specified options ids by frontend input
+        $select = array();
+        foreach (array(
+            'select'      => 'value = %d',
+            'multiselect' => 'FIND_IN_SET(%d, value)')
+            as $frontendInput => $condition) {
+            if (isset($attributeTables[$frontendInput])) {
+                $where = array();
+                foreach ($options as $option) {
+                    if ($frontendInput === $option['frontend_input']) {
+                        $where[] = sprintf("attribute_id=%d AND store_id=%d AND {$condition}", $option['attribute_id'], $option['store_id'], $option['option_id']);
+                    }
+                }
+                if ($where) {
+                    $select[$frontendInput] = (string)$this->getConnection()->select()
+                        ->from($attributeTables[$frontendInput], 'entity_id')
+                        ->where(implode(' OR ', $where));
+                }
+            }
+        }
+
+        // search in catalogindex for products as part of configurable/grouped/bundle products (current store)
+        $where = array();
         foreach ($options as $option) {
-            $cond[] = "attribute_id = '{$option['attribute_id']}' AND value = '{$option['option_id']}' AND store_id = '{$option['store_id']}'";
+            $where[] = sprintf('attribute_id=%d AND value=%d', $option['attribute_id'], $option['option_id']);
+        }
+        if ($where) {
+            $select[] = (string)$this->getConnection()->select()
+                ->from($resource->getTableName('catalogindex/eav'), 'entity_id')
+                ->where(implode(' OR ', $where))
+                ->where("store_id={$storeId}");
         }
 
-        return $this->getConnection()->select()
-            ->from($table, 'entity_id')
-//            ->where('store_id=?', $this->getStoreId())
-            ->where(implode(' OR ', $cond));
+        return implode(' UNION ', $select);
     }
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/CatalogSearch/Model/Query.php b/app/code/core/Mage/CatalogSearch/Model/Query.php
index 739e6aaef7..835e4c6a27 100644
--- a/app/code/core/Mage/CatalogSearch/Model/Query.php
+++ b/app/code/core/Mage/CatalogSearch/Model/Query.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_CatalogSearch
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -48,7 +54,8 @@ public function getResultCollection()
 
             $collection->addSearchFilter($text)
                 ->addStoreFilter()
-                ->addMinimalPrice();
+                ->addMinimalPrice()
+                ->addTaxPercents();
             $this->setData('result_collection', $collection);
         }
         return $collection;
diff --git a/app/code/core/Mage/CatalogSearch/Model/Session.php b/app/code/core/Mage/CatalogSearch/Model/Session.php
index 53af59e775..b9202e951a 100644
--- a/app/code/core/Mage/CatalogSearch/Model/Session.php
+++ b/app/code/core/Mage/CatalogSearch/Model/Session.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_CatalogSearch
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/CatalogSearch/controllers/AdvancedController.php b/app/code/core/Mage/CatalogSearch/controllers/AdvancedController.php
index 2fb844ed88..3225f924a9 100644
--- a/app/code/core/Mage/CatalogSearch/controllers/AdvancedController.php
+++ b/app/code/core/Mage/CatalogSearch/controllers/AdvancedController.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_CatalogSearch
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/CatalogSearch/controllers/AjaxController.php b/app/code/core/Mage/CatalogSearch/controllers/AjaxController.php
index 4dd4671d9b..9914bbbbf3 100644
--- a/app/code/core/Mage/CatalogSearch/controllers/AjaxController.php
+++ b/app/code/core/Mage/CatalogSearch/controllers/AjaxController.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_CatalogSearch
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/CatalogSearch/controllers/ResultController.php b/app/code/core/Mage/CatalogSearch/controllers/ResultController.php
index 5a9e73e601..c33a97726d 100644
--- a/app/code/core/Mage/CatalogSearch/controllers/ResultController.php
+++ b/app/code/core/Mage/CatalogSearch/controllers/ResultController.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_CatalogSearch
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/CatalogSearch/controllers/TermController.php b/app/code/core/Mage/CatalogSearch/controllers/TermController.php
index 8a6a579e6c..ed39e41773 100644
--- a/app/code/core/Mage/CatalogSearch/controllers/TermController.php
+++ b/app/code/core/Mage/CatalogSearch/controllers/TermController.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/CatalogSearch/etc/config.xml b/app/code/core/Mage/CatalogSearch/etc/config.xml
index 799e724f95..472265c7c5 100644
--- a/app/code/core/Mage/CatalogSearch/etc/config.xml
+++ b/app/code/core/Mage/CatalogSearch/etc/config.xml
@@ -13,6 +13,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_CatalogSearch
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/CatalogSearch/etc/system.xml b/app/code/core/Mage/CatalogSearch/etc/system.xml
index be13163b93..d1b831cb21 100644
--- a/app/code/core/Mage/CatalogSearch/etc/system.xml
+++ b/app/code/core/Mage/CatalogSearch/etc/system.xml
@@ -13,6 +13,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_CatalogSearch
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-install-0.7.0.php
index 147f6229e3..7b0da42fd2 100644
--- a/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-install-0.7.0.php
+++ b/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-install-0.7.0.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_CatalogSearch
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.1-0.7.2.php
index 1fe786c879..576f67d037 100644
--- a/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.1-0.7.2.php
+++ b/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.1-0.7.2.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Eav
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.2-0.7.3.php b/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.2-0.7.3.php
index c88b47a487..d6dbbbc91b 100644
--- a/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.2-0.7.3.php
+++ b/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.2-0.7.3.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Eav
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.3-0.7.4.php b/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.3-0.7.4.php
index 8d67407423..fca1f61cfa 100644
--- a/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.3-0.7.4.php
+++ b/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.3-0.7.4.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Eav
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Checkout/Block/Cart.php b/app/code/core/Mage/Checkout/Block/Cart.php
index 0a510a24da..5d2e02be58 100644
--- a/app/code/core/Mage/Checkout/Block/Cart.php
+++ b/app/code/core/Mage/Checkout/Block/Cart.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Checkout
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Checkout/Block/Cart/Abstract.php b/app/code/core/Mage/Checkout/Block/Cart/Abstract.php
index 56d60f96a5..809b4faa02 100644
--- a/app/code/core/Mage/Checkout/Block/Cart/Abstract.php
+++ b/app/code/core/Mage/Checkout/Block/Cart/Abstract.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category    Mage
  * @package     Mage_Checkout
  * @copyright   Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Checkout/Block/Cart/Coupon.php b/app/code/core/Mage/Checkout/Block/Cart/Coupon.php
index f0ab69004f..858a55fb58 100644
--- a/app/code/core/Mage/Checkout/Block/Cart/Coupon.php
+++ b/app/code/core/Mage/Checkout/Block/Cart/Coupon.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Checkout
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Checkout/Block/Cart/Crosssell.php b/app/code/core/Mage/Checkout/Block/Cart/Crosssell.php
index dfe9808408..2dc41d52ec 100644
--- a/app/code/core/Mage/Checkout/Block/Cart/Crosssell.php
+++ b/app/code/core/Mage/Checkout/Block/Cart/Crosssell.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Checkout
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -103,12 +109,13 @@ protected function _getCollection()
             ->addAttributeToSelect('name')
             ->addAttributeToSelect('price')
             ->addAttributeToSelect('special_price')
+            ->addAttributeToSelect('special_from_date')
+            ->addAttributeToSelect('special_to_date')
             ->addAttributeToSelect('image')
             ->addAttributeToSelect('thumbnail')
             ->setStoreId(Mage::app()->getStore()->getId())
             ->addStoreFilter()
-            ->setPageSize($this->_maxItemCount)
-            ->addFilterByRequiredOptions();
+            ->setPageSize($this->_maxItemCount);
 
         Mage::getSingleton('catalog/product_status')->addSaleableFilterToCollection($collection);
         Mage::getSingleton('catalog/product_visibility')->addVisibleInCatalogFilterToCollection($collection);
diff --git a/app/code/core/Mage/Checkout/Block/Cart/Item/Renderer.php b/app/code/core/Mage/Checkout/Block/Cart/Item/Renderer.php
index fa5ed05c51..4e96b85c34 100644
--- a/app/code/core/Mage/Checkout/Block/Cart/Item/Renderer.php
+++ b/app/code/core/Mage/Checkout/Block/Cart/Item/Renderer.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category    Mage
  * @package     Mage_Checkout
  * @copyright   Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Checkout/Block/Cart/Item/Renderer/Configurable.php b/app/code/core/Mage/Checkout/Block/Cart/Item/Renderer/Configurable.php
index 534cfa9209..5a27c8b540 100644
--- a/app/code/core/Mage/Checkout/Block/Cart/Item/Renderer/Configurable.php
+++ b/app/code/core/Mage/Checkout/Block/Cart/Item/Renderer/Configurable.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category    Mage
  * @package     Mage_Checkout
  * @copyright   Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Checkout/Block/Cart/Item/Renderer/Grouped.php b/app/code/core/Mage/Checkout/Block/Cart/Item/Renderer/Grouped.php
index 1740f9eb56..e775d44c4b 100644
--- a/app/code/core/Mage/Checkout/Block/Cart/Item/Renderer/Grouped.php
+++ b/app/code/core/Mage/Checkout/Block/Cart/Item/Renderer/Grouped.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category    Mage
  * @package     Mage_Checkout
  * @copyright   Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Checkout/Block/Cart/Shipping.php b/app/code/core/Mage/Checkout/Block/Cart/Shipping.php
index e879aa6eca..68f270a0be 100644
--- a/app/code/core/Mage/Checkout/Block/Cart/Shipping.php
+++ b/app/code/core/Mage/Checkout/Block/Cart/Shipping.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Checkout
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -21,7 +27,9 @@
 
 class Mage_Checkout_Block_Cart_Shipping extends Mage_Checkout_Block_Cart_Abstract
 {
-    private $_carriers;
+    protected $_carriers = null;
+    protected $_rates = array();
+    protected $_address = array();
 
     public function getEstimateRates()
     {
diff --git a/app/code/core/Mage/Checkout/Block/Cart/Sidebar.php b/app/code/core/Mage/Checkout/Block/Cart/Sidebar.php
index 2225d903dd..0991a18e1d 100644
--- a/app/code/core/Mage/Checkout/Block/Cart/Sidebar.php
+++ b/app/code/core/Mage/Checkout/Block/Cart/Sidebar.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category    Mage
  * @package     Mage_Checkout
  * @copyright   Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -55,17 +61,46 @@ public function getRecentItems()
     }
 
     /**
-     * Get shopping cart subtotal
+     * Get shopping cart subtotal.
+     * It will include tax, if required by config settings.
      *
      * @return decimal
      */
-    public function getSubtotal()
+    public function getSubtotal($skipTax = false)
     {
+        $subtotal = 0;
         $totals = $this->getTotals();
         if (isset($totals['subtotal'])) {
-            return $totals['subtotal']->getValue();
+            $subtotal = $totals['subtotal']->getValue();
+            if (!$skipTax) {
+                if ((!$this->helper('tax')->displayCartBothPrices()) && $this->helper('tax')->displayCartPriceInclTax()) {
+                    $subtotal = $this->_addTax($subtotal);
+                }
+            }
+        }
+        return $subtotal;
+    }
+
+    /**
+     * Get subtotal, including tax.
+     * Will return > 0 only if appropriate config settings are enabled.
+     *
+     * @return decimal
+     */
+    public function getSubtotalInclTax()
+    {
+        if (!$this->helper('tax')->displayCartBothPrices()) {
+            return 0;
+        }
+        return $this->_addTax($this->getSubtotal(true));
+    }
+
+    private function _addTax($price) {
+        $totals = $this->getTotals();
+        if (isset($totals['tax'])) {
+            $price += $totals['tax']->getValue();
         }
-        return 0;
+        return $price;
     }
 
     public function getSummaryCount()
diff --git a/app/code/core/Mage/Checkout/Block/Cart/Totals.php b/app/code/core/Mage/Checkout/Block/Cart/Totals.php
index ea6130ee2c..6e480ea1c9 100644
--- a/app/code/core/Mage/Checkout/Block/Cart/Totals.php
+++ b/app/code/core/Mage/Checkout/Block/Cart/Totals.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Checkout
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Checkout/Block/Links.php b/app/code/core/Mage/Checkout/Block/Links.php
index 0a7b3e0fe3..14cf2c4c60 100644
--- a/app/code/core/Mage/Checkout/Block/Links.php
+++ b/app/code/core/Mage/Checkout/Block/Links.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Checkout
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Checkout/Block/Multishipping/Abstract.php b/app/code/core/Mage/Checkout/Block/Multishipping/Abstract.php
index 459efa6bd2..7be69e8d48 100644
--- a/app/code/core/Mage/Checkout/Block/Multishipping/Abstract.php
+++ b/app/code/core/Mage/Checkout/Block/Multishipping/Abstract.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Checkout
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Checkout/Block/Multishipping/Address/Select.php b/app/code/core/Mage/Checkout/Block/Multishipping/Address/Select.php
index a5191fa1ca..fdc973b44a 100644
--- a/app/code/core/Mage/Checkout/Block/Multishipping/Address/Select.php
+++ b/app/code/core/Mage/Checkout/Block/Multishipping/Address/Select.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Checkout
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Checkout/Block/Multishipping/Addresses.php b/app/code/core/Mage/Checkout/Block/Multishipping/Addresses.php
index cf8df201d0..ad6437e19f 100644
--- a/app/code/core/Mage/Checkout/Block/Multishipping/Addresses.php
+++ b/app/code/core/Mage/Checkout/Block/Multishipping/Addresses.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Checkout
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Checkout/Block/Multishipping/Billing.php b/app/code/core/Mage/Checkout/Block/Multishipping/Billing.php
index 9559f50431..cda1944ca2 100644
--- a/app/code/core/Mage/Checkout/Block/Multishipping/Billing.php
+++ b/app/code/core/Mage/Checkout/Block/Multishipping/Billing.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Checkout
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Checkout/Block/Multishipping/Billing/Items.php b/app/code/core/Mage/Checkout/Block/Multishipping/Billing/Items.php
index 2b6157dad0..a3b4560387 100644
--- a/app/code/core/Mage/Checkout/Block/Multishipping/Billing/Items.php
+++ b/app/code/core/Mage/Checkout/Block/Multishipping/Billing/Items.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Checkout
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Checkout/Block/Multishipping/Link.php b/app/code/core/Mage/Checkout/Block/Multishipping/Link.php
index 09e6394393..905759d72d 100644
--- a/app/code/core/Mage/Checkout/Block/Multishipping/Link.php
+++ b/app/code/core/Mage/Checkout/Block/Multishipping/Link.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Checkout
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -31,23 +37,18 @@ public function getCheckoutUrl()
     {
         return $this->getUrl('checkout/multishipping', array('_secure'=>true));
     }
-    
+
     public function getQuote()
     {
         return Mage::getSingleton('checkout/session')->getQuote();
     }
-    
+
     public function _toHtml()
     {
-        $maximunQty = (int)Mage::getStoreConfig('shipping/option/checkout_multiple_maximum_qty');
-        if (Mage::getStoreConfig('shipping/option/checkout_multiple')
-            && !$this->getQuote()->hasItemsWithDecimalQty()
-            && $this->getQuote()->validateMinimumAmount()
-            && ($this->getQuote()->getItemsSummaryQty() - $this->getQuote()->getItemVirtualQty()) > 0
-            && $this->getQuote()->getItemsSummaryQty() <= $maximunQty) {
-            return parent::_toHtml();
+        if (!Mage::helper('checkout')->isMultishippingCheckoutAvailable()){
+            return '';
         }
 
-        return '';
+        return parent::_toHtml();
     }
 }
diff --git a/app/code/core/Mage/Checkout/Block/Multishipping/Overview.php b/app/code/core/Mage/Checkout/Block/Multishipping/Overview.php
index b9a9f070c4..356a922c8e 100644
--- a/app/code/core/Mage/Checkout/Block/Multishipping/Overview.php
+++ b/app/code/core/Mage/Checkout/Block/Multishipping/Overview.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Checkout
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Checkout/Block/Multishipping/Payment/Info.php b/app/code/core/Mage/Checkout/Block/Multishipping/Payment/Info.php
index 44bc4b471e..2c961ad82c 100644
--- a/app/code/core/Mage/Checkout/Block/Multishipping/Payment/Info.php
+++ b/app/code/core/Mage/Checkout/Block/Multishipping/Payment/Info.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Checkout
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Checkout/Block/Multishipping/Shipping.php b/app/code/core/Mage/Checkout/Block/Multishipping/Shipping.php
index 0a3f314600..d92d90a858 100644
--- a/app/code/core/Mage/Checkout/Block/Multishipping/Shipping.php
+++ b/app/code/core/Mage/Checkout/Block/Multishipping/Shipping.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Checkout
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Checkout/Block/Multishipping/State.php b/app/code/core/Mage/Checkout/Block/Multishipping/State.php
index 4aed77ef28..e992b61d91 100644
--- a/app/code/core/Mage/Checkout/Block/Multishipping/State.php
+++ b/app/code/core/Mage/Checkout/Block/Multishipping/State.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Checkout
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Checkout/Block/Multishipping/Success.php b/app/code/core/Mage/Checkout/Block/Multishipping/Success.php
index f8bdd28b99..9c6c98a1a1 100644
--- a/app/code/core/Mage/Checkout/Block/Multishipping/Success.php
+++ b/app/code/core/Mage/Checkout/Block/Multishipping/Success.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Checkout
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Checkout/Block/Onepage.php b/app/code/core/Mage/Checkout/Block/Onepage.php
index 16f799e3e0..141f6dcce2 100644
--- a/app/code/core/Mage/Checkout/Block/Onepage.php
+++ b/app/code/core/Mage/Checkout/Block/Onepage.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Checkout
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Checkout/Block/Onepage/Abstract.php b/app/code/core/Mage/Checkout/Block/Onepage/Abstract.php
index 60860bd81e..3660960416 100644
--- a/app/code/core/Mage/Checkout/Block/Onepage/Abstract.php
+++ b/app/code/core/Mage/Checkout/Block/Onepage/Abstract.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Checkout
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Checkout/Block/Onepage/Billing.php b/app/code/core/Mage/Checkout/Block/Onepage/Billing.php
index fb2e80861f..ef7921d1f3 100644
--- a/app/code/core/Mage/Checkout/Block/Onepage/Billing.php
+++ b/app/code/core/Mage/Checkout/Block/Onepage/Billing.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Checkout
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Checkout/Block/Onepage/Failure.php b/app/code/core/Mage/Checkout/Block/Onepage/Failure.php
index 75f780f692..5721666486 100644
--- a/app/code/core/Mage/Checkout/Block/Onepage/Failure.php
+++ b/app/code/core/Mage/Checkout/Block/Onepage/Failure.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Checkout
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Checkout/Block/Onepage/Link.php b/app/code/core/Mage/Checkout/Block/Onepage/Link.php
index 6da49a1576..2357b8f36c 100644
--- a/app/code/core/Mage/Checkout/Block/Onepage/Link.php
+++ b/app/code/core/Mage/Checkout/Block/Onepage/Link.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Checkout
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Checkout/Block/Onepage/Login.php b/app/code/core/Mage/Checkout/Block/Onepage/Login.php
index e505bc09c7..aed6b91516 100644
--- a/app/code/core/Mage/Checkout/Block/Onepage/Login.php
+++ b/app/code/core/Mage/Checkout/Block/Onepage/Login.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Checkout
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Checkout/Block/Onepage/Payment.php b/app/code/core/Mage/Checkout/Block/Onepage/Payment.php
index bace886d1e..176d4fcf0d 100644
--- a/app/code/core/Mage/Checkout/Block/Onepage/Payment.php
+++ b/app/code/core/Mage/Checkout/Block/Onepage/Payment.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Checkout
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Checkout/Block/Onepage/Payment/Info.php b/app/code/core/Mage/Checkout/Block/Onepage/Payment/Info.php
index 8c352293b4..2a8f4c4238 100644
--- a/app/code/core/Mage/Checkout/Block/Onepage/Payment/Info.php
+++ b/app/code/core/Mage/Checkout/Block/Onepage/Payment/Info.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Checkout
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Checkout/Block/Onepage/Payment/Methods.php b/app/code/core/Mage/Checkout/Block/Onepage/Payment/Methods.php
index 32bd7398d1..f74f2a519d 100644
--- a/app/code/core/Mage/Checkout/Block/Onepage/Payment/Methods.php
+++ b/app/code/core/Mage/Checkout/Block/Onepage/Payment/Methods.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Checkout
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Checkout/Block/Onepage/Progress.php b/app/code/core/Mage/Checkout/Block/Onepage/Progress.php
index 27e3d81bf9..1f522dd916 100644
--- a/app/code/core/Mage/Checkout/Block/Onepage/Progress.php
+++ b/app/code/core/Mage/Checkout/Block/Onepage/Progress.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Checkout
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Checkout/Block/Onepage/Review.php b/app/code/core/Mage/Checkout/Block/Onepage/Review.php
index 69f7fdbe0f..f9cd41e9d8 100644
--- a/app/code/core/Mage/Checkout/Block/Onepage/Review.php
+++ b/app/code/core/Mage/Checkout/Block/Onepage/Review.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Checkout
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Checkout/Block/Onepage/Review/Info.php b/app/code/core/Mage/Checkout/Block/Onepage/Review/Info.php
index 7822f03167..53062b8fda 100644
--- a/app/code/core/Mage/Checkout/Block/Onepage/Review/Info.php
+++ b/app/code/core/Mage/Checkout/Block/Onepage/Review/Info.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category    Mage
  * @package     Mage_Checkout
  * @copyright   Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Checkout/Block/Onepage/Shipping.php b/app/code/core/Mage/Checkout/Block/Onepage/Shipping.php
index eb7566742f..f1319c5e86 100644
--- a/app/code/core/Mage/Checkout/Block/Onepage/Shipping.php
+++ b/app/code/core/Mage/Checkout/Block/Onepage/Shipping.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Checkout
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Checkout/Block/Onepage/Shipping/Method.php b/app/code/core/Mage/Checkout/Block/Onepage/Shipping/Method.php
index 061ef7b12a..913ba215d0 100644
--- a/app/code/core/Mage/Checkout/Block/Onepage/Shipping/Method.php
+++ b/app/code/core/Mage/Checkout/Block/Onepage/Shipping/Method.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Checkout
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Checkout/Block/Onepage/Shipping/Method/Additional.php b/app/code/core/Mage/Checkout/Block/Onepage/Shipping/Method/Additional.php
index 618e005eda..e6f676f9f4 100644
--- a/app/code/core/Mage/Checkout/Block/Onepage/Shipping/Method/Additional.php
+++ b/app/code/core/Mage/Checkout/Block/Onepage/Shipping/Method/Additional.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Checkout
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Checkout/Block/Onepage/Shipping/Method/Available.php b/app/code/core/Mage/Checkout/Block/Onepage/Shipping/Method/Available.php
index bdc4dd57c8..886453335c 100644
--- a/app/code/core/Mage/Checkout/Block/Onepage/Shipping/Method/Available.php
+++ b/app/code/core/Mage/Checkout/Block/Onepage/Shipping/Method/Available.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Checkout
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Checkout/Block/Onepage/Success.php b/app/code/core/Mage/Checkout/Block/Onepage/Success.php
index 0179233173..ae65979db5 100644
--- a/app/code/core/Mage/Checkout/Block/Onepage/Success.php
+++ b/app/code/core/Mage/Checkout/Block/Onepage/Success.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Checkout
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -27,6 +33,8 @@
  */
 class Mage_Checkout_Block_Onepage_Success extends Mage_Core_Block_Template
 {
+    private $_order;
+
     /**
      * Retrieve identifier of created order
      *
@@ -44,7 +52,7 @@ public function getOrderId()
      */
     public function canPrint()
     {
-        return Mage::getSingleton('customer/session')->isLoggedIn();
+        return Mage::getSingleton('customer/session')->isLoggedIn() && $this->isOrderVisible();
     }
 
     /**
@@ -70,4 +78,20 @@ public function getViewOrderUrl()
     {
         return $this->getUrl('sales/order/view/', array('order_id'=>Mage::getSingleton('checkout/session')->getLastOrderId(), '_secure' => true));
     }
+
+    /**
+     * See if the order has state, visible on frontend
+     *
+     * @return bool
+     */
+    public function isOrderVisible()
+    {
+        if (!$this->_order) {
+            $this->_order = Mage::getModel('sales/order')->load(Mage::getSingleton('checkout/session')->getLastOrderId());
+        }
+        if (!$this->_order) {
+            return false;
+        }
+        return !in_array($this->_order->getState(), Mage::getSingleton('sales/order_config')->getInvisibleOnFrontStates());
+    }
 }
\ No newline at end of file
diff --git a/app/code/core/Mage/Checkout/Block/Success.php b/app/code/core/Mage/Checkout/Block/Success.php
index 8becfd22ae..38dd24ff51 100644
--- a/app/code/core/Mage/Checkout/Block/Success.php
+++ b/app/code/core/Mage/Checkout/Block/Success.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Checkout
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Checkout/Block/Total/Default.php b/app/code/core/Mage/Checkout/Block/Total/Default.php
index 16ba476386..fc72d89e79 100644
--- a/app/code/core/Mage/Checkout/Block/Total/Default.php
+++ b/app/code/core/Mage/Checkout/Block/Total/Default.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Sales
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Checkout/Block/Total/Tax.php b/app/code/core/Mage/Checkout/Block/Total/Tax.php
index b49ec9f243..a6243975b2 100644
--- a/app/code/core/Mage/Checkout/Block/Total/Tax.php
+++ b/app/code/core/Mage/Checkout/Block/Total/Tax.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Sales
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Checkout/Controller/Action.php b/app/code/core/Mage/Checkout/Controller/Action.php
new file mode 100644
index 0000000000..5080e11c6e
--- /dev/null
+++ b/app/code/core/Mage/Checkout/Controller/Action.php
@@ -0,0 +1,61 @@
+getCustomer();
+        if ($customer && $customer->getId()) {
+            $validationResult = $customer->validate();
+            if ((true !== $validationResult) && is_array($validationResult)) {
+                if ($addErrors) {
+                    foreach ($validationResult as $error) {
+                        Mage::getSingleton('customer/session')->addError($error);
+                    }
+                }
+                if ($redirect) {
+                    $this->_redirect('customer/account/edit');
+                    $this->setFlag('', self::FLAG_NO_DISPATCH, true);
+                }
+                return false;
+            }
+        }
+        return true;
+    }
+}
diff --git a/app/code/core/Mage/Checkout/Exception.php b/app/code/core/Mage/Checkout/Exception.php
index 284abd341a..6017170fc3 100644
--- a/app/code/core/Mage/Checkout/Exception.php
+++ b/app/code/core/Mage/Checkout/Exception.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Checkout
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Checkout/Helper/Cart.php b/app/code/core/Mage/Checkout/Helper/Cart.php
index 398dbff84a..9e8d7a13b0 100644
--- a/app/code/core/Mage/Checkout/Helper/Cart.php
+++ b/app/code/core/Mage/Checkout/Helper/Cart.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Checkout
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -46,37 +52,34 @@ public function getAddUrl($product, $additional = array())
         /**
          * Identify continue shopping url
          */
-        if ($currentProduct = Mage::registry('current_product')) {
-            /**
-             * go to product view page
-             */
-            $continueShoppingUrl = $currentProduct->getProductUrl();
-        } elseif ($currentCategory = Mage::registry('current_category')) {
-            /**
-             * go to category view page
-             */
-          
-            //$continueShoppingUrl = $currentCategory->getUrl();
-            $continueShoppingUrl = $this->_getRequest()->getRequestUri();
-        } else {
-            $continueShoppingUrl = $this->_getUrl('*/*/*', array('_current'=>true));
-        }
-	
+//        if ($currentProduct = Mage::registry('current_product')) {
+//            /**
+//             * go to product view page
+//            */
+//            $continueShoppingUrl = $currentProduct->getProductUrl();
+//        } elseif ($currentCategory = Mage::registry('current_category')) {
+//            /**
+//             * go to category view page
+//             */
+//          
+//            $continueShoppingUrl = $currentCategory->getUrl().(count($this->_getRequest()->getQuery())!=0?'?'.http_build_qu//ery($this->_getRequest()->getQuery(), '', '&'):'');
+//         
+//       } else {
+//            $continueShoppingUrl = $this->_getUrl('*/*/*', array('_current'=>true));
+//        }
+        
+		$continueShoppingUrl = $this->getCurrentUrl();
+		
         $params = array(
             Mage_Core_Controller_Front_Action::PARAM_NAME_URL_ENCODED => Mage::helper('core')->urlEncode($continueShoppingUrl),
             'product' => $product->getId()
         );
         
-       // $params = array("me"=>$this->_getRequest()->getRequestUri());
-
         if ($this->_getRequest()->getRouteName() == 'checkout'
             && $this->_getRequest()->getControllerName() == 'cart') {
             $params['in_cart'] = 1;
         }
-        
-       
-        	
-    
+
         if (count($additional)){
             $params = array_merge($params, $additional);
         }
diff --git a/app/code/core/Mage/Checkout/Helper/Data.php b/app/code/core/Mage/Checkout/Helper/Data.php
index a0651f9fe8..f0e51b7be5 100644
--- a/app/code/core/Mage/Checkout/Helper/Data.php
+++ b/app/code/core/Mage/Checkout/Helper/Data.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Checkout
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -90,7 +96,8 @@ public function getPriceInclTax($item)
         $price = ($item->getCalculationPrice() ? $item->getCalculationPrice() : $item->getPrice());
         $qty = ($item->getQty() ? $item->getQty() : ($item->getQtyOrdered() ? $item->getQtyOrdered() : 1));
         $tax = ($item->getTaxBeforeDiscount() ? $item->getTaxBeforeDiscount() : $item->getTaxAmount());
-        return $price+($tax/$qty);
+        $price = Mage::app()->getStore()->roundPrice($price+($tax/$qty));
+        return $price;
     }
 
     public function getSubtotalInclTax($item)
@@ -98,4 +105,123 @@ public function getSubtotalInclTax($item)
         $tax = ($item->getTaxBeforeDiscount() ? $item->getTaxBeforeDiscount() : $item->getTaxAmount());
         return $item->getRowTotal()+$tax;
     }
+
+    /**
+     * Send email id payment was failed
+     *
+     * @param Mage_Sales_Model_Quote $checkout
+     * @param string $message
+     * @param string $checkoutType
+     * @return Mage_Checkout_Helper_Data
+     */
+    public function sendPaymentFailedEmail($checkout, $message, $checkoutType = 'onepage')
+    {
+        $translate = Mage::getSingleton('core/translate');
+        /* @var $translate Mage_Core_Model_Translate */
+        $translate->setTranslateInline(false);
+
+        $mailTemplate = Mage::getModel('core/email_template');
+        /* @var $mailTemplate Mage_Core_Model_Email_Template */
+
+        $template = Mage::getStoreConfig('checkout/payment_failed/template', $checkout->getStoreId());
+
+        $copyTo = $this->_getEmails('checkout/payment_failed/copy_to', $checkout->getStoreId());
+        $copyMethod = Mage::getStoreConfig('checkout/payment_failed/copy_method', $checkout->getStoreId());
+        if ($copyTo && $copyMethod == 'bcc') {
+            $mailTemplate->addBcc($copyTo);
+        }
+
+        $_reciever = Mage::getStoreConfig('checkout/payment_failed/reciever', $checkout->getStoreId());
+        $sendTo = array(
+            array(
+                'email' => Mage::getStoreConfig('trans_email/ident_'.$_reciever.'/email', $checkout->getStoreId()),
+                'name'  => Mage::getStoreConfig('trans_email/ident_'.$_reciever.'/name', $checkout->getStoreId())
+            )
+        );
+
+        if ($copyTo && $copyMethod == 'copy') {
+            foreach ($copyTo as $email) {
+                $sendTo[] = array(
+                    'email' => $email,
+                    'name'  => null
+                );
+            }
+        }
+        $shippingMethod = '';
+        if ($shippingInfo = $checkout->getShippingAddress()->getShippingMethod()) {
+            $data = explode('_', $shippingInfo);
+            $shippingMethod = $data[0];
+        }
+
+        $paymentMethod = '';
+        if ($paymentInfo = $checkout->getPayment()) {
+            $paymentMethod = $paymentInfo->getMethod();
+        }
+
+        $items = '';
+        foreach ($checkout->getItemsCollection() as $_item) {
+            /* @var $_item Mage_Sales_Model_Quote_Item */
+            $items .= $_item->getProduct()->getName() . '  x '. $_item->getQty() . '  '
+                    . $checkout->getStoreCurrencyCode() . ' ' . $_item->getProduct()->getFinalPrice($_item->getQty()) . "\n";
+        }
+        $total = $checkout->getStoreCurrencyCode() . ' ' . $checkout->getGrandTotal();
+
+        foreach ($sendTo as $recipient) {
+            $mailTemplate->setDesignConfig(array('area'=>'frontend', 'store'=>$checkout->getStoreId()))
+                ->sendTransactional(
+                    $template,
+                    Mage::getStoreConfig('checkout/payment_failed/identity', $checkout->getStoreId()),
+                    $recipient['email'],
+                    $recipient['name'],
+                    array(
+                        'reason' => $message,
+                        'checkoutType' => $checkoutType,
+                        'dateAndTime' => Mage::app()->getLocale()->date(),
+                        'customer' => $checkout->getCustomerFirstname() . ' ' . $checkout->getCustomerLastname(),
+                        'customerEmail' => $checkout->getCustomerEmail(),
+                        'billingAddress' => $checkout->getBillingAddress(),
+                        'shippingAddress' => $checkout->getShippingAddress(),
+                        'shippingMethod' => Mage::getStoreConfig('carriers/'.$shippingMethod.'/title'),
+                        'paymentMethod' => Mage::getStoreConfig('payment/'.$paymentMethod.'/title'),
+                        'items' => nl2br($items),
+                        'total' => $total
+                    )
+                );
+        }
+
+        $translate->setTranslateInline(true);
+
+        return $this;
+    }
+
+    protected function _getEmails($configPath, $storeId)
+    {
+        $data = Mage::getStoreConfig($configPath, $storeId);
+        if (!empty($data)) {
+            return explode(',', $data);
+        }
+        return false;
+    }
+
+    /**
+     * Check if multishipping checkout is available.
+     * There should be a valid quote in checkout session. If not, only the config value will be returned.
+     *
+     * @return bool
+     */
+    public function isMultishippingCheckoutAvailable()
+    {
+        $quote = $this->getQuote();
+        $isMultiShipping = (bool)(int)Mage::getStoreConfig('shipping/option/checkout_multiple');
+        if ((!$quote) || !$quote->hasItems()) {
+            return $isMultiShipping;
+        }
+        $maximunQty = (int)Mage::getStoreConfig('shipping/option/checkout_multiple_maximum_qty');
+        return $isMultiShipping
+            && !$quote->hasItemsWithDecimalQty()
+            && $quote->validateMinimumAmount()
+            && (($quote->getItemsSummaryQty() - $quote->getItemVirtualQty()) > 0)
+            && ($quote->getItemsSummaryQty() <= $maximunQty)
+        ;
+    }
 }
\ No newline at end of file
diff --git a/app/code/core/Mage/Checkout/Helper/Url.php b/app/code/core/Mage/Checkout/Helper/Url.php
index cb113f6598..aa797ab21c 100644
--- a/app/code/core/Mage/Checkout/Helper/Url.php
+++ b/app/code/core/Mage/Checkout/Helper/Url.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Checkout
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Checkout/Model/Agreement.php b/app/code/core/Mage/Checkout/Model/Agreement.php
index 4a873a6e02..ea7593b6c8 100644
--- a/app/code/core/Mage/Checkout/Model/Agreement.php
+++ b/app/code/core/Mage/Checkout/Model/Agreement.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_CheckoutAgreement
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Checkout/Model/Cart.php b/app/code/core/Mage/Checkout/Model/Cart.php
index d19fd261bb..aa6321de35 100644
--- a/app/code/core/Mage/Checkout/Model/Cart.php
+++ b/app/code/core/Mage/Checkout/Model/Cart.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category    Mage
  * @package     Mage_Checkout
  * @copyright   Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Checkout/Model/Config/Source/Cart/Summary.php b/app/code/core/Mage/Checkout/Model/Config/Source/Cart/Summary.php
index 1aa42fda25..91aa2392fe 100644
--- a/app/code/core/Mage/Checkout/Model/Config/Source/Cart/Summary.php
+++ b/app/code/core/Mage/Checkout/Model/Config/Source/Cart/Summary.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Adminhtml
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Checkout/Model/Mysql4/Agreement.php b/app/code/core/Mage/Checkout/Model/Mysql4/Agreement.php
index ee3886a02b..34068d12a9 100644
--- a/app/code/core/Mage/Checkout/Model/Mysql4/Agreement.php
+++ b/app/code/core/Mage/Checkout/Model/Mysql4/Agreement.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_CheckoutAgreement
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Checkout/Model/Mysql4/Agreement/Collection.php b/app/code/core/Mage/Checkout/Model/Mysql4/Agreement/Collection.php
index 04ce7a58d5..230ab12208 100644
--- a/app/code/core/Mage/Checkout/Model/Mysql4/Agreement/Collection.php
+++ b/app/code/core/Mage/Checkout/Model/Mysql4/Agreement/Collection.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_CheckoutAgreement
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -37,7 +43,8 @@ public function addStoreFilter($store)
             'main_table.agreement_id = store_table.agreement_id',
             array()
         )
-        ->where('store_table.store_id in (?)', array(0, $store));
+        ->where('store_table.store_id in (?)', array(0, $store))
+        ->group('main_table.agreement_id');
 
         return $this;
     }
diff --git a/app/code/core/Mage/Checkout/Model/Mysql4/Cart.php b/app/code/core/Mage/Checkout/Model/Mysql4/Cart.php
index ec32ec0456..ac92c04e4f 100644
--- a/app/code/core/Mage/Checkout/Model/Mysql4/Cart.php
+++ b/app/code/core/Mage/Checkout/Model/Mysql4/Cart.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Checkout
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Checkout/Model/Observer.php b/app/code/core/Mage/Checkout/Model/Observer.php
index 6dad519dcd..2674d840d2 100644
--- a/app/code/core/Mage/Checkout/Model/Observer.php
+++ b/app/code/core/Mage/Checkout/Model/Observer.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Checkout
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Checkout/Model/Session.php b/app/code/core/Mage/Checkout/Model/Session.php
index 1a75b8c797..d53133f24d 100644
--- a/app/code/core/Mage/Checkout/Model/Session.php
+++ b/app/code/core/Mage/Checkout/Model/Session.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Checkout
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -169,4 +175,11 @@ public function resetCheckout()
         $this->setCheckoutState(self::CHECKOUT_STATE_BEGIN);
         return $this;
     }
+
+    public function replaceQuote($quote)
+    {
+        $this->_quote = $quote;
+        $this->setQuoteId($quote->getId());
+        return $this;
+    }
 }
\ No newline at end of file
diff --git a/app/code/core/Mage/Checkout/Model/Type/Abstract.php b/app/code/core/Mage/Checkout/Model/Type/Abstract.php
index 5530f577c5..65f322fb11 100644
--- a/app/code/core/Mage/Checkout/Model/Type/Abstract.php
+++ b/app/code/core/Mage/Checkout/Model/Type/Abstract.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Checkout
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Checkout/Model/Type/Multishipping.php b/app/code/core/Mage/Checkout/Model/Type/Multishipping.php
index 1b205d3382..5d43715d38 100644
--- a/app/code/core/Mage/Checkout/Model/Type/Multishipping.php
+++ b/app/code/core/Mage/Checkout/Model/Type/Multishipping.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Checkout
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -311,6 +317,7 @@ public function setPaymentMethod($payment)
      */
     protected function _prepareOrder(Mage_Sales_Model_Quote_Address $address)
     {
+        $this->getQuote()->unsReservedOrderId();
         $this->getQuote()->reserveOrderId();
         $convertQuote = Mage::getSingleton('sales/convert_quote');
         $order = $convertQuote->addressToOrder($address);
@@ -327,9 +334,11 @@ protected function _prepareOrder(Mage_Sales_Model_Quote_Address $address)
         $order->setPayment($convertQuote->paymentToOrderPayment($this->getQuote()->getPayment()));
 
         foreach ($address->getAllItems() as $item) {
-            $orderItem = $convertQuote->itemToOrderItem($item->getQuoteItem());
-            if ($item->getQuoteItem()->getParentItem()) {
-                $orderItem->setParentItem($order->getItemByQuoteItemId($item->getQuoteItem()->getParentItem()->getId()));
+            $item->setProductType($item->getQuoteItem()->getProductType())
+                ->setProductOptions($item->getQuoteItem()->getProduct()->getTypeInstance()->getOrderOptions());
+            $orderItem = $convertQuote->itemToOrderItem($item);
+            if ($item->getParentItem()) {
+                $orderItem->setParentItem($order->getItemByQuoteItemId($item->getParentItem()->getId()));
             }
             $order->addItem($orderItem);
         }
@@ -438,4 +447,17 @@ public function getMinimumAmountError()
         }
         return $error;
     }
+
+    /**
+     * Function is deprecated. Moved into helper.
+     *
+     * Check if multishipping checkout is available.
+     * There should be a valid quote in checkout session. If not, only the config value will be returned.
+     *
+     * @return bool
+     */
+    public function isCheckoutAvailable()
+    {
+        return Mage::helper('checkout')->isMultishippingCheckoutAvailable();
+    }
 }
diff --git a/app/code/core/Mage/Checkout/Model/Type/Multishipping/State.php b/app/code/core/Mage/Checkout/Model/Type/Multishipping/State.php
index 1db14769e0..12f701a659 100644
--- a/app/code/core/Mage/Checkout/Model/Type/Multishipping/State.php
+++ b/app/code/core/Mage/Checkout/Model/Type/Multishipping/State.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Checkout
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Checkout/Model/Type/Onepage.php b/app/code/core/Mage/Checkout/Model/Type/Onepage.php
index a64df275de..5a894a077e 100644
--- a/app/code/core/Mage/Checkout/Model/Type/Onepage.php
+++ b/app/code/core/Mage/Checkout/Model/Type/Onepage.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Checkout
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -147,18 +153,10 @@ public function saveBilling($data, $customerAddressId)
         }
 
         if (!$this->getQuote()->getCustomerId() && 'register' == $this->getQuote()->getCheckoutMethod()) {
-            $email = $address->getEmail();
-            /**
-             * Fix for #5076
-             * @see Mage_Customer_Model_Entity_Customer::loadByEmail()
-             */
-            $customer = Mage::getModel('customer/customer')->setWebsiteId(Mage::app()->getWebsite()->getId())->loadByEmail($email);
-            if ($customer->getId()) {
-                $res = array(
-                    'error' => 1,
+            if ($this->_customerEmailExists($address->getEmail(), Mage::app()->getWebsite()->getId())) {
+                return array('error' => 1,
                     'message' => Mage::helper('checkout')->__('There is already a customer registered using this email address')
                 );
-                return $res;
             }
         }
 
@@ -179,8 +177,10 @@ public function saveBilling($data, $customerAddressId)
                     $billing = clone $address;
                     $billing->unsAddressId()->unsAddressType();
                     $shipping = $this->getQuote()->getShippingAddress();
+                    $shippingMethod = $shipping->getShippingMethod();
                     $shipping->addData($billing->getData())
                         ->setSameAsBilling(1)
+                        ->setShippingMethod($shippingMethod)
                         ->setCollectShippingRates(true);
                     $this->getCheckout()->setStepData('shipping', 'complete', true);
                     break;
@@ -192,7 +192,7 @@ public function saveBilling($data, $customerAddressId)
             $this->getQuote()->setPasswordHash($customer->encryptPassword($address->getCustomerPassword()));
         }
 
-        $this->getQuote()->setCustomerDob($address->getDob());
+        $this->getQuote()->setCustomerDob(Mage::app()->getLocale()->date($address->getDob(), null, null, false)->toString('yyyy-MM-dd'));
         $this->getQuote()->collectTotals();
         $this->getQuote()->save();
 
@@ -319,7 +319,7 @@ protected function validateOrder()
         }
 
         if (!($this->getQuote()->getPayment()->getMethod())) {
-            Mage::throwException('Please select valid payment method.');
+            Mage::throwException($helper->__('Please select valid payment method.'));
         }
     }
 
@@ -338,6 +338,9 @@ public function saveOrder()
         }
         switch ($this->getQuote()->getCheckoutMethod()) {
         case 'guest':
+            if (!$this->getQuote()->isAllowedGuestCheckout()) {
+                Mage::throwException(Mage::helper('checkout')->__('Sorry, guest checkout is not enabled. Please try again or contact store owner.'));
+            }
             $this->getQuote()->setCustomerEmail($billing->getEmail())
                 ->setCustomerIsGuest(true)
                 ->setCustomerGroupId(Mage_Customer_Model_Group::NOT_LOGGED_IN_ID);
@@ -434,6 +437,12 @@ public function saveOrder()
          * We can use configuration data for declare new order status
          */
         Mage::dispatchEvent('checkout_type_onepage_save_order', array('order'=>$order, 'quote'=>$this->getQuote()));
+        // check again, if customer exists
+        if ($this->getQuote()->getCheckoutMethod() == 'register') {
+            if ($this->_customerEmailExists($customer->getEmail(), Mage::app()->getWebsite()->getId())) {
+                Mage::throwException(Mage::helper('checkout')->__('There is already a customer registered using this email address'));
+            }
+        }
         $order->place();
 
         if ($this->getQuote()->getCheckoutMethod()=='register') {
@@ -518,6 +527,26 @@ public function saveOrder()
         return $this;
     }
 
+    /**
+     * Check if customer email exists
+     *
+     * @param string $email
+     * @param int $websiteId
+     * @return false|Mage_Customer_Model_Customer
+     */
+    protected function _customerEmailExists($email, $websiteId = null)
+    {
+        $customer = Mage::getModel('customer/customer');
+        if ($websiteId) {
+            $customer->setWebsiteId($websiteId);
+        }
+        $customer->loadByEmail($email);
+        if ($customer->getId()) {
+            return $customer;
+        }
+        return false;
+    }
+
     /**
      * Enter description here...
      *
diff --git a/app/code/core/Mage/Checkout/Model/Type/Standard.php b/app/code/core/Mage/Checkout/Model/Type/Standard.php
index 38166339af..7bf24e19b8 100644
--- a/app/code/core/Mage/Checkout/Model/Type/Standard.php
+++ b/app/code/core/Mage/Checkout/Model/Type/Standard.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Checkout
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Checkout/controllers/CartController.php b/app/code/core/Mage/Checkout/controllers/CartController.php
index 803feb0ead..a1f4a42b39 100644
--- a/app/code/core/Mage/Checkout/controllers/CartController.php
+++ b/app/code/core/Mage/Checkout/controllers/CartController.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Checkout
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -165,7 +171,9 @@ public function addAction()
             if ($this->_getSession()->getUseNotice(true)) {
                 $this->_getSession()->addNotice($e->getMessage());
             } else {
-                $this->_getSession()->addError($e->getMessage());
+                foreach (explode("\n", $e->getMessage()) as $message) {
+                    $this->_getSession()->addError($message);
+                }
             }
 
             $url = $this->_getSession()->getRedirectUrl(true);
@@ -305,8 +313,10 @@ public function couponPostAction()
                 ->collectTotals()
                 ->save();
             if ($couponCode) {
-                if ($couponCode == $this->_getQuote()->getShippingAddress()->getCouponCode()) {
-                    $this->_getSession()->addSuccess($this->__('Coupon code was applied successfully.'));
+                if ($couponCode == $this->_getQuote()->getCouponCode()) {
+                    $this->_getSession()->addSuccess(
+                        $this->__('Coupon code "%s" was applied successfully.', Mage::helper('core')->htmlEscape($couponCode))
+                    );
                 }
                 else {
                     $this->_getSession()->addError(
diff --git a/app/code/core/Mage/Checkout/controllers/IndexController.php b/app/code/core/Mage/Checkout/controllers/IndexController.php
index 6a0f0a2390..a86ab2bc81 100644
--- a/app/code/core/Mage/Checkout/controllers/IndexController.php
+++ b/app/code/core/Mage/Checkout/controllers/IndexController.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Checkout
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Checkout/controllers/Multishipping/AddressController.php b/app/code/core/Mage/Checkout/controllers/Multishipping/AddressController.php
index 7eae85ae94..57ef39e9c8 100644
--- a/app/code/core/Mage/Checkout/controllers/Multishipping/AddressController.php
+++ b/app/code/core/Mage/Checkout/controllers/Multishipping/AddressController.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Checkout
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Checkout/controllers/MultishippingController.php b/app/code/core/Mage/Checkout/controllers/MultishippingController.php
index 58c8ebd15a..5253b3b9c4 100644
--- a/app/code/core/Mage/Checkout/controllers/MultishippingController.php
+++ b/app/code/core/Mage/Checkout/controllers/MultishippingController.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Checkout
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -23,7 +29,7 @@
  *
  * @author      Magento Core Team 
  */
-class Mage_Checkout_MultishippingController extends Mage_Core_Controller_Front_Action
+class Mage_Checkout_MultishippingController extends Mage_Checkout_Controller_Action
 {
     /**
      * Retrieve checkout model
@@ -64,6 +70,12 @@ public function preDispatch()
     {
         parent::preDispatch();
 
+        if (!Mage::helper('checkout')->isMultishippingCheckoutAvailable()){
+            $this->_redirectUrl($this->_getHelper()->getCartUrl());
+            $this->setFlag('', self::FLAG_NO_DISPATCH, true);
+            return $this;
+        }
+
         $action = $this->getRequest()->getActionName();
         if (!preg_match('#^(login|register)#', $action)) {
             if (!Mage::getSingleton('customer/session')->authenticate($this, $this->_getHelper()->getMSLoginUrl())) {
@@ -71,6 +83,10 @@ public function preDispatch()
             }
         }
 
+        if (!$this->_preDispatchValidateCustomer()) {
+            return $this;
+        }
+
         if (Mage::getSingleton('checkout/session')->getCartWasUpdated(true)
             && !in_array($action, array('index', 'login', 'register', 'addresses', 'success'))) {
             $this->_redirectUrl($this->_getHelper()->getCartUrl());
@@ -412,10 +428,12 @@ public function overviewPostAction()
             $this->_redirect('*/*/success');
         }
         catch (Mage_Core_Exception $e){
+            Mage::helper('checkout')->sendPaymentFailedEmail($this->_getCheckout()->getQuote(), $e->getMessage(), 'multi-shipping');
             Mage::getSingleton('checkout/session')->addError($e->getMessage());
             $this->_redirect('*/*/billing');
         }
         catch (Exception $e){
+            Mage::helper('checkout')->sendPaymentFailedEmail($this->_getCheckout()->getQuote(), $e->getMessage(), 'multi-shipping');
             Mage::getSingleton('checkout/session')->addError('Order place error.');
             $this->_redirect('*/*/billing');
         }
@@ -430,4 +448,5 @@ public function successAction()
         $this->_initLayoutMessages('checkout/session');
         $this->renderLayout();
     }
+
 }
diff --git a/app/code/core/Mage/Checkout/controllers/OnepageController.php b/app/code/core/Mage/Checkout/controllers/OnepageController.php
index e0fe2db104..46312b98d8 100644
--- a/app/code/core/Mage/Checkout/controllers/OnepageController.php
+++ b/app/code/core/Mage/Checkout/controllers/OnepageController.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Checkout
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -19,8 +25,22 @@
  */
 
 
-class Mage_Checkout_OnepageController extends Mage_Core_Controller_Front_Action
+class Mage_Checkout_OnepageController extends Mage_Checkout_Controller_Action
 {
+    /**
+     * @return Mage_Checkout_OnepageController
+     */
+    public function preDispatch()
+    {
+        parent::preDispatch();
+
+        if (!$this->_preDispatchValidateCustomer()) {
+            return $this;
+        }
+
+        return $this;
+    }
+
     protected function _ajaxRedirectResponse()
     {
         $this->getResponse()
@@ -229,12 +249,16 @@ public function saveBillingAction()
                     );
                 }
                 elseif (isset($data['use_for_shipping']) && $data['use_for_shipping'] == 1) {
-                    $result['goto_section'] = 'shipping_method';
+
+                   $result['goto_section'] = 'shipping_method';
+
                     $result['update_section'] = array(
                         'name' => 'shipping-method',
                         'html' => $this->_getShippingMethodsHtml()
                     );
+
                     $result['allow_sections'] = array('shipping');
+                    $result['duplicateBillingInfo'] = 'true';
                 }
                 else {
                     $result['goto_section'] = 'shipping';
@@ -363,17 +387,19 @@ public function saveOrderAction()
         }
         catch (Mage_Core_Exception $e) {
             Mage::logException($e);
+            Mage::helper('checkout')->sendPaymentFailedEmail($this->getOnepage()->getQuote(), $e->getMessage());
             $result['success'] = false;
             $result['error'] = true;
-            $this->sendPaymentFaildEmail($e->getMessage());
             $result['error_messages'] = $e->getMessage();
+            $this->getOnepage()->getQuote()->save();
         }
         catch (Exception $e) {
             Mage::logException($e);
+            Mage::helper('checkout')->sendPaymentFailedEmail($this->getOnepage()->getQuote(), $e->getMessage());
             $result['success']  = false;
             $result['error']    = true;
-            $this->sendPaymentFaildEmail($e->getMessage());
             $result['error_messages'] = $this->__('There was an error processing your order. Please contact us or try again later.');
+            $this->getOnepage()->getQuote()->save();
         }
 
         /**
@@ -387,97 +413,4 @@ public function saveOrderAction()
         $this->getResponse()->setBody(Zend_Json::encode($result));
     }
 
-    public function sendPaymentFaildEmail($reason)
-    {
-        $translate = Mage::getSingleton('core/translate');
-        /* @var $translate Mage_Core_Model_Translate */
-        $translate->setTranslateInline(false);
-
-        $mailTemplate = Mage::getModel('core/email_template');
-        /* @var $mailTemplate Mage_Core_Model_Email_Template */
-
-        $template = Mage::getStoreConfig('checkout/payment_failed/template', $this->getStoreId());
-
-        $copyTo = $this->_getEmails('checkout/payment_failed/copy_to');
-        $copyMethod = Mage::getStoreConfig('checkout/payment_failed/copy_method', $this->getStoreId());
-        if ($copyTo && $copyMethod == 'bcc') {
-            $mailTemplate->addBcc($copyTo);
-        }
-
-        $_reciever = Mage::getStoreConfig('checkout/payment_failed/reciever', $this->getStoreId());
-        $sendTo = array(
-            array(
-                'email' => Mage::getStoreConfig('trans_email/ident_'.$_reciever.'/email', $this->getStoreId()),
-                'name'  => Mage::getStoreConfig('trans_email/ident_'.$_reciever.'/name', $this->getStoreId())
-            )
-        );
-
-        if ($copyTo && $copyMethod == 'copy') {
-            foreach ($copyTo as $email) {
-                $sendTo[] = array(
-                    'email' => $email,
-                    'name'  => null
-                );
-            }
-        }
-        $shippingMethod = '';
-        if ($shippingInfo = $this->getOnepage()->getQuote()->getShippingAddress()->getShippingMethod()) {
-            $data = explode('_', $shippingInfo);
-            $shippingMethod = $data[0];
-        }
-
-        $paymentMethod = '';
-        if ($paymentInfo = $this->getRequest()->getPost('payment', false)) {
-            $paymentMethod = $paymentInfo['method'];
-        }
-
-        $items = '';
-        foreach ($this->getOnepage()->getQuote()->getItemsCollection() as $_item) {
-            /* @var $_item Mage_Sales_Model_Quote_Item */
-            $items .= $_item->getProduct()->getName() . '  x '. $_item->getQty() . '  '
-                    . $this->getOnepage()->getQuote()->getStoreCurrencyCode() . ' ' . $_item->getProduct()->getFinalPrice($_item->getQty()) . "\n";
-        }
-        $total = $this->getOnepage()->getQuote()->getStoreCurrencyCode() . ' ' . $this->getOnepage()->getQuote()->getGrandTotal();
-
-        foreach ($sendTo as $recipient) {
-            $mailTemplate->setDesignConfig(array('area'=>'frontend', 'store'=>$this->getStoreId()))
-                ->sendTransactional(
-                    $template,
-                    Mage::getStoreConfig('checkout/payment_failed/identity', $this->getStoreId()),
-                    $recipient['email'],
-                    $recipient['name'],
-                    array(
-                        'reason' =>$reason,
-                        'dateAndTime' => Mage::app()->getLocale()->date(),
-                        'customer' => $this->getOnepage()->getQuote()->getCustomerFirstname() . ' ' . $this->getOnepage()->getQuote()->getCustomerLastname(),
-                        'customerEmail' => $this->getOnepage()->getQuote()->getCustomerEmail(),
-                        'billingAddress' => $this->getOnepage()->getQuote()->getBillingAddress(),
-                        'shippingAddress' => $this->getOnepage()->getQuote()->getShippingAddress(),
-                        'shippingMethod' => Mage::getStoreConfig('carriers/'.$shippingMethod.'/title'),
-                        'paymentMethod' => Mage::getStoreConfig('payment/'.$paymentMethod.'/title'),
-                        'items' => nl2br($items),
-                        'total' => $total
-                    )
-                );
-        }
-
-        $translate->setTranslateInline(true);
-
-        return $this;
-    }
-
-    public function getStoreId()
-    {
-        return $this->getOnepage()->getQuote()->getStoreId();
-    }
-
-    protected function _getEmails($configPath)
-    {
-        $data = Mage::getStoreConfig($configPath, $this->getStoreId());
-        if (!empty($data)) {
-            return explode(',', $data);
-        }
-        return false;
-    }
-
 }
diff --git a/app/code/core/Mage/Checkout/etc/config.xml b/app/code/core/Mage/Checkout/etc/config.xml
index 082e5d873e..18a20c9ad9 100644
--- a/app/code/core/Mage/Checkout/etc/config.xml
+++ b/app/code/core/Mage/Checkout/etc/config.xml
@@ -13,6 +13,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Checkout
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -166,6 +172,22 @@
                 
              
         
+        
+            
+                
+                    
+                        
+                            
+                                
+                                    Terms and Conditions
+                                    50
+                                
+                            
+                        
+                    
+                
+            
+        
         
             
                 
diff --git a/app/code/core/Mage/Checkout/etc/system.xml b/app/code/core/Mage/Checkout/etc/system.xml
index 9fb01d03f8..8b81a8833c 100644
--- a/app/code/core/Mage/Checkout/etc/system.xml
+++ b/app/code/core/Mage/Checkout/etc/system.xml
@@ -13,6 +13,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_GiftMessage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -195,7 +201,7 @@
                             1
                             separate by ","
                         
-                        
+                        
                             
                             select
                             adminhtml/system_config_source_email_method
diff --git a/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-install-0.9.1.php b/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-install-0.9.1.php
index 425c7a961b..8fc0ef2a5d 100644
--- a/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-install-0.9.1.php
+++ b/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-install-0.9.1.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Chronopay
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-0.9.0-0.9.1.php b/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-0.9.0-0.9.1.php
index a69d8af50a..5c447ed786 100644
--- a/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-0.9.0-0.9.1.php
+++ b/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-0.9.0-0.9.1.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Chronopay
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-0.9.1-0.9.2.php b/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-0.9.1-0.9.2.php
index 3c732bc407..219146ce25 100644
--- a/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-0.9.1-0.9.2.php
+++ b/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-0.9.1-0.9.2.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Chronopay
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Cms/Block/Block.php b/app/code/core/Mage/Cms/Block/Block.php
index 684e152224..754b29304c 100644
--- a/app/code/core/Mage/Cms/Block/Block.php
+++ b/app/code/core/Mage/Cms/Block/Block.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Cms
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Cms/Block/Page.php b/app/code/core/Mage/Cms/Block/Page.php
index c0a3d55c6c..7d8f8160e2 100644
--- a/app/code/core/Mage/Cms/Block/Page.php
+++ b/app/code/core/Mage/Cms/Block/Page.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Cms
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -71,7 +77,8 @@ protected function _prepareLayout()
     protected function _toHtml()
     {
         $processor = Mage::getModel('core/email_template_filter');
-
-        return $processor->filter($this->getPage()->getContent());
+        $html = $processor->filter($this->getPage()->getContent());
+        $html = $this->getMessagesBlock()->getGroupedHtml() . $html;
+        return $html;
     }
 }
diff --git a/app/code/core/Mage/Cms/Controller/Router.php b/app/code/core/Mage/Cms/Controller/Router.php
index be73a09fa9..70c2b03058 100644
--- a/app/code/core/Mage/Cms/Controller/Router.php
+++ b/app/code/core/Mage/Cms/Controller/Router.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Cms
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -49,7 +55,10 @@ public function match(Zend_Controller_Request_Http $request)
             ->setControllerName(isset($d[1]) ? $d[1] : 'page')
             ->setActionName(isset($d[2]) ? $d[2] : 'view')
             ->setParam('page_id', $page->getId());
-
+		$request->setAlias(
+			Mage_Core_Model_Url_Rewrite::REWRITE_REQUEST_PATH_ALIAS,
+			$identifier
+		);
         return true;
     }
 }
\ No newline at end of file
diff --git a/app/code/core/Mage/Cms/Helper/Data.php b/app/code/core/Mage/Cms/Helper/Data.php
index 1e4190d093..54c7136f7a 100644
--- a/app/code/core/Mage/Cms/Helper/Data.php
+++ b/app/code/core/Mage/Cms/Helper/Data.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Cms
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Cms/Helper/Page.php b/app/code/core/Mage/Cms/Helper/Page.php
index 0ca889c8b2..a1add5f00e 100644
--- a/app/code/core/Mage/Cms/Helper/Page.php
+++ b/app/code/core/Mage/Cms/Helper/Page.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Cms
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -74,6 +80,15 @@ public function renderPage(Mage_Core_Controller_Front_Action $action, $pageId=nu
         $action->loadLayout(array('default', 'cms_page'), false, false);
         $action->getLayout()->getUpdate()->addUpdate($page->getLayoutUpdateXml());
         $action->generateLayoutXml()->generateLayoutBlocks();
+
+        if ($storage = Mage::getSingleton('catalog/session')) {
+            $action->getLayout()->getMessagesBlock()->addMessages($storage->getMessages(true));
+        }
+
+        if ($storage = Mage::getSingleton('checkout/session')) {
+            $action->getLayout()->getMessagesBlock()->addMessages($storage->getMessages(true));
+        }
+
         $action->renderLayout();
 
         return true;
diff --git a/app/code/core/Mage/Cms/Model/Block.php b/app/code/core/Mage/Cms/Model/Block.php
index 7705d0fee4..f6bf7e3734 100644
--- a/app/code/core/Mage/Cms/Model/Block.php
+++ b/app/code/core/Mage/Cms/Model/Block.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Cms
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Cms/Model/Mysql4/Block.php b/app/code/core/Mage/Cms/Model/Mysql4/Block.php
index 6d7926f09c..3bcb949011 100644
--- a/app/code/core/Mage/Cms/Model/Mysql4/Block.php
+++ b/app/code/core/Mage/Cms/Model/Mysql4/Block.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Cms
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Cms/Model/Mysql4/Block/Collection.php b/app/code/core/Mage/Cms/Model/Mysql4/Block/Collection.php
index 7b3ad51d52..4d4efa4b69 100644
--- a/app/code/core/Mage/Cms/Model/Mysql4/Block/Collection.php
+++ b/app/code/core/Mage/Cms/Model/Mysql4/Block/Collection.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Cms
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Cms/Model/Mysql4/Page.php b/app/code/core/Mage/Cms/Model/Mysql4/Page.php
index 73ad609a75..d7149ce858 100644
--- a/app/code/core/Mage/Cms/Model/Mysql4/Page.php
+++ b/app/code/core/Mage/Cms/Model/Mysql4/Page.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Cms
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Cms/Model/Mysql4/Page/Collection.php b/app/code/core/Mage/Cms/Model/Mysql4/Page/Collection.php
index 16bda7f77b..e69ccff0db 100644
--- a/app/code/core/Mage/Cms/Model/Mysql4/Page/Collection.php
+++ b/app/code/core/Mage/Cms/Model/Mysql4/Page/Collection.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Cms
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -60,10 +66,14 @@ protected function _afterLoad()
                             continue;
                         }
                         if ($result[$item->getData('page_id')] == 0) {
-                            $storeCode = key(Mage::app()->getStores(false, true));
+                            $stores = Mage::app()->getStores(false, true);
+                            $storeId = current($stores)->getId();
+                            $storeCode = key($stores);
                         } else {
-                            $storeCode = Mage::app()->getStore($result[$item->getData('page_id')])->getCode();
+                            $storeId = $result[$item->getData('page_id')];
+                            $storeCode = Mage::app()->getStore($storeId)->getCode();
                         }
+                        $item->setData('_first_store_id', $storeId);
                         $item->setData('store_code', $storeCode);
                     }
                 }
diff --git a/app/code/core/Mage/Cms/Model/Observer.php b/app/code/core/Mage/Cms/Model/Observer.php
index 977e5f2eed..4c164e8e94 100644
--- a/app/code/core/Mage/Cms/Model/Observer.php
+++ b/app/code/core/Mage/Cms/Model/Observer.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Cms
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Cms/Model/Page.php b/app/code/core/Mage/Cms/Model/Page.php
index 04ac72b5af..016fae02f9 100644
--- a/app/code/core/Mage/Cms/Model/Page.php
+++ b/app/code/core/Mage/Cms/Model/Page.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Cms
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Cms/controllers/IndexController.php b/app/code/core/Mage/Cms/controllers/IndexController.php
index 9d4148373b..4846cb8287 100644
--- a/app/code/core/Mage/Cms/controllers/IndexController.php
+++ b/app/code/core/Mage/Cms/controllers/IndexController.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Cms
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Cms/controllers/PageController.php b/app/code/core/Mage/Cms/controllers/PageController.php
index 14d05cd4b3..d5fc695aa2 100644
--- a/app/code/core/Mage/Cms/controllers/PageController.php
+++ b/app/code/core/Mage/Cms/controllers/PageController.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Cms
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Cms/etc/config.xml b/app/code/core/Mage/Cms/etc/config.xml
index c583452ce3..110910fd97 100644
--- a/app/code/core/Mage/Cms/etc/config.xml
+++ b/app/code/core/Mage/Cms/etc/config.xml
@@ -13,6 +13,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Cms
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Cms/etc/system.xml b/app/code/core/Mage/Cms/etc/system.xml
index c3a77b8c51..9bfb7aabf7 100644
--- a/app/code/core/Mage/Cms/etc/system.xml
+++ b/app/code/core/Mage/Cms/etc/system.xml
@@ -13,6 +13,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Cms
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-install-0.7.0.php
index fc06eabda2..732a1f2891 100644
--- a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-install-0.7.0.php
+++ b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-install-0.7.0.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Cms
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.0-0.7.1.php
index 13bc1b6a5d..1bcbb71aab 100644
--- a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.0-0.7.1.php
+++ b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.0-0.7.1.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_CMS
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.1-0.7.2.php
index 5087da98a9..a87c5a303d 100644
--- a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.1-0.7.2.php
+++ b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.1-0.7.2.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_CMS
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.2-0.7.3.php b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.2-0.7.3.php
index 1400eb4b16..a8cbd303df 100644
--- a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.2-0.7.3.php
+++ b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.2-0.7.3.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_CMS
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.4-0.7.5.php b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.4-0.7.5.php
index 7e7fad3b1e..ece36d0da2 100644
--- a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.4-0.7.5.php
+++ b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.4-0.7.5.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_CMS
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.5-0.7.6.php b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.5-0.7.6.php
index b821399daf..98a535c69f 100644
--- a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.5-0.7.6.php
+++ b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.5-0.7.6.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_CMS
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Contacts/Helper/Data.php b/app/code/core/Mage/Contacts/Helper/Data.php
index 02aa3b87dd..8390198fd6 100644
--- a/app/code/core/Mage/Contacts/Helper/Data.php
+++ b/app/code/core/Mage/Contacts/Helper/Data.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Contacts
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Contacts/controllers/IndexController.php b/app/code/core/Mage/Contacts/controllers/IndexController.php
index b1edc25305..82d131a28b 100644
--- a/app/code/core/Mage/Contacts/controllers/IndexController.php
+++ b/app/code/core/Mage/Contacts/controllers/IndexController.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Contacts
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -49,6 +55,7 @@ public function indexAction()
             ->setFormAction( Mage::getUrl('*/*/post') );
 
         $this->_initLayoutMessages('customer/session');
+        $this->_initLayoutMessages('catalog/session');
         $this->renderLayout();
     }
 
@@ -73,6 +80,11 @@ public function postAction()
                         null,
                         array('data' => $postObject)
                     );
+
+                if (!$mailTemplate->getSentSuccess()) {
+                    throw new Exception();
+                }
+
                 $translate->setTranslateInline(true);
 
                 Mage::getSingleton('customer/session')->addSuccess(Mage::helper('contacts')->__('Your inquiry was submitted and will be responded to as soon as possible. Thank you for contacting us.'));
diff --git a/app/code/core/Mage/Contacts/etc/config.xml b/app/code/core/Mage/Contacts/etc/config.xml
index b35cf9e9e3..1a79e721e9 100644
--- a/app/code/core/Mage/Contacts/etc/config.xml
+++ b/app/code/core/Mage/Contacts/etc/config.xml
@@ -13,6 +13,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Contacts
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Contacts/etc/system.xml b/app/code/core/Mage/Contacts/etc/system.xml
index 114d9ea77e..41edb4999d 100644
--- a/app/code/core/Mage/Contacts/etc/system.xml
+++ b/app/code/core/Mage/Contacts/etc/system.xml
@@ -13,6 +13,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Contacts
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Contacts/sql/contacts_setup/mysql4-install-0.7.1.php b/app/code/core/Mage/Contacts/sql/contacts_setup/mysql4-install-0.7.1.php
index 0c2e30456f..122e5dbbf3 100644
--- a/app/code/core/Mage/Contacts/sql/contacts_setup/mysql4-install-0.7.1.php
+++ b/app/code/core/Mage/Contacts/sql/contacts_setup/mysql4-install-0.7.1.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Contacts
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Contacts/sql/contacts_setup/mysql4-install-0.8.0.php b/app/code/core/Mage/Contacts/sql/contacts_setup/mysql4-install-0.8.0.php
index 10deb43376..2945159e0f 100644
--- a/app/code/core/Mage/Contacts/sql/contacts_setup/mysql4-install-0.8.0.php
+++ b/app/code/core/Mage/Contacts/sql/contacts_setup/mysql4-install-0.8.0.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Contacts
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Contacts/sql/contacts_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/Contacts/sql/contacts_setup/mysql4-upgrade-0.7.1-0.7.2.php
index 188f8e6bfb..2232896979 100644
--- a/app/code/core/Mage/Contacts/sql/contacts_setup/mysql4-upgrade-0.7.1-0.7.2.php
+++ b/app/code/core/Mage/Contacts/sql/contacts_setup/mysql4-upgrade-0.7.1-0.7.2.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Contacts
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Block/Abstract.php b/app/code/core/Mage/Core/Block/Abstract.php
index 37e151b2f9..e094d4e943 100644
--- a/app/code/core/Mage/Core/Block/Abstract.php
+++ b/app/code/core/Mage/Core/Block/Abstract.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -296,11 +302,13 @@ public function setChild($alias, $block)
     {
         if (is_string($block)) {
             $block = $this->getLayout()->getBlock($block);
-            if (!$block) {
-                Mage::throwException(Mage::helper('core')->__('Invalid block name to set child %s: %s', $alias, $block));
-            }
         }
-
+        /**
+         * @see self::insert()
+         */
+        if (!$block) {
+            return $this;
+        }
         if ($block->getIsAnonymous()) {
 
             $suffix = $block->getAnonSuffix();
@@ -539,15 +547,14 @@ public function insert($block, $siblingName='', $after=false, $alias='')
     {
         if (is_string($block)) {
             $block = $this->getLayout()->getBlock($block);
-
-            if (!$block) {
-                /*
-                 * if we don't have block - don't throw exception because
-                 * block can simply removed using layout method remove
-                 */
-                //Mage::throwException(Mage::helper('core')->__('Invalid block name to set child %s: %s', $alias, $block));
-                return $this;
-            }
+        }
+        if (!$block) {
+            /*
+             * if we don't have block - don't throw exception because
+             * block can simply removed using layout method remove
+             */
+            //Mage::throwException(Mage::helper('core')->__('Invalid block name to set child %s: %s', $alias, $block));
+            return $this;
         }
         if ($block->getIsAnonymous()) {
             $this->setChild('', $block);
@@ -640,11 +647,23 @@ final public function toHtml()
                 $translate->setTranslateInline(true);
             }
         }
-
+        
+        $html = $this->_afterToHtml($html);
         Mage::dispatchEvent('core_block_abstract_to_html_after', array('block' => $this));
 
         return $html;
     }
+    
+    /**
+     * Processing block html after rendering
+     *
+     * @param   string $html
+     * @return  string
+     */
+    protected function _afterToHtml($html)
+    {
+        return $html;
+    }
 
     /**
      * Override this method in descendants to produce html
diff --git a/app/code/core/Mage/Core/Block/Flush.php b/app/code/core/Mage/Core/Block/Flush.php
index 9a2c63ffe0..ac76637903 100644
--- a/app/code/core/Mage/Core/Block/Flush.php
+++ b/app/code/core/Mage/Core/Block/Flush.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Block/Html/Date.php b/app/code/core/Mage/Core/Block/Html/Date.php
index 79e3b7bb39..9f3c5c77d9 100644
--- a/app/code/core/Mage/Core/Block/Html/Date.php
+++ b/app/code/core/Mage/Core/Block/Html/Date.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -34,7 +40,7 @@ protected function _toHtml()
         $html  = 'getValue().'" class="'.$this->getClass().'" style="width:100px" /> ';
 
-        $html .= 'getImage() . '" alt="" class="v-middle" ';
         $html .= 'title="' . $this->helper('core')->__('Select Date') . '" id="' . $this->getId() . '_trig" />';
 
         $html .=
diff --git a/app/code/core/Mage/Core/Block/Html/Select.php b/app/code/core/Mage/Core/Block/Html/Select.php
index 93e5913d08..ef83877154 100644
--- a/app/code/core/Mage/Core/Block/Html/Select.php
+++ b/app/code/core/Mage/Core/Block/Html/Select.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Block/Messages.php b/app/code/core/Mage/Core/Block/Messages.php
index 0b7604f315..732fd6020f 100644
--- a/app/code/core/Mage/Core/Block/Messages.php
+++ b/app/code/core/Mage/Core/Block/Messages.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Block/Profiler.php b/app/code/core/Mage/Core/Block/Profiler.php
index aa12572796..2aae44e6d3 100644
--- a/app/code/core/Mage/Core/Block/Profiler.php
+++ b/app/code/core/Mage/Core/Block/Profiler.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Block/Saver.php b/app/code/core/Mage/Core/Block/Saver.php
index 1ef2f8ac64..2cc2dfea61 100644
--- a/app/code/core/Mage/Core/Block/Saver.php
+++ b/app/code/core/Mage/Core/Block/Saver.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Block/Store/Switcher.php b/app/code/core/Mage/Core/Block/Store/Switcher.php
index 723a6f6ac9..baf162d389 100644
--- a/app/code/core/Mage/Core/Block/Store/Switcher.php
+++ b/app/code/core/Mage/Core/Block/Store/Switcher.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Block/Template.php b/app/code/core/Mage/Core/Block/Template.php
index 57064590fd..6421d66b1f 100644
--- a/app/code/core/Mage/Core/Block/Template.php
+++ b/app/code/core/Mage/Core/Block/Template.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Block/Template/Facade.php b/app/code/core/Mage/Core/Block/Template/Facade.php
index 13d5a6a4f8..e2c212c64b 100644
--- a/app/code/core/Mage/Core/Block/Template/Facade.php
+++ b/app/code/core/Mage/Core/Block/Template/Facade.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Block/Template/Smarty.php b/app/code/core/Mage/Core/Block/Template/Smarty.php
index 9686b7698b..7af4398b12 100644
--- a/app/code/core/Mage/Core/Block/Template/Smarty.php
+++ b/app/code/core/Mage/Core/Block/Template/Smarty.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Block/Template/Zend.php b/app/code/core/Mage/Core/Block/Template/Zend.php
index cfb0117db6..799d09c443 100644
--- a/app/code/core/Mage/Core/Block/Template/Zend.php
+++ b/app/code/core/Mage/Core/Block/Template/Zend.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Block/Text.php b/app/code/core/Mage/Core/Block/Text.php
index 2401126b14..344530e6e1 100644
--- a/app/code/core/Mage/Core/Block/Text.php
+++ b/app/code/core/Mage/Core/Block/Text.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Block/Text/List.php b/app/code/core/Mage/Core/Block/Text/List.php
index 4c4cfcfd5e..5aca524f78 100644
--- a/app/code/core/Mage/Core/Block/Text/List.php
+++ b/app/code/core/Mage/Core/Block/Text/List.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Block/Text/List/Item.php b/app/code/core/Mage/Core/Block/Text/List/Item.php
index 7aa1e00bd1..d59636eebf 100644
--- a/app/code/core/Mage/Core/Block/Text/List/Item.php
+++ b/app/code/core/Mage/Core/Block/Text/List/Item.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Block/Text/List/Link.php b/app/code/core/Mage/Core/Block/Text/List/Link.php
index fd286ce2a3..f0b2ba29ad 100644
--- a/app/code/core/Mage/Core/Block/Text/List/Link.php
+++ b/app/code/core/Mage/Core/Block/Text/List/Link.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Block/Text/Tag.php b/app/code/core/Mage/Core/Block/Text/Tag.php
index ad71ae320b..f9c55260a5 100644
--- a/app/code/core/Mage/Core/Block/Text/Tag.php
+++ b/app/code/core/Mage/Core/Block/Text/Tag.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Block/Text/Tag/Css.php b/app/code/core/Mage/Core/Block/Text/Tag/Css.php
index fec536172c..c3210b709d 100644
--- a/app/code/core/Mage/Core/Block/Text/Tag/Css.php
+++ b/app/code/core/Mage/Core/Block/Text/Tag/Css.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Block/Text/Tag/Css/Admin.php b/app/code/core/Mage/Core/Block/Text/Tag/Css/Admin.php
index cc21e0553f..28a189e457 100644
--- a/app/code/core/Mage/Core/Block/Text/Tag/Css/Admin.php
+++ b/app/code/core/Mage/Core/Block/Text/Tag/Css/Admin.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Block/Text/Tag/Debug.php b/app/code/core/Mage/Core/Block/Text/Tag/Debug.php
index 38fc9650e3..dcef9300f5 100644
--- a/app/code/core/Mage/Core/Block/Text/Tag/Debug.php
+++ b/app/code/core/Mage/Core/Block/Text/Tag/Debug.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Block/Text/Tag/Js.php b/app/code/core/Mage/Core/Block/Text/Tag/Js.php
index e1f98e970e..584fdf160c 100644
--- a/app/code/core/Mage/Core/Block/Text/Tag/Js.php
+++ b/app/code/core/Mage/Core/Block/Text/Tag/Js.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Block/Text/Tag/Meta.php b/app/code/core/Mage/Core/Block/Text/Tag/Meta.php
index 40d29b66a6..26e5cfd89d 100644
--- a/app/code/core/Mage/Core/Block/Text/Tag/Meta.php
+++ b/app/code/core/Mage/Core/Block/Text/Tag/Meta.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Controller/Front/Action.php b/app/code/core/Mage/Core/Controller/Front/Action.php
index a3008817f9..251f4ab4a9 100644
--- a/app/code/core/Mage/Core/Controller/Front/Action.php
+++ b/app/code/core/Mage/Core/Controller/Front/Action.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Controller/Front/Router.php b/app/code/core/Mage/Core/Controller/Front/Router.php
index 16a4c75e5b..fde04d6287 100644
--- a/app/code/core/Mage/Core/Controller/Front/Router.php
+++ b/app/code/core/Mage/Core/Controller/Front/Router.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Controller/Request/Http.php b/app/code/core/Mage/Core/Controller/Request/Http.php
index 67ae3aa0bb..86a2b446fc 100644
--- a/app/code/core/Mage/Core/Controller/Request/Http.php
+++ b/app/code/core/Mage/Core/Controller/Request/Http.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -124,7 +130,7 @@ public function setPathInfo($pathInfo = null)
 
             $this->_originalPathInfo = (string) $pathInfo;
 
-            $this->_requestString = $this->_escapeParam($pathInfo . ($pos!==false ? substr($requestUri, $pos) : ''));
+            $this->_requestString = $pathInfo . ($pos!==false ? substr($requestUri, $pos) : '');
         }
 
         $this->_pathInfo = (string) $pathInfo;
@@ -177,28 +183,4 @@ public function getRouteName()
     {
         return $this->_route;
     }
-
-    /**
-     * Set a userland parameter
-     *
-     * Uses $key to set a userland parameter. If $key is an alias, the actual
-     * key will be retrieved and used to set the parameter.
-     *
-     * @param mixed $key
-     * @param mixed $value
-     * @return Zend_Controller_Request_Http
-     */
-    public function setParam($key, $value)
-    {
-        return parent::setParam($this->_escapeParam($key), $this->_escapeParam($value));
-    }
-
-    protected function _escapeParam($value)
-    {
-        $value = str_replace('"', '%22', $value);
-        $value = str_replace("'", '%27', $value);
-        $value = str_replace('>', '%3E', $value);
-        $value = str_replace('<', '%3C', $value);
-        return $value;
-    }
 }
\ No newline at end of file
diff --git a/app/code/core/Mage/Core/Controller/Response/Http.php b/app/code/core/Mage/Core/Controller/Response/Http.php
index 52d96494da..d02a9b46e0 100644
--- a/app/code/core/Mage/Core/Controller/Response/Http.php
+++ b/app/code/core/Mage/Core/Controller/Response/Http.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Controller/Varien/Action.php b/app/code/core/Mage/Core/Controller/Varien/Action.php
index 2c5ec363ff..2ca1ed190c 100644
--- a/app/code/core/Mage/Core/Controller/Varien/Action.php
+++ b/app/code/core/Mage/Core/Controller/Varien/Action.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -499,7 +505,7 @@ protected function _redirectSuccess($defaultUrl)
             $successUrl = $defaultUrl;
         }
         if (!$this->_isUrlInternal($successUrl)) {
-        	$successUrl = Mage::app()->getStore()->getBaseUrl();
+            $successUrl = Mage::app()->getStore()->getBaseUrl();
         }
         $this->getResponse()->setRedirect($successUrl);
         return $this;
@@ -517,7 +523,7 @@ protected function _redirectError($defaultUrl)
             $errorUrl = $defaultUrl;
         }
         if (!$this->_isUrlInternal($errorUrl)) {
-        	$errorUrl = Mage::app()->getStore()->getBaseUrl();
+            $errorUrl = Mage::app()->getStore()->getBaseUrl();
         }
         $this->getResponse()->setRedirect($errorUrl);
         return $this;
@@ -548,7 +554,7 @@ protected function _redirectReferer($defaultUrl=null)
      */
     protected function _getRefererUrl()
     {
-    	$refererUrl = $this->getRequest()->getServer('HTTP_REFERER');
+        $refererUrl = $this->getRequest()->getServer('HTTP_REFERER');
         if ($url = $this->getRequest()->getParam(self::PARAM_NAME_REFERER_URL)) {
             $refererUrl = $url;
         }
@@ -560,7 +566,7 @@ protected function _getRefererUrl()
         }
 
         if (!$this->_isUrlInternal($refererUrl)) {
-        	$refererUrl = Mage::app()->getStore()->getBaseUrl();
+            $refererUrl = Mage::app()->getStore()->getBaseUrl();
         }
         return $refererUrl;
     }
diff --git a/app/code/core/Mage/Core/Controller/Varien/Front.php b/app/code/core/Mage/Core/Controller/Varien/Front.php
index 925befa00a..9091294ce1 100644
--- a/app/code/core/Mage/Core/Controller/Varien/Front.php
+++ b/app/code/core/Mage/Core/Controller/Varien/Front.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Controller/Varien/Router/Abstract.php b/app/code/core/Mage/Core/Controller/Varien/Router/Abstract.php
index 3610c422ed..4ad9624732 100644
--- a/app/code/core/Mage/Core/Controller/Varien/Router/Abstract.php
+++ b/app/code/core/Mage/Core/Controller/Varien/Router/Abstract.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Controller/Varien/Router/Admin.php b/app/code/core/Mage/Core/Controller/Varien/Router/Admin.php
index 5fc64e4b36..5c924d9906 100644
--- a/app/code/core/Mage/Core/Controller/Varien/Router/Admin.php
+++ b/app/code/core/Mage/Core/Controller/Varien/Router/Admin.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Controller/Varien/Router/Default.php b/app/code/core/Mage/Core/Controller/Varien/Router/Default.php
index 829e8349d6..7952673c43 100644
--- a/app/code/core/Mage/Core/Controller/Varien/Router/Default.php
+++ b/app/code/core/Mage/Core/Controller/Varien/Router/Default.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Controller/Varien/Router/Standard.php b/app/code/core/Mage/Core/Controller/Varien/Router/Standard.php
index 9193e6ac1b..01b6d1ed4d 100644
--- a/app/code/core/Mage/Core/Controller/Varien/Router/Standard.php
+++ b/app/code/core/Mage/Core/Controller/Varien/Router/Standard.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -66,7 +72,12 @@ public function match(Zend_Controller_Request_Http $request)
         if ($request->getModuleName()) {
             $module = $request->getModuleName();
         } else {
-            $module = !empty($p[0]) ? $p[0] : $this->getFront()->getDefault('module');
+            if(!empty($p[0])) {
+            	$module = $p[0];
+            } else {
+            	$module = $this->getFront()->getDefault('module');
+                $request->setAlias(Mage_Core_Model_Url_Rewrite::REWRITE_REQUEST_PATH_ALIAS,	'');
+            }
         }
         if (!$module) {
             return false;
@@ -87,7 +98,15 @@ public function match(Zend_Controller_Request_Http $request)
         if ($request->getControllerName()) {
             $controller = $request->getControllerName();
         } else {
-            $controller = !empty($p[1]) ? $p[1] : $front->getDefault('controller');
+            if (!empty($p[1])) {
+                $controller = $p[1];
+            } else {
+            	$controller = $front->getDefault('controller');
+            	$request->setAlias(
+            	   Mage_Core_Model_Url_Rewrite::REWRITE_REQUEST_PATH_ALIAS,
+            	   ltrim($request->getOriginalPathInfo(), '/')
+            	);
+            }
         }
         $controllerFileName = $this->getControllerFileName($realModule, $controller);
         if (!$this->validateControllerFileName($controllerFileName)) {
diff --git a/app/code/core/Mage/Core/Exception.php b/app/code/core/Mage/Core/Exception.php
index 3e1756b02a..c900382d5e 100644
--- a/app/code/core/Mage/Core/Exception.php
+++ b/app/code/core/Mage/Core/Exception.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Helper/Abstract.php b/app/code/core/Mage/Core/Helper/Abstract.php
index e525b4758a..b9ab66c89f 100644
--- a/app/code/core/Mage/Core/Helper/Abstract.php
+++ b/app/code/core/Mage/Core/Helper/Abstract.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Helper/Data.php b/app/code/core/Mage/Core/Helper/Data.php
index 17cd2e959f..50362ed63d 100644
--- a/app/code/core/Mage/Core/Helper/Data.php
+++ b/app/code/core/Mage/Core/Helper/Data.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -431,4 +437,101 @@ private function _decorateArrayObject($element, $key, $value, $dontSkip) {
             }
         }
     }
+
+    /**
+     * Transform an assoc array to SimpleXMLElement object
+     * Array has some limitations. Appropriate exceptions will be thrown
+     *
+     * @param array $array
+     * @param string $rootName
+     * @return SimpleXMLElement
+     * @throws Exception
+     */
+    public function assocToXml(array $array, $rootName = '_')
+    {
+        if (empty($rootName) || is_numeric($rootName)) {
+            throw new Exception('Root element must not be empty or numeric');
+        }
+
+        $xmlstr = <<
+<$rootName>
+XML;
+        $xml = new SimpleXMLElement($xmlstr);
+        foreach ($array as $key => $value) {
+            if (is_numeric($key)) {
+                throw new Exception('Array root keys must not be numeric.');
+            }
+        }
+        return self::_assocToXml($array, $rootName, $xml);
+    }
+
+    /**
+     * Function, that actually recursively transforms array to xml
+     *
+     * @param array $array
+     * @param string $rootName
+     * @param SimpleXMLElement $xml
+     * @return SimpleXMLElement
+     * @throws Exception
+     */
+    private function _assocToXml(array $array, $rootName, SimpleXMLElement &$xml)
+    {
+        $hasNumericKey = false;
+        $hasStringKey  = false;
+        foreach ($array as $key => $value) {
+            if (!is_array($value)) {
+                if (is_string($key)) {
+                    if ($key === $rootName) {
+                        throw new Exception('Associative key must not be the same as its parent associative key.');
+                    }
+                    $hasStringKey = true;
+                    $xml->$key = $value;
+                }
+                elseif (is_int($key)) {
+                    $hasNumericKey = true;
+                    $xml->{$rootName}[$key] = $value;
+                }
+            }
+            else {
+                self::_assocToXml($value, $key, $xml->$key);
+            }
+        }
+        if ($hasNumericKey && $hasStringKey) {
+            throw new Exception('Associative and numeric keys must not be mixed at one level.');
+        }
+        return $xml;
+    }
+
+    /**
+     * Transform SimpleXMLElement to associative array
+     * SimpleXMLElement must be conform structure, generated by assocToXml()
+     *
+     * @param SimpleXMLElement $xml
+     * @return array
+     */
+    public function xmlToAssoc(SimpleXMLElement $xml)
+    {
+        $array = array();
+        foreach ($xml as $key => $value) {
+            if (isset($value->$key)) {
+                $i = 0;
+                foreach ($value->$key as $v) {
+                    $array[$key][$i++] = (string)$v;
+                }
+            }
+            else {
+                // try to transform it into string value, trimming spaces between elements
+                $array[$key] = trim((string)$value);
+                if (empty($array[$key]) && !empty($value)) {
+                    $array[$key] = self::xmlToAssoc($value);
+                }
+                // untrim strings values
+                else {
+                    $array[$key] = (string)$value;
+                }
+            }
+        }
+        return $array;
+    }
 }
\ No newline at end of file
diff --git a/app/code/core/Mage/Core/Helper/Js.php b/app/code/core/Mage/Core/Helper/Js.php
index f80c861e68..fceda9a209 100644
--- a/app/code/core/Mage/Core/Helper/Js.php
+++ b/app/code/core/Mage/Core/Helper/Js.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Helper/String.php b/app/code/core/Mage/Core/Helper/String.php
index 39a05665fd..ad95873463 100644
--- a/app/code/core/Mage/Core/Helper/String.php
+++ b/app/code/core/Mage/Core/Helper/String.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Helper/Url.php b/app/code/core/Mage/Core/Helper/Url.php
index dcacbd5bad..3aec8c48e3 100644
--- a/app/code/core/Mage/Core/Helper/Url.php
+++ b/app/code/core/Mage/Core/Helper/Url.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -32,7 +38,7 @@ class Mage_Core_Helper_Url extends Mage_Core_Helper_Abstract
      */
     public function getCurrentUrl()
     {
-        return $this->_getUrl('*/*/*', array('_current'=>true));
+        return $this->_getUrl('*/*/*', array('_current'=>true, '_use_rewrite'=>true));
     }
 
     /**
diff --git a/app/code/core/Mage/Core/Model/Abstract.php b/app/code/core/Mage/Core/Model/Abstract.php
index eb803ba109..ac8339a485 100644
--- a/app/code/core/Mage/Core/Model/Abstract.php
+++ b/app/code/core/Mage/Core/Model/Abstract.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -291,8 +297,6 @@ public function delete()
             $this->_afterDelete();
 
             $this->_getResource()->commit();
-
-            Mage::getConfig()->removeCache();
         }
         catch (Exception $e){
             $this->_getResource()->rollBack();
@@ -320,6 +324,9 @@ protected function _beforeDelete()
      */
     protected function _protectFromNonAdmin()
     {
+        if (Mage::registry('isSecureArea')) {
+            return;
+        }
         if (!Mage::app()->getStore()->isAdmin()) {
             Mage::throwException(Mage::helper('core')->__('Cannot complete this operation from non-admin area.'));
         }
diff --git a/app/code/core/Mage/Core/Model/App.php b/app/code/core/Mage/Core/Model/App.php
index 4f12f1c44c..b54cc6f9ce 100644
--- a/app/code/core/Mage/Core/Model/App.php
+++ b/app/code/core/Mage/Core/Model/App.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -808,7 +814,7 @@ public function getFrontController()
         if (!$this->_frontController) {
             $this->_initFrontController();
         }
-        
+
         return $this->_frontController;
     }
 
@@ -1042,6 +1048,7 @@ public function getResponse()
     {
         if (empty($this->_response)) {
             $this->_response = new Mage_Core_Controller_Response_Http();
+            $this->_response->headersSentThrowsException = Mage::$headersSentThrowsException;
             $this->_response->setHeader("Content-Type", "text/html; charset=UTF-8");
         }
         return $this->_response;
@@ -1085,7 +1092,7 @@ public function dispatchEvent($eventName, $args)
                 continue;
             }
             foreach ($events[$eventName]['observers'] as $obsName=>$obs) {
-            
+
                 $observer->setData(array('event'=>$event));
                 Varien_Profiler::start('OBSERVER: '.$obsName);
                 switch ($obs['type']) {
diff --git a/app/code/core/Mage/Core/Model/App/Area.php b/app/code/core/Mage/Core/Model/App/Area.php
index 65a5f01d88..72b8750ebc 100644
--- a/app/code/core/Mage/Core/Model/App/Area.php
+++ b/app/code/core/Mage/Core/Model/App/Area.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Model/Config.php b/app/code/core/Mage/Core/Model/Config.php
index c263274a1d..76b38a4c35 100644
--- a/app/code/core/Mage/Core/Model/Config.php
+++ b/app/code/core/Mage/Core/Model/Config.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Model/Config/Base.php b/app/code/core/Mage/Core/Model/Config/Base.php
index acbfc2658b..90f1bdae70 100644
--- a/app/code/core/Mage/Core/Model/Config/Base.php
+++ b/app/code/core/Mage/Core/Model/Config/Base.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Model/Config/Data.php b/app/code/core/Mage/Core/Model/Config/Data.php
index b3589ab67c..f2dd317b99 100644
--- a/app/code/core/Mage/Core/Model/Config/Data.php
+++ b/app/code/core/Mage/Core/Model/Config/Data.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Model/Config/Element.php b/app/code/core/Mage/Core/Model/Config/Element.php
index ec1deb4d57..0bf57663d3 100644
--- a/app/code/core/Mage/Core/Model/Config/Element.php
+++ b/app/code/core/Mage/Core/Model/Config/Element.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Model/Config/Options.php b/app/code/core/Mage/Core/Model/Config/Options.php
index 158934d139..dbee8873d4 100644
--- a/app/code/core/Mage/Core/Model/Config/Options.php
+++ b/app/code/core/Mage/Core/Model/Config/Options.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Model/Config/System.php b/app/code/core/Mage/Core/Model/Config/System.php
index cd48eba631..47175bef3b 100644
--- a/app/code/core/Mage/Core/Model/Config/System.php
+++ b/app/code/core/Mage/Core/Model/Config/System.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Model/Convert.php b/app/code/core/Mage/Core/Model/Convert.php
index d63a402454..3624979189 100644
--- a/app/code/core/Mage/Core/Model/Convert.php
+++ b/app/code/core/Mage/Core/Model/Convert.php
@@ -13,6 +13,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Model/Convert/Adapter/Interactive.php b/app/code/core/Mage/Core/Model/Convert/Adapter/Interactive.php
index 7a5a3a6626..b1a52c05a0 100644
--- a/app/code/core/Mage/Core/Model/Convert/Adapter/Interactive.php
+++ b/app/code/core/Mage/Core/Model/Convert/Adapter/Interactive.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Varien
  * @package    Varien_Convert
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Model/Convert/History.php b/app/code/core/Mage/Core/Model/Convert/History.php
index f0a6972d85..5c4b837ee5 100644
--- a/app/code/core/Mage/Core/Model/Convert/History.php
+++ b/app/code/core/Mage/Core/Model/Convert/History.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Model/Convert/Profile.php b/app/code/core/Mage/Core/Model/Convert/Profile.php
index f1f58193a9..fe73dcc49e 100644
--- a/app/code/core/Mage/Core/Model/Convert/Profile.php
+++ b/app/code/core/Mage/Core/Model/Convert/Profile.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Model/Cookie.php b/app/code/core/Mage/Core/Model/Cookie.php
index a26cede41d..32441ad5bf 100644
--- a/app/code/core/Mage/Core/Model/Cookie.php
+++ b/app/code/core/Mage/Core/Model/Cookie.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Model/Date.php b/app/code/core/Mage/Core/Model/Date.php
index c07a0aba22..c9f82cfb40 100644
--- a/app/code/core/Mage/Core/Model/Date.php
+++ b/app/code/core/Mage/Core/Model/Date.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Model/Design.php b/app/code/core/Mage/Core/Model/Design.php
index 2a59368fbf..620b50a38e 100644
--- a/app/code/core/Mage/Core/Model/Design.php
+++ b/app/code/core/Mage/Core/Model/Design.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Admin
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Model/Design/Package.php b/app/code/core/Mage/Core/Model/Design/Package.php
index cc6923decc..2667da855d 100644
--- a/app/code/core/Mage/Core/Model/Design/Package.php
+++ b/app/code/core/Mage/Core/Model/Design/Package.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Model/Design/Source/Apply.php b/app/code/core/Mage/Core/Model/Design/Source/Apply.php
index e7f06b35bb..a051583bec 100644
--- a/app/code/core/Mage/Core/Model/Design/Source/Apply.php
+++ b/app/code/core/Mage/Core/Model/Design/Source/Apply.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Model/Design/Source/Design.php b/app/code/core/Mage/Core/Model/Design/Source/Design.php
index fe5ef96bbd..cfbc90ecfd 100644
--- a/app/code/core/Mage/Core/Model/Design/Source/Design.php
+++ b/app/code/core/Mage/Core/Model/Design/Source/Design.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Model/Email.php b/app/code/core/Mage/Core/Model/Email.php
index 12b4245e08..0edcfe412d 100644
--- a/app/code/core/Mage/Core/Model/Email.php
+++ b/app/code/core/Mage/Core/Model/Email.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Model/Email/Template.php b/app/code/core/Mage/Core/Model/Email/Template.php
index 76c6cf6048..7e242b4e70 100644
--- a/app/code/core/Mage/Core/Model/Email/Template.php
+++ b/app/code/core/Mage/Core/Model/Email/Template.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -90,11 +96,11 @@ public function getMail()
 
     public function getTemplateFilter()
     {
-    	if (empty($this->_templateFilter)) {
-    		$this->_templateFilter = Mage::getModel('core/email_template_filter');
-    		$this->_templateFilter->setUseAbsoluteLinks($this->getUseAbsoluteLinks());
-    	}
-    	return $this->_templateFilter;
+        if (empty($this->_templateFilter)) {
+            $this->_templateFilter = Mage::getModel('core/email_template_filter');
+            $this->_templateFilter->setUseAbsoluteLinks($this->getUseAbsoluteLinks());
+        }
+        return $this->_templateFilter;
     }
 
     /**
@@ -247,7 +253,7 @@ public function getProcessedTemplate(array $variables = array())
         $processor = $this->getTemplateFilter();
 
         if(!$this->_preprocessFlag) {
-        	$variables['this'] = $this;
+            $variables['this'] = $this;
         }
 
         $processor
@@ -300,11 +306,12 @@ public function send($email, $name=null, array $variables = array())
         $mail = $this->getMail();
         if (is_array($email)) {
             foreach ($email as $emailOne) {
-            	$mail->addTo($emailOne, $name);
+                $mail->addTo($emailOne, $name);
             }
         }
         else {
-            $mail->addTo($email, $name);
+          //  $mail->addTo($email, $name);
+            $mail->addTo($email, '=?utf-8?B?'.base64_encode($name).'?=');
         }
 
         $this->setUseAbsoluteLinks(true);
@@ -316,8 +323,10 @@ public function send($email, $name=null, array $variables = array())
             $mail->setBodyHTML($text);
         }
 
-        $mail->setSubject($this->getProcessedTemplateSubject($variables));
+        $mail->setSubject('=?utf-8?B?'.base64_encode($this->getProcessedTemplateSubject($variables)).'?=');
+        //$mail->setSubject($this->getProcessedTemplateSubject($variables));
         $mail->setFrom($this->getSenderEmail(), $this->getSenderName());
+
         try {
             $mail->send(); // Zend_Mail warning..
             $this->_mail = null;
@@ -331,36 +340,41 @@ public function send($email, $name=null, array $variables = array())
 
     public function sendTransactional($templateId, $sender, $email, $name, $vars=array(), $storeId=null)
     {
-    	if (is_null($storeId)) {
-    	    if ($this->getDesignConfig() && $this->getDesignConfig()->getStore()) {
+        $this->setSentSuccess(false);
+
+        if (is_null($storeId)) {
+            if ($this->getDesignConfig() && $this->getDesignConfig()->getStore()) {
                 $storeId = $this->getDesignConfig()->getStore();
-    	    }
-    	    else {
-    	        $storeId = Mage::app()->getStore();
-    	    }
-    	}
-
-    	if (is_numeric($templateId)) {
-    	   $this->load($templateId);
+            }
+            else {
+                $storeId = Mage::app()->getStore();
+            }
+        }
+        Mage::app()->getLocale()->emulate($storeId);
+
+        if (is_numeric($templateId)) {
+            $this->load($templateId);
         } else {
-           $this->loadDefault($templateId);
+            $localeCode = Mage::getStoreConfig('general/locale/code', $storeId);
+            $this->loadDefault($templateId, $localeCode);
         }
 
-    	if (!$this->getId()) {
-    		throw Mage::exception('Mage_Core', Mage::helper('core')->__('Invalid transactional email code: '.$templateId));
-    	}
+        if (!$this->getId()) {
+            throw Mage::exception('Mage_Core', Mage::helper('core')->__('Invalid transactional email code: '.$templateId));
+        }
 
-    	if (!is_array($sender)) {
-    	    $this->setSenderName(Mage::getStoreConfig('trans_email/ident_'.$sender.'/name', $storeId));
-    	    $this->setSenderEmail(Mage::getStoreConfig('trans_email/ident_'.$sender.'/email', $storeId));
-    	} else {
-    	    $this->setSenderName($sender['name']);
-    	    $this->setSenderEmail($sender['email']);
-    	}
+        if (!is_array($sender)) {
+            $this->setSenderName(Mage::getStoreConfig('trans_email/ident_'.$sender.'/name', $storeId));
+            $this->setSenderEmail(Mage::getStoreConfig('trans_email/ident_'.$sender.'/email', $storeId));
+        } else {
+            $this->setSenderName($sender['name']);
+            $this->setSenderEmail($sender['email']);
+        }
 
-    	$this->send($email, $name, $vars);
-    	return $this;
-	}
+        $this->setSentSuccess( $this->send($email, $name, $vars) );
+        Mage::app()->getLocale()->revert();
+        return $this;
+    }
 
     /**
      * Delete template from DB
@@ -375,10 +389,10 @@ public function delete()
 
     public function getProcessedTemplateSubject(array $variables)
     {
-    	$processor = $this->getTemplateFilter();
+        $processor = $this->getTemplateFilter();
 
         if(!$this->_preprocessFlag) {
-        	$variables['this'] = $this;
+            $variables['this'] = $this;
         }
 
         $processor->setVariables($variables);
@@ -443,7 +457,7 @@ public function addBcc($bcc)
     {
         if (is_array($bcc)) {
             foreach ($bcc as $email) {
-            	$this->getMail()->addBcc($email);
+                $this->getMail()->addBcc($email);
             }
         }
         elseif ($bcc) {
diff --git a/app/code/core/Mage/Core/Model/Email/Template/Filter.php b/app/code/core/Mage/Core/Model/Email/Template/Filter.php
index 7ea12ac49c..5dcf489508 100644
--- a/app/code/core/Mage/Core/Model/Email/Template/Filter.php
+++ b/app/code/core/Mage/Core/Model/Email/Template/Filter.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -141,16 +147,26 @@ public function storeDirective($construction)
         unset($params['url']);
 
         if (!self::$_urlInstance) {
-            self::$_urlInstance = Mage::getModel('core/url');
+            self::$_urlInstance = Mage::getModel('core/url')->setStore(
+                Mage::app()->getStore(Mage::getDesign()->getStore())->getId()
+            );
         }
-
+        $_urlInstanceOldStore = null;
         if (!empty($path) && !Mage::getStoreConfigFlag(Mage_Core_Model_Store::XML_PATH_STORE_IN_URL)
             && !Mage::app()->isSingleStoreMode())
         {
-            $params['_query']['___store'] = Mage::app()->getStore()->getCode();
+            $params['_query']['___store'] = Mage::app()->getStore(Mage::getDesign()->getStore())->getCode();
+        } elseif (!empty($path) && Mage::getStoreConfigFlag(Mage_Core_Model_Store::XML_PATH_STORE_IN_URL)
+            && !Mage::app()->isSingleStoreMode())
+        {
+            $_urlInstanceOldStore = self::$_urlInstance->getStore();
+            self::$_urlInstance->setStore(Mage::app()->getStore(Mage::getDesign()->getStore())->getCode());
         }
 
         $url = self::$_urlInstance->getUrl($path, $params);
+        if (null ==! $_urlInstanceOldStore) {
+            self::$_urlInstance->setStore($_urlInstanceOldStore);
+        }
 
         return $url;
     }
diff --git a/app/code/core/Mage/Core/Model/Email/Transport.php b/app/code/core/Mage/Core/Model/Email/Transport.php
index 27c58d969d..c2f5a18f7c 100644
--- a/app/code/core/Mage/Core/Model/Email/Transport.php
+++ b/app/code/core/Mage/Core/Model/Email/Transport.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Model/Flag.php b/app/code/core/Mage/Core/Model/Flag.php
new file mode 100644
index 0000000000..7f652341dd
--- /dev/null
+++ b/app/code/core/Mage/Core/Model/Flag.php
@@ -0,0 +1,70 @@
+_init('core/flag');
+    }
+
+    protected function _beforeSave()
+    {
+        if (is_null($this->_flagCode)) {
+            Mage::throwException(Mage::helper('core')->__('Please define flag code.'));
+        }
+
+        $this->setFlagCode($this->_flagCode);
+        $this->setLastUpdate(date('Y-m-d H:i:s'));
+
+        return parent::_beforeSave();
+    }
+
+    public function getFlagData()
+    {
+        if ($this->hasFlagData()) {
+            return unserialize($this->getData('flag_data'));
+        } else {
+            return null;
+        }
+    }
+
+    public function setFlagData($value)
+    {
+        return $this->setData('flag_data', serialize($value));
+    }
+
+    public function loadSelf()
+    {
+        if (is_null($this->_flagCode)) {
+            Mage::throwException(Mage::helper('core')->__('Please define flag code.'));
+        }
+
+        return $this->load($this->_flagCode, 'flag_code');
+    }
+}
\ No newline at end of file
diff --git a/app/code/core/Mage/Core/Model/Language.php b/app/code/core/Mage/Core/Model/Language.php
index 789c73f285..70d4a89ddf 100644
--- a/app/code/core/Mage/Core/Model/Language.php
+++ b/app/code/core/Mage/Core/Model/Language.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Model/Layout.php b/app/code/core/Mage/Core/Model/Layout.php
index 2f74c1507c..b1451defca 100644
--- a/app/code/core/Mage/Core/Model/Layout.php
+++ b/app/code/core/Mage/Core/Model/Layout.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Model/Layout/Data.php b/app/code/core/Mage/Core/Model/Layout/Data.php
index 8823008389..29f58751af 100644
--- a/app/code/core/Mage/Core/Model/Layout/Data.php
+++ b/app/code/core/Mage/Core/Model/Layout/Data.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Model/Layout/Element.php b/app/code/core/Mage/Core/Model/Layout/Element.php
index 4987c22160..f8676767e5 100644
--- a/app/code/core/Mage/Core/Model/Layout/Element.php
+++ b/app/code/core/Mage/Core/Model/Layout/Element.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Model/Layout/Update.php b/app/code/core/Mage/Core/Model/Layout/Update.php
index 4dc71c6bc5..32c4d87275 100644
--- a/app/code/core/Mage/Core/Model/Layout/Update.php
+++ b/app/code/core/Mage/Core/Model/Layout/Update.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -257,6 +263,10 @@ public function fetchFileLayoutUpdates()
             $updateFiles = array();
             foreach ($updatesRoot->children() as $updateNode) {
                 if ($updateNode->file) {
+                    $module = $updateNode->getAttribute('module');
+                    if ($module && Mage::getStoreConfigFlag('advanced/modules_disable_output/' . $module)) {
+                        continue;
+                    }
                     $updateFiles[] = (string)$updateNode->file;
                 }
             }
diff --git a/app/code/core/Mage/Core/Model/Locale.php b/app/code/core/Mage/Core/Model/Locale.php
index 60b21632a1..bba03f34a8 100644
--- a/app/code/core/Mage/Core/Model/Locale.php
+++ b/app/code/core/Mage/Core/Model/Locale.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -64,6 +70,13 @@ class Mage_Core_Model_Locale
      */
     protected $_locale;
 
+    /**
+     * Emulated locales stack
+     *
+     * @var array
+     */
+    protected $_emulatedLocales = array();
+
     protected static $_currencyCache = array();
 
     public function __construct($locale = null)
@@ -104,7 +117,7 @@ public function getDefaultLocale()
     /**
      * Set locale
      *
-     * @param   strint $locale
+     * @param   string $locale
      * @return  Mage_Core_Model_Locale
      */
     public function setLocale($locale = null)
@@ -544,4 +557,32 @@ public function getJsPriceFormat()
 
         return $result;
     }
+
+    /**
+     * Push current locale to stack and replace with locale from specified store
+     * Event is not dispatched.
+     *
+     * @param int $storeId
+     */
+    public function emulate($storeId)
+    {
+        if ($storeId) {
+            $this->_emulatedLocales[] = clone $this->getLocale();
+            $this->_locale = new Zend_Locale(Mage::getStoreConfig(self::XML_PATH_DEFAULT_LOCALE, $storeId));
+        }
+        else {
+            $this->_emulatedLocales[] = false;
+        }
+    }
+
+    /**
+     * Get last locale, used before last emulation
+     *
+     */
+    public function revert()
+    {
+        if ($locale = array_pop($this->_emulatedLocales)) {
+            $this->_locale = $locale;
+        }
+    }
 }
diff --git a/app/code/core/Mage/Core/Model/Locale/Currency.php b/app/code/core/Mage/Core/Model/Locale/Currency.php
index 81127d08db..6e6b207e85 100644
--- a/app/code/core/Mage/Core/Model/Locale/Currency.php
+++ b/app/code/core/Mage/Core/Model/Locale/Currency.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Model/Message.php b/app/code/core/Mage/Core/Model/Message.php
index e4d9df9378..70b8e1f223 100644
--- a/app/code/core/Mage/Core/Model/Message.php
+++ b/app/code/core/Mage/Core/Model/Message.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Model/Message/Abstract.php b/app/code/core/Mage/Core/Model/Message/Abstract.php
index 3692f8d3b0..4725465f95 100644
--- a/app/code/core/Mage/Core/Model/Message/Abstract.php
+++ b/app/code/core/Mage/Core/Model/Message/Abstract.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Model/Message/Collection.php b/app/code/core/Mage/Core/Model/Message/Collection.php
index bc6b9eb0e6..a36cabcb11 100644
--- a/app/code/core/Mage/Core/Model/Message/Collection.php
+++ b/app/code/core/Mage/Core/Model/Message/Collection.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Model/Message/Error.php b/app/code/core/Mage/Core/Model/Message/Error.php
index 33060823af..5f6823c29c 100644
--- a/app/code/core/Mage/Core/Model/Message/Error.php
+++ b/app/code/core/Mage/Core/Model/Message/Error.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Model/Message/Notice.php b/app/code/core/Mage/Core/Model/Message/Notice.php
index c8cc8ab599..5fe7a807e2 100644
--- a/app/code/core/Mage/Core/Model/Message/Notice.php
+++ b/app/code/core/Mage/Core/Model/Message/Notice.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Model/Message/Success.php b/app/code/core/Mage/Core/Model/Message/Success.php
index f996f6d4e7..0ad1331330 100644
--- a/app/code/core/Mage/Core/Model/Message/Success.php
+++ b/app/code/core/Mage/Core/Model/Message/Success.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Model/Message/Warning.php b/app/code/core/Mage/Core/Model/Message/Warning.php
index 61649fec6a..001fe0ab31 100644
--- a/app/code/core/Mage/Core/Model/Message/Warning.php
+++ b/app/code/core/Mage/Core/Model/Message/Warning.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Model/Mysql4/Abstract.php b/app/code/core/Mage/Core/Model/Mysql4/Abstract.php
index 30107d68d7..b56ff1fc7e 100644
--- a/app/code/core/Mage/Core/Model/Mysql4/Abstract.php
+++ b/app/code/core/Mage/Core/Model/Mysql4/Abstract.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Model/Mysql4/Collection/Abstract.php b/app/code/core/Mage/Core/Model/Mysql4/Collection/Abstract.php
index 29c946efb7..57569fc90b 100644
--- a/app/code/core/Mage/Core/Model/Mysql4/Collection/Abstract.php
+++ b/app/code/core/Mage/Core/Model/Mysql4/Collection/Abstract.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Model/Mysql4/Config.php b/app/code/core/Mage/Core/Model/Mysql4/Config.php
index dca85a87ad..cabc44b05c 100644
--- a/app/code/core/Mage/Core/Model/Mysql4/Config.php
+++ b/app/code/core/Mage/Core/Model/Mysql4/Config.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Model/Mysql4/Config/Data.php b/app/code/core/Mage/Core/Model/Mysql4/Config/Data.php
index bb145cf38c..7aab169eb2 100644
--- a/app/code/core/Mage/Core/Model/Mysql4/Config/Data.php
+++ b/app/code/core/Mage/Core/Model/Mysql4/Config/Data.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Model/Mysql4/Config/Data/Collection.php b/app/code/core/Mage/Core/Model/Mysql4/Config/Data/Collection.php
index 76de3d7f8e..ead31ce3fd 100644
--- a/app/code/core/Mage/Core/Model/Mysql4/Config/Data/Collection.php
+++ b/app/code/core/Mage/Core/Model/Mysql4/Config/Data/Collection.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Model/Mysql4/Convert/History.php b/app/code/core/Mage/Core/Model/Mysql4/Convert/History.php
index 89a544d04f..662927a558 100644
--- a/app/code/core/Mage/Core/Model/Mysql4/Convert/History.php
+++ b/app/code/core/Mage/Core/Model/Mysql4/Convert/History.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Model/Mysql4/Convert/History/Collection.php b/app/code/core/Mage/Core/Model/Mysql4/Convert/History/Collection.php
index 52418a1be0..84fd34e487 100644
--- a/app/code/core/Mage/Core/Model/Mysql4/Convert/History/Collection.php
+++ b/app/code/core/Mage/Core/Model/Mysql4/Convert/History/Collection.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Model/Mysql4/Convert/Profile.php b/app/code/core/Mage/Core/Model/Mysql4/Convert/Profile.php
index bdeabeaf6c..fc108da496 100644
--- a/app/code/core/Mage/Core/Model/Mysql4/Convert/Profile.php
+++ b/app/code/core/Mage/Core/Model/Mysql4/Convert/Profile.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Model/Mysql4/Convert/Profile/Collection.php b/app/code/core/Mage/Core/Model/Mysql4/Convert/Profile/Collection.php
index e937843146..5007f0bb25 100644
--- a/app/code/core/Mage/Core/Model/Mysql4/Convert/Profile/Collection.php
+++ b/app/code/core/Mage/Core/Model/Mysql4/Convert/Profile/Collection.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Model/Mysql4/Design.php b/app/code/core/Mage/Core/Model/Mysql4/Design.php
index b196d110f5..75b638e51b 100644
--- a/app/code/core/Mage/Core/Model/Mysql4/Design.php
+++ b/app/code/core/Mage/Core/Model/Mysql4/Design.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Admin
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Model/Mysql4/Design/Collection.php b/app/code/core/Mage/Core/Model/Mysql4/Design/Collection.php
index ae32c886fb..fdd13014e8 100644
--- a/app/code/core/Mage/Core/Model/Mysql4/Design/Collection.php
+++ b/app/code/core/Mage/Core/Model/Mysql4/Design/Collection.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Admin
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Model/Mysql4/Design/Package/Collection.php b/app/code/core/Mage/Core/Model/Mysql4/Design/Package/Collection.php
index f6ee9924cc..60e32ad581 100644
--- a/app/code/core/Mage/Core/Model/Mysql4/Design/Package/Collection.php
+++ b/app/code/core/Mage/Core/Model/Mysql4/Design/Package/Collection.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Model/Mysql4/Design/Theme/Collection.php b/app/code/core/Mage/Core/Model/Mysql4/Design/Theme/Collection.php
index 42c36d72de..f5769fa7a4 100644
--- a/app/code/core/Mage/Core/Model/Mysql4/Design/Theme/Collection.php
+++ b/app/code/core/Mage/Core/Model/Mysql4/Design/Theme/Collection.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Model/Mysql4/Email/Template.php b/app/code/core/Mage/Core/Model/Mysql4/Email/Template.php
index 94c3970df5..d7d1808d2b 100644
--- a/app/code/core/Mage/Core/Model/Mysql4/Email/Template.php
+++ b/app/code/core/Mage/Core/Model/Mysql4/Email/Template.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Model/Mysql4/Email/Template/Collection.php b/app/code/core/Mage/Core/Model/Mysql4/Email/Template/Collection.php
index 591e5aef34..4bf4fe4d0d 100644
--- a/app/code/core/Mage/Core/Model/Mysql4/Email/Template/Collection.php
+++ b/app/code/core/Mage/Core/Model/Mysql4/Email/Template/Collection.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Model/Mysql4/Flag.php b/app/code/core/Mage/Core/Model/Mysql4/Flag.php
new file mode 100644
index 0000000000..32ef78ff79
--- /dev/null
+++ b/app/code/core/Mage/Core/Model/Mysql4/Flag.php
@@ -0,0 +1,33 @@
+_init('core/flag', 'flag_id');
+    }
+}
\ No newline at end of file
diff --git a/app/code/core/Mage/Core/Model/Mysql4/History.php b/app/code/core/Mage/Core/Model/Mysql4/History.php
index e8f0cc6c87..af67c9f18e 100644
--- a/app/code/core/Mage/Core/Model/Mysql4/History.php
+++ b/app/code/core/Mage/Core/Model/Mysql4/History.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Model/Mysql4/Language.php b/app/code/core/Mage/Core/Model/Mysql4/Language.php
index 8dadb82e95..6d3d258429 100644
--- a/app/code/core/Mage/Core/Model/Mysql4/Language.php
+++ b/app/code/core/Mage/Core/Model/Mysql4/Language.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Model/Mysql4/Language/Collection.php b/app/code/core/Mage/Core/Model/Mysql4/Language/Collection.php
index cf5e2ccbb2..40fa34cabd 100644
--- a/app/code/core/Mage/Core/Model/Mysql4/Language/Collection.php
+++ b/app/code/core/Mage/Core/Model/Mysql4/Language/Collection.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Model/Mysql4/Layout.php b/app/code/core/Mage/Core/Model/Mysql4/Layout.php
index 412a348d8f..9acb04c3d4 100644
--- a/app/code/core/Mage/Core/Model/Mysql4/Layout.php
+++ b/app/code/core/Mage/Core/Model/Mysql4/Layout.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Model/Mysql4/Resource.php b/app/code/core/Mage/Core/Model/Mysql4/Resource.php
index 297f6a7bc9..59dfacb1d1 100644
--- a/app/code/core/Mage/Core/Model/Mysql4/Resource.php
+++ b/app/code/core/Mage/Core/Model/Mysql4/Resource.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Model/Mysql4/Session.php b/app/code/core/Mage/Core/Model/Mysql4/Session.php
index 2196f24e28..fa85569d98 100644
--- a/app/code/core/Mage/Core/Model/Mysql4/Session.php
+++ b/app/code/core/Mage/Core/Model/Mysql4/Session.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Model/Mysql4/Store.php b/app/code/core/Mage/Core/Model/Mysql4/Store.php
index 125760c753..0f034adbd8 100644
--- a/app/code/core/Mage/Core/Model/Mysql4/Store.php
+++ b/app/code/core/Mage/Core/Model/Mysql4/Store.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Model/Mysql4/Store/Collection.php b/app/code/core/Mage/Core/Model/Mysql4/Store/Collection.php
index 6d3f5a6bb9..b3e56c8d89 100644
--- a/app/code/core/Mage/Core/Model/Mysql4/Store/Collection.php
+++ b/app/code/core/Mage/Core/Model/Mysql4/Store/Collection.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -112,7 +118,9 @@ public function load($printQuery = false, $logQuery = false)
         if (!$this->getLoadDefault()) {
             $this->getSelect()->where($this->getConnection()->quoteInto('main_table.store_id>?', 0));
         }
-        $this->getSelect()->order('main_table.sort_order ASC');
+        $this->addOrder('CASE WHEN main_table.store_id = 0 THEN 0 ELSE 1 END', 'ASC')
+            ->addOrder('main_table.sort_order', 'ASC')
+            ->addOrder('main_table.name', 'ASC');
         parent::load($printQuery, $logQuery);
         return $this;
     }
diff --git a/app/code/core/Mage/Core/Model/Mysql4/Store/Group.php b/app/code/core/Mage/Core/Model/Mysql4/Store/Group.php
index 425fe0cb58..9f8b237b49 100644
--- a/app/code/core/Mage/Core/Model/Mysql4/Store/Group.php
+++ b/app/code/core/Mage/Core/Model/Mysql4/Store/Group.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Model/Mysql4/Store/Group/Collection.php b/app/code/core/Mage/Core/Model/Mysql4/Store/Group/Collection.php
index aec5efdc02..9920991b4b 100644
--- a/app/code/core/Mage/Core/Model/Mysql4/Store/Group/Collection.php
+++ b/app/code/core/Mage/Core/Model/Mysql4/Store/Group/Collection.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -40,6 +46,7 @@ public function load($printQuery = false, $logQuery = false)
         if (!$this->_loadDefault) {
             $this->setWithoutDefaultFilter();
         }
+        $this->addOrder('main_table.name', 'ASC');
         return parent::load($printQuery, $logQuery);
     }
 
@@ -75,4 +82,4 @@ public function addWebsiteFilter($website)
         }
         return $this->addFilter('website_id', $condition, 'string');
     }
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Core/Model/Mysql4/Translate.php b/app/code/core/Mage/Core/Model/Mysql4/Translate.php
index 1d1d019d94..b54a0bae97 100644
--- a/app/code/core/Mage/Core/Model/Mysql4/Translate.php
+++ b/app/code/core/Mage/Core/Model/Mysql4/Translate.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Model/Mysql4/Translate/String.php b/app/code/core/Mage/Core/Model/Mysql4/Translate/String.php
index bd0c5403a4..2101e76e6d 100644
--- a/app/code/core/Mage/Core/Model/Mysql4/Translate/String.php
+++ b/app/code/core/Mage/Core/Model/Mysql4/Translate/String.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -34,24 +40,18 @@ protected function _construct()
 
     public function load(Mage_Core_Model_Abstract $object, $value, $field=null)
     {
-        /**
-         * Partially reverted rev 21685
-         * @see issue #5943
-         */
-//        if (is_string($value)) {
-//            $select = $this->_getReadAdapter()->select()
-//                ->from($this->getMainTable())
-//                ->where($this->getMainTable().'.string=:tr_string');
-//            $result = $this->_getReadAdapter()->fetchRow($select, array('tr_string'=>$value));
-//            return $result;
-//        }
-//        else {
-//        	return parent::load($object, $value, $field);
-//        }
         if (is_string($value)) {
-            $field = 'string';
+            $select = $this->_getReadAdapter()->select()
+                ->from($this->getMainTable())
+                ->where($this->getMainTable().'.string=:tr_string');
+            $result = $this->_getReadAdapter()->fetchRow($select, array('tr_string'=>$value));
+            $object->setData($result);
+            $this->_afterLoad($object);
+            return $result;
+        }
+        else {
+        	return parent::load($object, $value, $field);
         }
-        return parent::load($object, $value, $field);
     }
 
     protected function _getLoadSelect($field, $value, $object)
@@ -67,8 +67,8 @@ public function _afterLoad(Mage_Core_Model_Abstract $object)
         $connection = $this->_getReadAdapter();
         $select = $connection->select()
             ->from($this->getMainTable(), array('store_id', 'translate'))
-            ->where('string=?', $object->getString());
-        $translations = $connection->fetchPairs($select);
+            ->where('string=:translate_string');
+        $translations = $connection->fetchPairs($select, array('translate_string' => $object->getString()));
         $object->setStoreTranslations($translations);
         return parent::_afterLoad($object);
     }
diff --git a/app/code/core/Mage/Core/Model/Mysql4/Url/Rewrite.php b/app/code/core/Mage/Core/Model/Mysql4/Url/Rewrite.php
index a13ea78d88..5357a03f91 100644
--- a/app/code/core/Mage/Core/Model/Mysql4/Url/Rewrite.php
+++ b/app/code/core/Mage/Core/Model/Mysql4/Url/Rewrite.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Model/Mysql4/Url/Rewrite/Collection.php b/app/code/core/Mage/Core/Model/Mysql4/Url/Rewrite/Collection.php
index d1531e66b8..1da6ff2c6f 100644
--- a/app/code/core/Mage/Core/Model/Mysql4/Url/Rewrite/Collection.php
+++ b/app/code/core/Mage/Core/Model/Mysql4/Url/Rewrite/Collection.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Model/Mysql4/Website.php b/app/code/core/Mage/Core/Model/Mysql4/Website.php
index 2690a05ed7..9fc96eacdb 100644
--- a/app/code/core/Mage/Core/Model/Mysql4/Website.php
+++ b/app/code/core/Mage/Core/Model/Mysql4/Website.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Model/Mysql4/Website/Collection.php b/app/code/core/Mage/Core/Model/Mysql4/Website/Collection.php
index 8f611276aa..1f9c1f280f 100644
--- a/app/code/core/Mage/Core/Model/Mysql4/Website/Collection.php
+++ b/app/code/core/Mage/Core/Model/Mysql4/Website/Collection.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -76,6 +82,9 @@ public function load($printQuery = false, $logQuery = false)
         if (!$this->getLoadDefault()) {
             $this->getSelect()->where($this->getConnection()->quoteInto('main_table.website_id>?', 0));
         }
+        $this->unshiftOrder('main_table.name', 'ASC')       // website name SECOND
+            ->unshiftOrder('main_table.sort_order', 'ASC') // website sort order FIRST
+        ;
         parent::load($printQuery, $logQuery);
         return $this;
     }
@@ -92,6 +101,11 @@ public function joinGroupAndStore()
             'group_table.group_id=store_table.group_id',
             array('store_id'=>'store_id', 'store_title'=>'name')
         );
+        $this->addOrder('group_table.name', 'ASC')       // store name
+            ->addOrder('CASE WHEN store_table.store_id = 0 THEN 0 ELSE 1 END', 'ASC') // view is admin
+            ->addOrder('store_table.sort_order', 'ASC') // view sort order
+            ->addOrder('store_table.name', 'ASC')       // view name
+        ;
         return $this;
     }
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Core/Model/Resource.php b/app/code/core/Mage/Core/Model/Resource.php
index 4c8a2ec7db..b020016ea2 100644
--- a/app/code/core/Mage/Core/Model/Resource.php
+++ b/app/code/core/Mage/Core/Model/Resource.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Model/Resource/Abstract.php b/app/code/core/Mage/Core/Model/Resource/Abstract.php
index 0cb74f963a..c550b58b79 100644
--- a/app/code/core/Mage/Core/Model/Resource/Abstract.php
+++ b/app/code/core/Mage/Core/Model/Resource/Abstract.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Model/Resource/Entity/Abstract.php b/app/code/core/Mage/Core/Model/Resource/Entity/Abstract.php
index 1d3f4b1cb6..291c3f451a 100644
--- a/app/code/core/Mage/Core/Model/Resource/Entity/Abstract.php
+++ b/app/code/core/Mage/Core/Model/Resource/Entity/Abstract.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Model/Resource/Entity/Table.php b/app/code/core/Mage/Core/Model/Resource/Entity/Table.php
index be188e08d3..e0a8a9dccc 100644
--- a/app/code/core/Mage/Core/Model/Resource/Entity/Table.php
+++ b/app/code/core/Mage/Core/Model/Resource/Entity/Table.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Model/Resource/Iterator.php b/app/code/core/Mage/Core/Model/Resource/Iterator.php
index 1e5d46b394..9420a3b423 100644
--- a/app/code/core/Mage/Core/Model/Resource/Iterator.php
+++ b/app/code/core/Mage/Core/Model/Resource/Iterator.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Model/Resource/Setup.php b/app/code/core/Mage/Core/Model/Resource/Setup.php
index 7e40f0d09e..76bae22dd8 100644
--- a/app/code/core/Mage/Core/Model/Resource/Setup.php
+++ b/app/code/core/Mage/Core/Model/Resource/Setup.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Model/Resource/Transaction.php b/app/code/core/Mage/Core/Model/Resource/Transaction.php
index 1c3d050327..e0e734b4bd 100644
--- a/app/code/core/Mage/Core/Model/Resource/Transaction.php
+++ b/app/code/core/Mage/Core/Model/Resource/Transaction.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -123,16 +129,37 @@ public function addObject(Mage_Core_Model_Abstract $object, $alias='')
     public function save()
     {
         $this->_startTransaction();
-        try {
-            foreach ($this->_objects as $object) {
+        $commit = true;
+        $errors = array();
+
+        foreach ($this->_objects as $object) {
+            try {
                 $object->save();
             }
+            catch (Exception $e) {
+                $commit = false;
+                $errors[] = $e->getMessage();
+            }
+        }
+
+        if ($commit) {
             $this->_commitTransaction();
         }
-        catch (Exception $e) {
+        else {
             $this->_rollbackTransaction();
-            throw $e;
+            Mage::throwException(join("\n", $errors));
         }
+
+//        try {
+//            foreach ($this->_objects as $object) {
+//                $object->save();
+//            }
+//            $this->_commitTransaction();
+//        }
+//        catch (Exception $e) {
+//            $this->_rollbackTransaction();
+//            throw $e;
+//        }
         return $this;
     }
 
diff --git a/app/code/core/Mage/Core/Model/Resource/Type/Abstract.php b/app/code/core/Mage/Core/Model/Resource/Type/Abstract.php
index 07276a5fa7..d8689298b2 100644
--- a/app/code/core/Mage/Core/Model/Resource/Type/Abstract.php
+++ b/app/code/core/Mage/Core/Model/Resource/Type/Abstract.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Model/Resource/Type/Db.php b/app/code/core/Mage/Core/Model/Resource/Type/Db.php
index cfaef39c17..a15296b65b 100644
--- a/app/code/core/Mage/Core/Model/Resource/Type/Db.php
+++ b/app/code/core/Mage/Core/Model/Resource/Type/Db.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Model/Resource/Type/Db/Mysqli.php b/app/code/core/Mage/Core/Model/Resource/Type/Db/Mysqli.php
index 0eb5098651..bf7fdd9053 100644
--- a/app/code/core/Mage/Core/Model/Resource/Type/Db/Mysqli.php
+++ b/app/code/core/Mage/Core/Model/Resource/Type/Db/Mysqli.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Model/Resource/Type/Db/Mysqli/Setup.php b/app/code/core/Mage/Core/Model/Resource/Type/Db/Mysqli/Setup.php
index e7532ced5b..6e288921d7 100644
--- a/app/code/core/Mage/Core/Model/Resource/Type/Db/Mysqli/Setup.php
+++ b/app/code/core/Mage/Core/Model/Resource/Type/Db/Mysqli/Setup.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Model/Resource/Type/Db/Pdo/Mysql.php b/app/code/core/Mage/Core/Model/Resource/Type/Db/Pdo/Mysql.php
index 4a6d26ca88..0220ccaab5 100644
--- a/app/code/core/Mage/Core/Model/Resource/Type/Db/Pdo/Mysql.php
+++ b/app/code/core/Mage/Core/Model/Resource/Type/Db/Pdo/Mysql.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Model/Session.php b/app/code/core/Mage/Core/Model/Session.php
index f1a372dfc0..3fb19ce47c 100644
--- a/app/code/core/Mage/Core/Model/Session.php
+++ b/app/code/core/Mage/Core/Model/Session.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Model/Session/Abstract.php b/app/code/core/Mage/Core/Model/Session/Abstract.php
index 6375ed9bc0..e3ce3f9c11 100644
--- a/app/code/core/Mage/Core/Model/Session/Abstract.php
+++ b/app/code/core/Mage/Core/Model/Session/Abstract.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Model/Session/Abstract/Varien.php b/app/code/core/Mage/Core/Model/Session/Abstract/Varien.php
index f4bc219561..f626b27496 100644
--- a/app/code/core/Mage/Core/Model/Session/Abstract/Varien.php
+++ b/app/code/core/Mage/Core/Model/Session/Abstract/Varien.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Model/Session/Abstract/Zend.php b/app/code/core/Mage/Core/Model/Session/Abstract/Zend.php
index 99b4e6eff5..cc989d9585 100644
--- a/app/code/core/Mage/Core/Model/Session/Abstract/Zend.php
+++ b/app/code/core/Mage/Core/Model/Session/Abstract/Zend.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Model/Store.php b/app/code/core/Mage/Core/Model/Store.php
index 1402faa079..6a2a4e3050 100644
--- a/app/code/core/Mage/Core/Model/Store.php
+++ b/app/code/core/Mage/Core/Model/Store.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -707,7 +713,7 @@ public function isCanDelete()
      */
     public function getCurrentUrl($fromStore = true)
     {
-        $query = ltrim(Mage::app()->getRequest()->getRequestString(), '/');
+        $query = Mage::getSingleton('core/url')->escape(ltrim(Mage::app()->getRequest()->getRequestString(), '/'));
 
         $parsedUrl = parse_url($this->getUrl(''));
         $parsedQuery = array();
@@ -728,7 +734,7 @@ public function getCurrentUrl($fromStore = true)
 
         return $parsedUrl['scheme'] . '://' . $parsedUrl['host']
             . (isset($parsedUrl['port']) ? ':' . $parsedUrl['port'] : '')
-            . $parsedUrl['path'] . str_replace('%2F', '/', rawurlencode(rawurldecode($query)))
+            . $parsedUrl['path'] . $query
             . ($parsedQuery ? '?'.http_build_query($parsedQuery, '', '&') : '');
     }
 
@@ -747,4 +753,16 @@ protected function _beforeDelete()
         $this->_protectFromNonAdmin();
         return parent::_beforeDelete();
     }
+    
+    /**
+     * rewrite in order to clear configuration cache
+     *
+     * @return Mage_Core_Model_Store
+     */
+    protected function _afterDelte()
+    {
+    	parent::_afterDelte();
+    	Mage::getConfig()->removeCache();
+    	return $this;
+    }
 }
diff --git a/app/code/core/Mage/Core/Model/Store/Exception.php b/app/code/core/Mage/Core/Model/Store/Exception.php
index 2b7142ff9f..40e406e6aa 100644
--- a/app/code/core/Mage/Core/Model/Store/Exception.php
+++ b/app/code/core/Mage/Core/Model/Store/Exception.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Model/Store/Group.php b/app/code/core/Mage/Core/Model/Store/Group.php
index 5098910672..2ed9daf77c 100644
--- a/app/code/core/Mage/Core/Model/Store/Group.php
+++ b/app/code/core/Mage/Core/Model/Store/Group.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Model/Translate.php b/app/code/core/Mage/Core/Model/Translate.php
index 48bd9f4b90..e50f7c953a 100644
--- a/app/code/core/Mage/Core/Model/Translate.php
+++ b/app/code/core/Mage/Core/Model/Translate.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -217,31 +223,31 @@ protected function _addData($data, $scope)
         foreach ($data as $key => $value) {
             $key    = $this->_prepareDataString($key);
             $value  = $this->_prepareDataString($value);
-        	if ($scope && isset($this->_dataScope[$key])) {
-        	    /**
-        	     * Checking previos value
-        	     */
-        	    $scopeKey = $this->_dataScope[$key] . self::SCOPE_SEPARATOR . $key;
-        	    if (!isset($this->_data[$scopeKey])) {
-        	        if (isset($this->_data[$key])) {
-        	            $this->_data[$scopeKey] = $this->_data[$key];
-        	            unset($this->_data[$key]);
-        	        }
-        	    }
-    	        $scopeKey = $scope . self::SCOPE_SEPARATOR . $key;
-    	        $this->_data[$scopeKey] = $value;
-        	}
-        	else {
-        	    $this->_data[$key]     = $value;
-        	    $this->_dataScope[$key]= $scope;
-        	}
+            if ($scope && isset($this->_dataScope[$key])) {
+                /**
+                 * Checking previos value
+                 */
+                $scopeKey = $this->_dataScope[$key] . self::SCOPE_SEPARATOR . $key;
+                if (!isset($this->_data[$scopeKey])) {
+                    if (isset($this->_data[$key])) {
+                        $this->_data[$scopeKey] = $this->_data[$key];
+                        unset($this->_data[$key]);
+                    }
+                }
+                $scopeKey = $scope . self::SCOPE_SEPARATOR . $key;
+                $this->_data[$scopeKey] = $value;
+            }
+            else {
+                $this->_data[$key]     = $value;
+                $this->_dataScope[$key]= $scope;
+            }
         }
         return $this;
     }
 
     protected function _prepareDataString($string)
     {
-        return str_replace('""', '"', trim($string, '"'));
+        return str_replace('""', '"', $string);
     }
 
     /**
@@ -538,7 +544,7 @@ protected function _getTranslatedString($text, $code)
             $translated = $this->_data[$code];
         }
         elseif (array_key_exists($text, $this->getData())) {
-        	$translated = $this->_data[$text];
+            $translated = $this->_data[$text];
         }
         else {
             $translated = $text;
diff --git a/app/code/core/Mage/Core/Model/Translate/Abstract.php b/app/code/core/Mage/Core/Model/Translate/Abstract.php
index 1ef2f8ac64..2cc2dfea61 100644
--- a/app/code/core/Mage/Core/Model/Translate/Abstract.php
+++ b/app/code/core/Mage/Core/Model/Translate/Abstract.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Model/Translate/Expr.php b/app/code/core/Mage/Core/Model/Translate/Expr.php
index 9332ec3d5f..beeb088dc3 100644
--- a/app/code/core/Mage/Core/Model/Translate/Expr.php
+++ b/app/code/core/Mage/Core/Model/Translate/Expr.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Model/Translate/Inline.php b/app/code/core/Mage/Core/Model/Translate/Inline.php
index b28fafd36a..967d239167 100644
--- a/app/code/core/Mage/Core/Model/Translate/Inline.php
+++ b/app/code/core/Mage/Core/Model/Translate/Inline.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Model/Translate/String.php b/app/code/core/Mage/Core/Model/Translate/String.php
index 4b340c34be..8039c16dd7 100644
--- a/app/code/core/Mage/Core/Model/Translate/String.php
+++ b/app/code/core/Mage/Core/Model/Translate/String.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/Model/Url.php b/app/code/core/Mage/Core/Model/Url.php
index f519f71bbe..510415611a 100644
--- a/app/code/core/Mage/Core/Model/Url.php
+++ b/app/code/core/Mage/Core/Model/Url.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -198,6 +204,10 @@ public function getType()
 
     public function getSecure()
     {
+        if ($this->hasSecureIsForced()) {
+            return $this->_getData('secure');
+        }
+
         if (!Mage::getStoreConfigFlag('web/secure/use_in_frontend')) {
             return false;
         }
@@ -323,8 +333,9 @@ public function getActionPath()
     public function getRoutePath($routeParams=array())
     {
         if (!$this->hasData('route_path')) {
+        	$routePath = $this->getRequest()->getAlias(Mage_Core_Model_Url_Rewrite::REWRITE_REQUEST_PATH_ALIAS);
             if (!empty($routeParams['_use_rewrite'])
-                && ($routePath = $this->getRequest()->getAlias(Mage_Core_Model_Url_Rewrite::REWRITE_REQUEST_PATH_ALIAS))) {
+                && ($routePath !== null)) {
                 $this->setData('route_path', $routePath);
                 return $routePath;
             }
@@ -411,9 +422,15 @@ public function setRouteParams(array $data, $unsetOldParams=true)
             unset($data['_type']);
         }
 
-        if (isset($data['_secure'])) {
-            $this->setSecure((bool)$data['_secure']);
-            unset($data['_secure']);
+        if (isset($data['_forced_secure'])) {
+            $this->setSecure((bool)$data['_forced_secure']);
+            $this->setSecureIsForced(true);
+            unset($data['_forced_secure']);
+        } else {
+            if (isset($data['_secure'])) {
+                $this->setSecure((bool)$data['_secure']);
+                unset($data['_secure']);
+            }
         }
 
         if (isset($data['_absolute'])) {
@@ -674,6 +691,15 @@ public function getUrl($routePath=null, $routeParams=null)
         if ($this->getFragment()) {
             $url .= '#'.$this->getFragment();
         }
-        return $url;
+        return $this->escape($url);
+    }
+
+    public function escape($value)
+    {
+        $value = str_replace('"', '%22', $value);
+        $value = str_replace("'", '%27', $value);
+        $value = str_replace('>', '%3E', $value);
+        $value = str_replace('<', '%3C', $value);
+        return $value;
     }
 }
\ No newline at end of file
diff --git a/app/code/core/Mage/Core/Model/Url/Rewrite.php b/app/code/core/Mage/Core/Model/Url/Rewrite.php
index 619a9f1da1..9afae6d863 100644
--- a/app/code/core/Mage/Core/Model/Url/Rewrite.php
+++ b/app/code/core/Mage/Core/Model/Url/Rewrite.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -207,6 +213,7 @@ public function rewrite(Zend_Controller_Request_Http $request=null, Zend_Control
             return false;
         }
 
+
         $request->setAlias(self::REWRITE_REQUEST_PATH_ALIAS, $this->getRequestPath());
         $external = substr($this->getTargetPath(), 0, 6);
         if ($external==='http:/' || $external==='https:') {
@@ -223,6 +230,10 @@ public function rewrite(Zend_Controller_Request_Http $request=null, Zend_Control
             exit;
         }
 
+        if (Mage::getStoreConfig('web/url/use_store') && $storeCode = Mage::app()->getStore()->getCode()) {
+                $targetUrl = $request->getBaseUrl(). '/' . $storeCode . '/' .$this->getTargetPath();
+            }
+
         if ($queryString = $this->_getQueryString()) {
         	$targetUrl .= '?'.$queryString;
         }
diff --git a/app/code/core/Mage/Core/Model/Website.php b/app/code/core/Mage/Core/Model/Website.php
index 553c149b73..706e41be9b 100644
--- a/app/code/core/Mage/Core/Model/Website.php
+++ b/app/code/core/Mage/Core/Model/Website.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -438,4 +444,16 @@ protected function _beforeDelete()
         $this->_protectFromNonAdmin();
         return parent::_beforeDelete();
     }
+    
+    /**
+     * rewrite in order to clear configuration cache
+     *
+     * @return Mage_Core_Model_Website
+     */
+    protected function _afterDelte()
+    {
+    	parent::_afterDelte();
+    	Mage::getConfig()->removeCache();
+    	return $this;
+    }
 }
diff --git a/app/code/core/Mage/Core/controllers/AjaxController.php b/app/code/core/Mage/Core/controllers/AjaxController.php
index 888037598c..effac0efba 100644
--- a/app/code/core/Mage/Core/controllers/AjaxController.php
+++ b/app/code/core/Mage/Core/controllers/AjaxController.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/controllers/IndexController.php b/app/code/core/Mage/Core/controllers/IndexController.php
index 7939236860..fffbd95901 100644
--- a/app/code/core/Mage/Core/controllers/IndexController.php
+++ b/app/code/core/Mage/Core/controllers/IndexController.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/etc/config.xml b/app/code/core/Mage/Core/etc/config.xml
index e3aaf8612b..fc8dd7c1c5 100644
--- a/app/code/core/Mage/Core/etc/config.xml
+++ b/app/code/core/Mage/Core/etc/config.xml
@@ -13,6 +13,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -22,7 +28,7 @@
 
     
         
-             0.8.8
+             0.8.11
         
     
 
@@ -44,6 +50,7 @@
                     core_convert_profile
    
                     core_convert_history
    
                     design_change
    
+                    core_flag
    
                 
             
         
@@ -58,11 +65,11 @@
         
         
             
-                
-                
-                
-                
-                
+                
+                
+                
+                
+                
             
         
     
@@ -132,6 +139,9 @@
                 system.log
                 exception.log
             
+            
+                0
+            
         
 
 
diff --git a/app/code/core/Mage/Core/etc/system.xml b/app/code/core/Mage/Core/etc/system.xml
index c0603526db..31470c8f27 100644
--- a/app/code/core/Mage/Core/etc/system.xml
+++ b/app/code/core/Mage/Core/etc/system.xml
@@ -13,6 +13,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -270,7 +276,7 @@
                             1
                             1
                             1
-                            Match expresions in the same order as displayed in the configuration.
+                            Match expressions in the same order as displayed in the configuration.
                         
                         
                 
@@ -306,7 +312,7 @@
                             1
                             1
                             1
-                            Match expresions in the same order as displayed in the configuration.
+                            Match expressions in the same order as displayed in the configuration.
                         
                         
                             
@@ -428,7 +434,7 @@
                         
                     
                 
-                
+                
                     
                     text
                     30
@@ -445,7 +451,7 @@
                             1
                             1
                         
-                        
+                        
                             
                             select
                             adminhtml/system_config_source_yesno
@@ -457,7 +463,7 @@
                         
                     
                 
-                
+                
                     
                     text
                     40
@@ -494,6 +500,25 @@
                         
                     
                 
+                
+                    
+                    text
+                    100
+                    1
+                    1
+                    1
+                    
+                        
+                            
+                            select
+                            adminhtml/system_config_source_yesno
+                            10
+                            1
+                            1
+                            1
+                        
+                    
+                
             
         
         
diff --git a/app/code/core/Mage/Core/functions.php b/app/code/core/Mage/Core/functions.php
index 4a46ffcefb..a80f762dfc 100644
--- a/app/code/core/Mage/Core/functions.php
+++ b/app/code/core/Mage/Core/functions.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -63,7 +69,7 @@ function __autoload($class)
     //$a = explode('_', $class);
     //Varien_Profiler::start('AUTOLOAD');
     //Varien_Profiler::start('AUTOLOAD: '.$a[0]);
-	
+
     include($classFile);
 
     //Varien_Profiler::stop('AUTOLOAD');
@@ -249,7 +255,8 @@ function mageDebugBacktrace($return=false, $html=true, $showFirst=false)
         if (!$showFirst && $i==0) {
             continue;
         }
-        $out .= "[$i] {$r['file']}:{$r['line']}\n";
+        // sometimes there is undefined index 'file'
+        @$out .= "[$i] {$r['file']}:{$r['line']}\n";
     }
     if ($html) $out .= "
    ";
     if ($return) {
diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-install-0.7.0.php
index 80c063e1e4..37ad4ea2ea 100644
--- a/app/code/core/Mage/Core/sql/core_setup/mysql4-install-0.7.0.php
+++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-install-0.7.0.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-install-0.8.0.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-install-0.8.0.php
index 0be97b79db..a3dde857fa 100644
--- a/app/code/core/Mage/Core/sql/core_setup/mysql4-install-0.8.0.php
+++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-install-0.8.0.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -209,7 +215,7 @@
   ADD CONSTRAINT `FK_CORE_URL_REWRITE_TAG_URL_REWRITE` FOREIGN KEY (`url_rewrite_id`) REFERENCES `{$installer->getTable('core_url_rewrite')}` (`url_rewrite_id`) ON DELETE CASCADE ON UPDATE CASCADE;
 
 ALTER TABLE `{$installer->getTable('design_change')}`
-  ADD CONSTRAINT `FK_DESIGN_CHANGE_STORE` FOREIGN KEY (`store_id`) REFERENCES `{$installer->getTable('core_store')}` (`store_id`);
+  ADD CONSTRAINT `FK_DESIGN_CHANGE_STORE` FOREIGN KEY (`store_id`) REFERENCES `{$installer->getTable('core_store')}` (`store_id`) ON DELETE CASCADE ON UPDATE CASCADE;
 
 ");
 
diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.6.26-0.7.0.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.6.26-0.7.0.php
index cb4e609be1..1f13778894 100644
--- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.6.26-0.7.0.php
+++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.6.26-0.7.0.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.1-0.7.2.php
index 7a2abb36e8..818dbc531a 100644
--- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.1-0.7.2.php
+++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.1-0.7.2.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.2-0.7.3.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.2-0.7.3.php
index cc71136cae..88cb33e949 100644
--- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.2-0.7.3.php
+++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.2-0.7.3.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.3-0.7.4.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.3-0.7.4.php
index c92b85849c..6d30ee82a3 100644
--- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.3-0.7.4.php
+++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.3-0.7.4.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.4-0.7.5.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.4-0.7.5.php
index d8cacb19fd..509cd1ce15 100644
--- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.4-0.7.5.php
+++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.4-0.7.5.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.5-0.7.6.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.5-0.7.6.php
index 8ca018dc5b..dc282e1016 100644
--- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.5-0.7.6.php
+++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.5-0.7.6.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.6-0.7.7.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.6-0.7.7.php
index ef19f914e5..9dbe562f6c 100644
--- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.6-0.7.7.php
+++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.6-0.7.7.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.7-0.7.8.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.7-0.7.8.php
index 6b39722c41..aa91b02def 100644
--- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.7-0.7.8.php
+++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.7-0.7.8.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.8-0.7.9.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.8-0.7.9.php
index e2ee06eeb5..9416c7ff80 100644
--- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.8-0.7.9.php
+++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.8-0.7.9.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.0-0.8.1.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.0-0.8.1.php
index 5bc58d2f30..3b0db45375 100644
--- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.0-0.8.1.php
+++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.0-0.8.1.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.1-0.8.2.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.1-0.8.2.php
index 6ba85721e0..b904457f14 100644
--- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.1-0.8.2.php
+++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.1-0.8.2.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.10-0.8.11.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.10-0.8.11.php
new file mode 100644
index 0000000000..eb2b6f8231
--- /dev/null
+++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.10-0.8.11.php
@@ -0,0 +1,38 @@
+startSetup();
+
+$installer->run("
+ALTER TABLE `{$installer->getTable('design_change')}` DROP FOREIGN KEY `FK_DESIGN_CHANGE_STORE`;
+ALTER TABLE `{$installer->getTable('design_change')}`
+  ADD CONSTRAINT `FK_DESIGN_CHANGE_STORE` FOREIGN KEY (`store_id`) REFERENCES `{$installer->getTable('core_store')}` (`store_id`) ON DELETE CASCADE ON UPDATE CASCADE;
+");
+
+$installer->endSetup();
diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.2-0.8.3.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.2-0.8.3.php
index dc0dd6d16d..76905f9403 100644
--- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.2-0.8.3.php
+++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.2-0.8.3.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.3-0.8.4.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.3-0.8.4.php
index 311b832cf7..3a36127677 100644
--- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.3-0.8.4.php
+++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.3-0.8.4.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.4-0.8.5.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.4-0.8.5.php
index c63cf9f2bf..bbe82f9c52 100644
--- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.4-0.8.5.php
+++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.4-0.8.5.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.5-0.8.6.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.5-0.8.6.php
index 35e0dc8e10..be29356b3d 100644
--- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.5-0.8.6.php
+++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.5-0.8.6.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.6-0.8.7.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.6-0.8.7.php
index 8b251f8279..f760e1ff2b 100644
--- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.6-0.8.7.php
+++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.6-0.8.7.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.7-0.8.8.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.7-0.8.8.php
index be344a9a70..962896b300 100644
--- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.7-0.8.8.php
+++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.7-0.8.8.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.8-0.8.9.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.8-0.8.9.php
new file mode 100644
index 0000000000..c4f360f4a4
--- /dev/null
+++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.8-0.8.9.php
@@ -0,0 +1,36 @@
+startSetup();
+
+$installer->run("
+ALTER TABLE `{$this->getTable('core_session')}` MODIFY `session_data` MEDIUMBLOB NOT NULL;
+");
+
+$installer->endSetup();
diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.9-0.8.10.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.9-0.8.10.php
new file mode 100644
index 0000000000..b7d2fa2736
--- /dev/null
+++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.9-0.8.10.php
@@ -0,0 +1,44 @@
+startSetup();
+
+$installer->run("
+CREATE TABLE {$this->getTable('core_flag')} (
+  `flag_id` smallint(5) unsigned NOT NULL auto_increment,
+  `flag_code` varchar(255) NOT NULL,
+  `state` smallint(5) unsigned NOT NULL default '0',
+  `flag_data` text,
+  `last_update` datetime NOT NULL,
+  PRIMARY KEY  (`flag_id`),
+  KEY (`last_update`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+");
+
+$installer->endSetup();
diff --git a/app/code/core/Mage/Cron/Exception.php b/app/code/core/Mage/Cron/Exception.php
index eb7b9f5788..8b5675d376 100644
--- a/app/code/core/Mage/Cron/Exception.php
+++ b/app/code/core/Mage/Cron/Exception.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Cron/Helper/Data.php b/app/code/core/Mage/Cron/Helper/Data.php
index c69394266f..696e28120e 100644
--- a/app/code/core/Mage/Cron/Helper/Data.php
+++ b/app/code/core/Mage/Cron/Helper/Data.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Cron
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Cron/Model/Mysql4/Schedule.php b/app/code/core/Mage/Cron/Model/Mysql4/Schedule.php
index 950a9e53fa..a1b220de83 100644
--- a/app/code/core/Mage/Cron/Model/Mysql4/Schedule.php
+++ b/app/code/core/Mage/Cron/Model/Mysql4/Schedule.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Cron
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Cron/Model/Mysql4/Schedule/Collection.php b/app/code/core/Mage/Cron/Model/Mysql4/Schedule/Collection.php
index dd0ebea4ed..30f3dac114 100644
--- a/app/code/core/Mage/Cron/Model/Mysql4/Schedule/Collection.php
+++ b/app/code/core/Mage/Cron/Model/Mysql4/Schedule/Collection.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Cron
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Cron/Model/Observer.php b/app/code/core/Mage/Cron/Model/Observer.php
index 4a505c2e49..a54e4833c2 100644
--- a/app/code/core/Mage/Cron/Model/Observer.php
+++ b/app/code/core/Mage/Cron/Model/Observer.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Cron
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Cron/Model/Schedule.php b/app/code/core/Mage/Cron/Model/Schedule.php
index 558e333ce6..8f45f0699a 100644
--- a/app/code/core/Mage/Cron/Model/Schedule.php
+++ b/app/code/core/Mage/Cron/Model/Schedule.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Cron
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Cron/etc/config.xml b/app/code/core/Mage/Cron/etc/config.xml
index 0b0b031050..8bf61f30be 100644
--- a/app/code/core/Mage/Cron/etc/config.xml
+++ b/app/code/core/Mage/Cron/etc/config.xml
@@ -13,6 +13,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Cron
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Cron/etc/system.xml b/app/code/core/Mage/Cron/etc/system.xml
index eb35547362..b78cee9bad 100644
--- a/app/code/core/Mage/Cron/etc/system.xml
+++ b/app/code/core/Mage/Cron/etc/system.xml
@@ -13,6 +13,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Core
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -32,7 +38,7 @@
                     0
                     For correct URLs generated during cron runs please make sure that Web > Secure and Unsecure Base URLs are explicitly set.
                     
-                        
+                        
                             
                             text
                             10
@@ -56,7 +62,7 @@
                             1
                             1
                         
-                        
+                        
                             
                             text
                             40
diff --git a/app/code/core/Mage/Cron/sql/cron_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/Cron/sql/cron_setup/mysql4-install-0.7.0.php
index 3544ff4ab0..67f9382084 100644
--- a/app/code/core/Mage/Cron/sql/cron_setup/mysql4-install-0.7.0.php
+++ b/app/code/core/Mage/Cron/sql/cron_setup/mysql4-install-0.7.0.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Cron
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Cron/sql/cron_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/Cron/sql/cron_setup/mysql4-upgrade-0.7.0-0.7.1.php
index 15abb9ceeb..7d7538d9ed 100644
--- a/app/code/core/Mage/Cron/sql/cron_setup/mysql4-upgrade-0.7.0-0.7.1.php
+++ b/app/code/core/Mage/Cron/sql/cron_setup/mysql4-upgrade-0.7.0-0.7.1.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Cron
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Customer/Block/Account.php b/app/code/core/Mage/Customer/Block/Account.php
index f10106f40a..9e1eb959d2 100644
--- a/app/code/core/Mage/Customer/Block/Account.php
+++ b/app/code/core/Mage/Customer/Block/Account.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Customer
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Customer/Block/Account/Dashboard.php b/app/code/core/Mage/Customer/Block/Account/Dashboard.php
index 832e06ba71..3894122663 100644
--- a/app/code/core/Mage/Customer/Block/Account/Dashboard.php
+++ b/app/code/core/Mage/Customer/Block/Account/Dashboard.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Customer
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Customer/Block/Account/Dashboard/Address.php b/app/code/core/Mage/Customer/Block/Account/Dashboard/Address.php
index 3b358af25b..a12d466307 100644
--- a/app/code/core/Mage/Customer/Block/Account/Dashboard/Address.php
+++ b/app/code/core/Mage/Customer/Block/Account/Dashboard/Address.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Customer
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Customer/Block/Account/Dashboard/Block.php b/app/code/core/Mage/Customer/Block/Account/Dashboard/Block.php
index 7814891e3d..95a070c412 100644
--- a/app/code/core/Mage/Customer/Block/Account/Dashboard/Block.php
+++ b/app/code/core/Mage/Customer/Block/Account/Dashboard/Block.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Customer
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Customer/Block/Account/Dashboard/Hello.php b/app/code/core/Mage/Customer/Block/Account/Dashboard/Hello.php
index ca72d2194a..d61ad1f1ac 100644
--- a/app/code/core/Mage/Customer/Block/Account/Dashboard/Hello.php
+++ b/app/code/core/Mage/Customer/Block/Account/Dashboard/Hello.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Customer
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Customer/Block/Account/Dashboard/Info.php b/app/code/core/Mage/Customer/Block/Account/Dashboard/Info.php
index ca0a9c896b..0be02233c9 100644
--- a/app/code/core/Mage/Customer/Block/Account/Dashboard/Info.php
+++ b/app/code/core/Mage/Customer/Block/Account/Dashboard/Info.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Customer
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Customer/Block/Account/Dashboard/Newsletter.php b/app/code/core/Mage/Customer/Block/Account/Dashboard/Newsletter.php
index 3634b2e374..3bde446e31 100644
--- a/app/code/core/Mage/Customer/Block/Account/Dashboard/Newsletter.php
+++ b/app/code/core/Mage/Customer/Block/Account/Dashboard/Newsletter.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Customer
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Customer/Block/Account/Dashboard/Sidebar.php b/app/code/core/Mage/Customer/Block/Account/Dashboard/Sidebar.php
index f0d2299179..d623d10612 100644
--- a/app/code/core/Mage/Customer/Block/Account/Dashboard/Sidebar.php
+++ b/app/code/core/Mage/Customer/Block/Account/Dashboard/Sidebar.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Customer
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Customer/Block/Account/Forgotpassword.php b/app/code/core/Mage/Customer/Block/Account/Forgotpassword.php
index edbfed26e9..e31247eae3 100644
--- a/app/code/core/Mage/Customer/Block/Account/Forgotpassword.php
+++ b/app/code/core/Mage/Customer/Block/Account/Forgotpassword.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Customer
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Customer/Block/Account/Navigation.php b/app/code/core/Mage/Customer/Block/Account/Navigation.php
index 89e614307e..c22dce9c9f 100644
--- a/app/code/core/Mage/Customer/Block/Account/Navigation.php
+++ b/app/code/core/Mage/Customer/Block/Account/Navigation.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Customer
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Customer/Block/Address/Book.php b/app/code/core/Mage/Customer/Block/Address/Book.php
index 15ebec9032..040b4adaa8 100644
--- a/app/code/core/Mage/Customer/Block/Address/Book.php
+++ b/app/code/core/Mage/Customer/Block/Address/Book.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Customer
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Customer/Block/Address/Edit.php b/app/code/core/Mage/Customer/Block/Address/Edit.php
index e742f66c7e..4996bc01d6 100644
--- a/app/code/core/Mage/Customer/Block/Address/Edit.php
+++ b/app/code/core/Mage/Customer/Block/Address/Edit.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Customer
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Customer/Block/Address/Renderer/Default.php b/app/code/core/Mage/Customer/Block/Address/Renderer/Default.php
index 16b8576139..bb465a75a9 100644
--- a/app/code/core/Mage/Customer/Block/Address/Renderer/Default.php
+++ b/app/code/core/Mage/Customer/Block/Address/Renderer/Default.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Customer
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Customer/Block/Address/Renderer/Interface.php b/app/code/core/Mage/Customer/Block/Address/Renderer/Interface.php
index c1347d3396..5564fa449a 100644
--- a/app/code/core/Mage/Customer/Block/Address/Renderer/Interface.php
+++ b/app/code/core/Mage/Customer/Block/Address/Renderer/Interface.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Customer
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Customer/Block/Form/Edit.php b/app/code/core/Mage/Customer/Block/Form/Edit.php
index 386e72d05f..4d55ac9bcb 100644
--- a/app/code/core/Mage/Customer/Block/Form/Edit.php
+++ b/app/code/core/Mage/Customer/Block/Form/Edit.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Customer
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Customer/Block/Form/Login.php b/app/code/core/Mage/Customer/Block/Form/Login.php
index e6e41704fa..a48484ffaa 100644
--- a/app/code/core/Mage/Customer/Block/Form/Login.php
+++ b/app/code/core/Mage/Customer/Block/Form/Login.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Customer
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Customer/Block/Form/Register.php b/app/code/core/Mage/Customer/Block/Form/Register.php
index 573efac0f6..0766511118 100644
--- a/app/code/core/Mage/Customer/Block/Form/Register.php
+++ b/app/code/core/Mage/Customer/Block/Form/Register.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Customer
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Customer/Block/Newsletter.php b/app/code/core/Mage/Customer/Block/Newsletter.php
index 5b9aba465e..f600dab9eb 100644
--- a/app/code/core/Mage/Customer/Block/Newsletter.php
+++ b/app/code/core/Mage/Customer/Block/Newsletter.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Customer
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Customer/Block/Widget/Abstract.php b/app/code/core/Mage/Customer/Block/Widget/Abstract.php
index 0b2ba2d6b6..cf7b104334 100644
--- a/app/code/core/Mage/Customer/Block/Widget/Abstract.php
+++ b/app/code/core/Mage/Customer/Block/Widget/Abstract.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Customer
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Customer/Block/Widget/Dob.php b/app/code/core/Mage/Customer/Block/Widget/Dob.php
index a235c51999..45e17dcdb9 100644
--- a/app/code/core/Mage/Customer/Block/Widget/Dob.php
+++ b/app/code/core/Mage/Customer/Block/Widget/Dob.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Customer
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Customer/Block/Widget/Name.php b/app/code/core/Mage/Customer/Block/Widget/Name.php
index 29eafd4598..f9f1d40c8d 100644
--- a/app/code/core/Mage/Customer/Block/Widget/Name.php
+++ b/app/code/core/Mage/Customer/Block/Widget/Name.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Customer
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Customer/Block/Widget/Taxvat.php b/app/code/core/Mage/Customer/Block/Widget/Taxvat.php
index a231e5d054..8afc0fd225 100644
--- a/app/code/core/Mage/Customer/Block/Widget/Taxvat.php
+++ b/app/code/core/Mage/Customer/Block/Widget/Taxvat.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Customer
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -40,9 +46,4 @@ public function getCustomer()
     {
         return Mage::getSingleton('customer/session')->getCustomer();
     }
-
-    public function getTaxVat()
-    {
-        return get_class($this->getCustomer());
-    }
 }
diff --git a/app/code/core/Mage/Customer/Exception.php b/app/code/core/Mage/Customer/Exception.php
index a95b93a99a..a395111206 100644
--- a/app/code/core/Mage/Customer/Exception.php
+++ b/app/code/core/Mage/Customer/Exception.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Customer
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Customer/Helper/Address.php b/app/code/core/Mage/Customer/Helper/Address.php
index 34362e1b79..65bd43d1e9 100644
--- a/app/code/core/Mage/Customer/Helper/Address.php
+++ b/app/code/core/Mage/Customer/Helper/Address.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Customer
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Customer/Helper/Data.php b/app/code/core/Mage/Customer/Helper/Data.php
index ad8c23b13f..496a7c7c9d 100644
--- a/app/code/core/Mage/Customer/Helper/Data.php
+++ b/app/code/core/Mage/Customer/Helper/Data.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Customer
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Customer/Model/Address.php b/app/code/core/Mage/Customer/Model/Address.php
index dd0ad545d5..7272b661e5 100644
--- a/app/code/core/Mage/Customer/Model/Address.php
+++ b/app/code/core/Mage/Customer/Model/Address.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Customer
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Customer/Model/Address/Abstract.php b/app/code/core/Mage/Customer/Model/Address/Abstract.php
index b2326e2453..ee7354c4b9 100644
--- a/app/code/core/Mage/Customer/Model/Address/Abstract.php
+++ b/app/code/core/Mage/Customer/Model/Address/Abstract.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Customer
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Customer/Model/Address/Api.php b/app/code/core/Mage/Customer/Model/Address/Api.php
index 1d1fa462a1..2e3c8044dc 100644
--- a/app/code/core/Mage/Customer/Model/Address/Api.php
+++ b/app/code/core/Mage/Customer/Model/Address/Api.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Customer
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Customer/Model/Address/Config.php b/app/code/core/Mage/Customer/Model/Address/Config.php
index e37b43a551..0cca30b567 100644
--- a/app/code/core/Mage/Customer/Model/Address/Config.php
+++ b/app/code/core/Mage/Customer/Model/Address/Config.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Customer
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Customer/Model/Api/Resource.php b/app/code/core/Mage/Customer/Model/Api/Resource.php
index cb594c12b6..ca8fb31738 100644
--- a/app/code/core/Mage/Customer/Model/Api/Resource.php
+++ b/app/code/core/Mage/Customer/Model/Api/Resource.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Customer
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Customer/Model/Config/Share.php b/app/code/core/Mage/Customer/Model/Config/Share.php
index 7a7b841c63..ec7ca2dc8f 100644
--- a/app/code/core/Mage/Customer/Model/Config/Share.php
+++ b/app/code/core/Mage/Customer/Model/Config/Share.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Customer
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -58,7 +64,7 @@ public function _beforeSave()
             foreach ($collection as $customer) {
                 if ($customer->getEmailCount()>1) {
                     Mage::throwException(
-                        Mage::helper('customer')->__('Can\'t share customer accounts global.')
+                        Mage::helper('customer')->__('Can\'t share customer accounts global. Because some customer accounts with same emails exist on multiple websites and cannot be merged.')
                     );
                 }
             }
diff --git a/app/code/core/Mage/Customer/Model/Convert/Adapter/Customer.php b/app/code/core/Mage/Customer/Model/Convert/Adapter/Customer.php
index cd5a6bf2eb..ddd6eda08a 100644
--- a/app/code/core/Mage/Customer/Model/Convert/Adapter/Customer.php
+++ b/app/code/core/Mage/Customer/Model/Convert/Adapter/Customer.php
@@ -13,6 +13,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Customer
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -282,7 +288,18 @@ public function load()
             'type'  => 'like',
             'bind'  => $addressType
         );
-        $attrFilterArray ['created_at']                 = 'dateFromTo';
+        $attrFilterArray ['created_at']                 = 'datetimeFromTo';
+
+        /*
+         * Fixing date filter from and to
+         */
+        if ($var = $this->getVar('filter/created_at/from')) {
+            $this->setVar('filter/created_at/from', $var . ' 00:00:00');
+        }
+
+        if ($var = $this->getVar('filter/created_at/to')) {
+            $this->setVar('filter/created_at/to', $var . ' 23:59:59');
+        }
 
         $attrToDb = array(
             'group'                     => 'group_id',
diff --git a/app/code/core/Mage/Customer/Model/Convert/Parser/Customer.php b/app/code/core/Mage/Customer/Model/Convert/Parser/Customer.php
index 08b7af8c1a..b3fa4f5d11 100644
--- a/app/code/core/Mage/Customer/Model/Convert/Parser/Customer.php
+++ b/app/code/core/Mage/Customer/Model/Convert/Parser/Customer.php
@@ -13,6 +13,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Customer
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Customer/Model/Customer.php b/app/code/core/Mage/Customer/Model/Customer.php
index fa2c593e7b..732849bd63 100644
--- a/app/code/core/Mage/Customer/Model/Customer.php
+++ b/app/code/core/Mage/Customer/Model/Customer.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Customer
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -665,6 +671,15 @@ public function validate()
             $errors[] = $helper->__('Please make sure your passwords match.');
         }
 
+        if (('req' === Mage::helper('customer/address')->getConfig('dob_show'))
+            && '' == trim($this->getDob())) {
+            $errors[] = $helper->__('Date of Birth is required.');
+        }
+        if (('req' === Mage::helper('customer/address')->getConfig('taxvat_show'))
+            && '' == trim($this->getTaxvat())) {
+            $errors[] = $helper->__('TAX/VAT number is required.');
+        }
+
         if (empty($errors)) {
             return true;
         }
diff --git a/app/code/core/Mage/Customer/Model/Customer/Api.php b/app/code/core/Mage/Customer/Model/Customer/Api.php
index 010db3ddc6..d3fed4cdf3 100644
--- a/app/code/core/Mage/Customer/Model/Customer/Api.php
+++ b/app/code/core/Mage/Customer/Model/Customer/Api.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Customer
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Billing.php b/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Billing.php
index d4cfad5359..147e6f1788 100644
--- a/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Billing.php
+++ b/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Billing.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Customer
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Password.php b/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Password.php
index 6a59840035..0d78fc9de6 100644
--- a/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Password.php
+++ b/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Password.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Customer
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Shipping.php b/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Shipping.php
index 408ae138b1..5d295efb49 100644
--- a/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Shipping.php
+++ b/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Shipping.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Customer
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Store.php b/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Store.php
index 65d44c5fbf..3269cc940e 100644
--- a/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Store.php
+++ b/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Store.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Customer
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Website.php b/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Website.php
index 9746395fef..ee51ab96d2 100644
--- a/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Website.php
+++ b/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Website.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Customer
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Customer/Model/Customer/Attribute/Source/Group.php b/app/code/core/Mage/Customer/Model/Customer/Attribute/Source/Group.php
index 4aa51f4508..3fc5de39f1 100644
--- a/app/code/core/Mage/Customer/Model/Customer/Attribute/Source/Group.php
+++ b/app/code/core/Mage/Customer/Model/Customer/Attribute/Source/Group.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Customer
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Customer/Model/Customer/Attribute/Source/Store.php b/app/code/core/Mage/Customer/Model/Customer/Attribute/Source/Store.php
index c60c5e3f75..21e10a183b 100644
--- a/app/code/core/Mage/Customer/Model/Customer/Attribute/Source/Store.php
+++ b/app/code/core/Mage/Customer/Model/Customer/Attribute/Source/Store.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Customer
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Customer/Model/Customer/Attribute/Source/Website.php b/app/code/core/Mage/Customer/Model/Customer/Attribute/Source/Website.php
index f95f4d6242..ac73e7d8f6 100644
--- a/app/code/core/Mage/Customer/Model/Customer/Attribute/Source/Website.php
+++ b/app/code/core/Mage/Customer/Model/Customer/Attribute/Source/Website.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Customer
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Customer/Model/Entity/Address.php b/app/code/core/Mage/Customer/Model/Entity/Address.php
index 8ce76278a6..63c78aea9b 100644
--- a/app/code/core/Mage/Customer/Model/Entity/Address.php
+++ b/app/code/core/Mage/Customer/Model/Entity/Address.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Customer
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Backend/Region.php b/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Backend/Region.php
index dc9a604b59..b7294bee6a 100644
--- a/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Backend/Region.php
+++ b/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Backend/Region.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Customer
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Backend/Street.php b/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Backend/Street.php
index b975f1ca55..940807e6c5 100644
--- a/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Backend/Street.php
+++ b/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Backend/Street.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Customer
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Source/Country.php b/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Source/Country.php
index 56aeab6f5f..466aea9c10 100644
--- a/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Source/Country.php
+++ b/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Source/Country.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Customer
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Source/Region.php b/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Source/Region.php
index bc2b4a98a6..bf0b613594 100644
--- a/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Source/Region.php
+++ b/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Source/Region.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Customer
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Customer/Model/Entity/Address/Collection.php b/app/code/core/Mage/Customer/Model/Entity/Address/Collection.php
index d4e4cfaa3a..9d8ee5e940 100644
--- a/app/code/core/Mage/Customer/Model/Entity/Address/Collection.php
+++ b/app/code/core/Mage/Customer/Model/Entity/Address/Collection.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Customer
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Customer/Model/Entity/Customer.php b/app/code/core/Mage/Customer/Model/Entity/Customer.php
index 1b87fee0a8..c5dbdceb00 100644
--- a/app/code/core/Mage/Customer/Model/Entity/Customer.php
+++ b/app/code/core/Mage/Customer/Model/Entity/Customer.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Customer
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -137,9 +143,11 @@ public function loadByEmail(Mage_Customer_Model_Customer $customer, $email, $tes
             ->from($this->getEntityTable(), array($this->getEntityIdField()))
             //->where('email=?', $email);
             ->where('email=:customer_email');
-        // possible bug here!
         if ($customer->getSharingConfig()->isWebsiteScope()) {
-            $select->where('website_id=?', (int) $customer->getWebsiteId());
+            if (!$customer->hasData('website_id')) {
+                Mage::throwException(Mage::helper('customer')->__('Customer website id must be specified, when using website scope.'));
+            }
+            $select->where('website_id=?', (int)$customer->getWebsiteId());
         }
 
         if ($id = $this->_getReadAdapter()->fetchOne($select, array('customer_email' => $email))) {
@@ -151,23 +159,6 @@ public function loadByEmail(Mage_Customer_Model_Customer $customer, $email, $tes
         return $this;
     }
 
-    /**
-     * Authenticate customer
-     *
-     * @param   string $email
-     * @param   string $password
-     * @return  false|object
-     */
-    public function authenticate(Mage_Customer_Model_Customer $customer, $email, $password)
-    {
-        $this->loadByEmail($customer, $email);
-        $success = $customer->getPasswordHash()===$customer->hashPassword($password);
-        if (!$success) {
-            $customer->setData(array());
-        }
-        return $success;
-    }
-
     /**
      * Change customer password
      * $data = array(
diff --git a/app/code/core/Mage/Customer/Model/Entity/Customer/Collection.php b/app/code/core/Mage/Customer/Model/Entity/Customer/Collection.php
index 2406781776..07f7900044 100644
--- a/app/code/core/Mage/Customer/Model/Entity/Customer/Collection.php
+++ b/app/code/core/Mage/Customer/Model/Entity/Customer/Collection.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Customer
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Customer/Model/Entity/Group.php b/app/code/core/Mage/Customer/Model/Entity/Group.php
index 6069bd72e7..9ed8785046 100644
--- a/app/code/core/Mage/Customer/Model/Entity/Group.php
+++ b/app/code/core/Mage/Customer/Model/Entity/Group.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Customer
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Customer/Model/Entity/Group/Collection.php b/app/code/core/Mage/Customer/Model/Entity/Group/Collection.php
index 651a49c3f3..64a61b536b 100644
--- a/app/code/core/Mage/Customer/Model/Entity/Group/Collection.php
+++ b/app/code/core/Mage/Customer/Model/Entity/Group/Collection.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Customer
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Customer/Model/Entity/Setup.php b/app/code/core/Mage/Customer/Model/Entity/Setup.php
index 76f4f6ac5f..cef4830b6a 100644
--- a/app/code/core/Mage/Customer/Model/Entity/Setup.php
+++ b/app/code/core/Mage/Customer/Model/Entity/Setup.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Customer
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Customer/Model/Entity/Wishlist/Collection.php b/app/code/core/Mage/Customer/Model/Entity/Wishlist/Collection.php
index e100763471..5b8e539991 100644
--- a/app/code/core/Mage/Customer/Model/Entity/Wishlist/Collection.php
+++ b/app/code/core/Mage/Customer/Model/Entity/Wishlist/Collection.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Customer
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Customer/Model/Group.php b/app/code/core/Mage/Customer/Model/Group.php
index b311c36b7b..ffbc03e3cd 100644
--- a/app/code/core/Mage/Customer/Model/Group.php
+++ b/app/code/core/Mage/Customer/Model/Group.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Customer
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Customer/Model/Group/Api.php b/app/code/core/Mage/Customer/Model/Group/Api.php
index 09d8916f76..daec990158 100644
--- a/app/code/core/Mage/Customer/Model/Group/Api.php
+++ b/app/code/core/Mage/Customer/Model/Group/Api.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Customer
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Customer/Model/Observer.php b/app/code/core/Mage/Customer/Model/Observer.php
index 3d91ea3a8d..e678a775e0 100644
--- a/app/code/core/Mage/Customer/Model/Observer.php
+++ b/app/code/core/Mage/Customer/Model/Observer.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Customer
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Customer/Model/Session.php b/app/code/core/Mage/Customer/Model/Session.php
index e3271d298a..5bee4e536a 100644
--- a/app/code/core/Mage/Customer/Model/Session.php
+++ b/app/code/core/Mage/Customer/Model/Session.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Customer
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Customer/controllers/AccountController.php b/app/code/core/Mage/Customer/controllers/AccountController.php
index d76e0f276a..414481602b 100644
--- a/app/code/core/Mage/Customer/controllers/AccountController.php
+++ b/app/code/core/Mage/Customer/controllers/AccountController.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Customer
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -474,6 +480,8 @@ public function editAction()
             $customer->setChangePassword(1);
         }
 
+        $this->getLayout()->getBlock('head')->setTitle($this->__('Account Information'));
+
         $this->renderLayout();
     }
 
diff --git a/app/code/core/Mage/Customer/controllers/AddressController.php b/app/code/core/Mage/Customer/controllers/AddressController.php
index 97b9d19bb0..743a76c00f 100644
--- a/app/code/core/Mage/Customer/controllers/AddressController.php
+++ b/app/code/core/Mage/Customer/controllers/AddressController.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Customer
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Customer/controllers/ReviewController.php b/app/code/core/Mage/Customer/controllers/ReviewController.php
index c7323c7c08..41c1c8cf34 100644
--- a/app/code/core/Mage/Customer/controllers/ReviewController.php
+++ b/app/code/core/Mage/Customer/controllers/ReviewController.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Customer
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Customer/etc/api.xml b/app/code/core/Mage/Customer/etc/api.xml
index 1e78fa640b..8a71021ee5 100644
--- a/app/code/core/Mage/Customer/etc/api.xml
+++ b/app/code/core/Mage/Customer/etc/api.xml
@@ -13,6 +13,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category    Mage
  * @package     Mage_Customer
  * @copyright   Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Customer/etc/config.xml b/app/code/core/Mage/Customer/etc/config.xml
index ef83c6d8e2..800e630af5 100644
--- a/app/code/core/Mage/Customer/etc/config.xml
+++ b/app/code/core/Mage/Customer/etc/config.xml
@@ -13,6 +13,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Customer
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -320,7 +326,7 @@ T: {{var telephone}}
         
       
           
-              
+              
                   customer.xml
               
           
diff --git a/app/code/core/Mage/Customer/etc/system.xml b/app/code/core/Mage/Customer/etc/system.xml
index 660d35145b..8a71f30548 100644
--- a/app/code/core/Mage/Customer/etc/system.xml
+++ b/app/code/core/Mage/Customer/etc/system.xml
@@ -13,6 +13,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Customer
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -64,7 +70,7 @@
                     0
                     0
                     
-                        
+                        
                             
                             text
                             1
@@ -124,7 +130,7 @@
                             5
                             1
                             1
-                            1
+                            0
                         
                         
                             
@@ -135,7 +141,7 @@
                             1
                             1
                         
-                        
+                        
                             
                             This Email will be sent instead of Default Welcome Email, after Account Confirmation.
                             select
@@ -175,14 +181,14 @@
                         
                     
                 
-                
    
+                
    
                     
                     40
                     1
                     1
                     1
                     
-                        
+                        
                             
                             10
                             1
@@ -190,7 +196,7 @@
                             0
                             Leave empty for default (2). Valid range: 1-4
                         
-                        
+                        
                             
                             select
                             adminhtml/system_config_source_nooptreq
@@ -200,7 +206,7 @@
                             1
                             0
                         
-                        
+                        
                             
                             30
                             Put semicolon in the beginning for empty first option.
    Leave empty for open text field.]]>    
@@ -208,7 +214,7 @@
                             1
                             0
                             
-                        
+                        
                             
                             select
                             adminhtml/system_config_source_yesno
@@ -218,7 +224,7 @@
                             1
                             0
                         
-                        
+                        
                             
                             select
                             adminhtml/system_config_source_nooptreq
@@ -228,7 +234,7 @@
                             1
                             0
                         
-                        
+                        
                             
                             60
                             Put semicolon in the beginning for empty first option.
    Leave empty for open text field.]]>    
@@ -236,7 +242,7 @@
                             1
                             0
                             
-                        
+                        
                             
                             select
                             adminhtml/system_config_source_nooptreq
@@ -245,7 +251,7 @@
                             1
                             0
                         
-                        
+                        
                             
                             select
                             adminhtml/system_config_source_nooptreq
diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-install-0.7.0.php
index 9e1d4ae901..190ad8d72a 100644
--- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-install-0.7.0.php
+++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-install-0.7.0.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Customer
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-install-0.8.0.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-install-0.8.0.php
index 5347df8e4a..6892ec64d0 100644
--- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-install-0.8.0.php
+++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-install-0.8.0.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Customer
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.6.1-0.7.0.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.6.1-0.7.0.php
index 6a1c00ed03..5432bb1db0 100644
--- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.6.1-0.7.0.php
+++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.6.1-0.7.0.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Customer
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.7.0-0.7.1.php
index b4c7d3ff7f..7a91496064 100644
--- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.7.0-0.7.1.php
+++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.7.0-0.7.1.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Customer
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.7.1-0.7.2.php
index 4f519891c4..5cbce1c5d1 100644
--- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.7.1-0.7.2.php
+++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.7.1-0.7.2.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Customer
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.7.2-0.7.3.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.7.2-0.7.3.php
index e6d682c590..044bf865a9 100644
--- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.7.2-0.7.3.php
+++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.7.2-0.7.3.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Customer
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.0-0.8.1.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.0-0.8.1.php
index e1692857d7..8ec4abcbe9 100644
--- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.0-0.8.1.php
+++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.0-0.8.1.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Customer
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.2-0.8.3.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.2-0.8.3.php
index b4c7d3ff7f..7a91496064 100644
--- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.2-0.8.3.php
+++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.2-0.8.3.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Customer
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.4-0.8.5.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.4-0.8.5.php
index a94c1fa84c..5c4d0106d7 100644
--- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.4-0.8.5.php
+++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.4-0.8.5.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Customer
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.5-0.8.6.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.5-0.8.6.php
index 57ea416e9b..08670e57d3 100644
--- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.5-0.8.6.php
+++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.5-0.8.6.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Customer
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.6-0.8.7.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.6-0.8.7.php
index 8936ccb0e3..014af28901 100644
--- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.6-0.8.7.php
+++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.6-0.8.7.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Customer
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.7-0.8.8.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.7-0.8.8.php
index 3861c82965..88275e9d9e 100644
--- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.7-0.8.8.php
+++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.7-0.8.8.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Customer
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Dataflow/Helper/Data.php b/app/code/core/Mage/Dataflow/Helper/Data.php
index fdd62dd5ec..b6df390565 100644
--- a/app/code/core/Mage/Dataflow/Helper/Data.php
+++ b/app/code/core/Mage/Dataflow/Helper/Data.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Dataflow
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Dataflow/Model/Batch.php b/app/code/core/Mage/Dataflow/Model/Batch.php
index ebe040f898..1ec0f42e2d 100644
--- a/app/code/core/Mage/Dataflow/Model/Batch.php
+++ b/app/code/core/Mage/Dataflow/Model/Batch.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Dataflow
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Dataflow/Model/Batch/Abstract.php b/app/code/core/Mage/Dataflow/Model/Batch/Abstract.php
index 1dc1075a8a..2ebd914b0e 100644
--- a/app/code/core/Mage/Dataflow/Model/Batch/Abstract.php
+++ b/app/code/core/Mage/Dataflow/Model/Batch/Abstract.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Dataflow
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -37,6 +43,16 @@ abstract class Mage_Dataflow_Model_Batch_Abstract extends Mage_Core_Model_Abstra
      */
     public function setBatchData($data)
     {
+        /**
+        * need prepare valid utf-8 data
+        * related with php bug #42588
+        */
+        foreach ($data as $key=>$value) {
+            $str = @iconv("utf-8", "utf-8//IGNORE", $value);
+            if ($str) {
+                $data[$key] = $str;
+            }    
+        }
         $this->setData('batch_data', serialize($data));
         return $this;
     }
diff --git a/app/code/core/Mage/Dataflow/Model/Batch/Export.php b/app/code/core/Mage/Dataflow/Model/Batch/Export.php
index 44c5746769..afbebc1111 100644
--- a/app/code/core/Mage/Dataflow/Model/Batch/Export.php
+++ b/app/code/core/Mage/Dataflow/Model/Batch/Export.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Dataflow
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Dataflow/Model/Batch/Import.php b/app/code/core/Mage/Dataflow/Model/Batch/Import.php
index db62554cf6..838bb2d1c8 100644
--- a/app/code/core/Mage/Dataflow/Model/Batch/Import.php
+++ b/app/code/core/Mage/Dataflow/Model/Batch/Import.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Dataflow
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Dataflow/Model/Batch/Io.php b/app/code/core/Mage/Dataflow/Model/Batch/Io.php
index 8006587f35..5d1da80bdc 100644
--- a/app/code/core/Mage/Dataflow/Model/Batch/Io.php
+++ b/app/code/core/Mage/Dataflow/Model/Batch/Io.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Dataflow
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Dataflow/Model/Convert.php b/app/code/core/Mage/Dataflow/Model/Convert.php
index b295174927..3c79bb5ce8 100644
--- a/app/code/core/Mage/Dataflow/Model/Convert.php
+++ b/app/code/core/Mage/Dataflow/Model/Convert.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Dataflow
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Action.php b/app/code/core/Mage/Dataflow/Model/Convert/Action.php
index e389f0a71f..2495ab30bb 100644
--- a/app/code/core/Mage/Dataflow/Model/Convert/Action.php
+++ b/app/code/core/Mage/Dataflow/Model/Convert/Action.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Dataflow
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Action/Abstract.php b/app/code/core/Mage/Dataflow/Model/Convert/Action/Abstract.php
index f2fcbbd428..de2681154b 100644
--- a/app/code/core/Mage/Dataflow/Model/Convert/Action/Abstract.php
+++ b/app/code/core/Mage/Dataflow/Model/Convert/Action/Abstract.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Dataflow
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Action/Interface.php b/app/code/core/Mage/Dataflow/Model/Convert/Action/Interface.php
index c0109bfabd..04c0458252 100644
--- a/app/code/core/Mage/Dataflow/Model/Convert/Action/Interface.php
+++ b/app/code/core/Mage/Dataflow/Model/Convert/Action/Interface.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Dataflow
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Abstract.php b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Abstract.php
index 48168a93c2..63a3c489f8 100644
--- a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Abstract.php
+++ b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Abstract.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Dataflow
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Db/Table.php b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Db/Table.php
index 23f9fc6cab..035ba7c057 100644
--- a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Db/Table.php
+++ b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Db/Table.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Dataflow
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Http.php b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Http.php
index 145f6895a8..f77d02ea34 100644
--- a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Http.php
+++ b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Http.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Dataflow
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Http/Curl.php b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Http/Curl.php
index b34e548d60..bf392890ab 100644
--- a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Http/Curl.php
+++ b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Http/Curl.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Dataflow
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Interface.php b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Interface.php
index 2555853d73..1012da7a6b 100644
--- a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Interface.php
+++ b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Interface.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Dataflow
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Io.php b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Io.php
index c3d9732503..d1c68297a9 100644
--- a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Io.php
+++ b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Io.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Dataflow
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Soap.php b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Soap.php
index b990f4f9d4..e8ac45f843 100644
--- a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Soap.php
+++ b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Soap.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Dataflow
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Std.php b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Std.php
index 37dcd15253..46c20b096a 100644
--- a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Std.php
+++ b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Std.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Dataflow
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Zend/Cache.php b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Zend/Cache.php
index 0a21119beb..679d5a8e56 100644
--- a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Zend/Cache.php
+++ b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Zend/Cache.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Dataflow
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Zend/Db.php b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Zend/Db.php
index 7f3825aeef..983feaea85 100644
--- a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Zend/Db.php
+++ b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Zend/Db.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Dataflow
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Container/Abstract.php b/app/code/core/Mage/Dataflow/Model/Convert/Container/Abstract.php
index f393a4a536..ac7535f813 100644
--- a/app/code/core/Mage/Dataflow/Model/Convert/Container/Abstract.php
+++ b/app/code/core/Mage/Dataflow/Model/Convert/Container/Abstract.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Dataflow
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Container/Collection.php b/app/code/core/Mage/Dataflow/Model/Convert/Container/Collection.php
index d82f0a87ca..5cb5e39c03 100644
--- a/app/code/core/Mage/Dataflow/Model/Convert/Container/Collection.php
+++ b/app/code/core/Mage/Dataflow/Model/Convert/Container/Collection.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Dataflow
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Container/Generic.php b/app/code/core/Mage/Dataflow/Model/Convert/Container/Generic.php
index 1fc427cb97..24dd6607d4 100644
--- a/app/code/core/Mage/Dataflow/Model/Convert/Container/Generic.php
+++ b/app/code/core/Mage/Dataflow/Model/Convert/Container/Generic.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Dataflow
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Container/Interface.php b/app/code/core/Mage/Dataflow/Model/Convert/Container/Interface.php
index bef9de3e0e..c546218019 100644
--- a/app/code/core/Mage/Dataflow/Model/Convert/Container/Interface.php
+++ b/app/code/core/Mage/Dataflow/Model/Convert/Container/Interface.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Dataflow
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Exception.php b/app/code/core/Mage/Dataflow/Model/Convert/Exception.php
index 4ae0c097c4..0fae53f821 100644
--- a/app/code/core/Mage/Dataflow/Model/Convert/Exception.php
+++ b/app/code/core/Mage/Dataflow/Model/Convert/Exception.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Dataflow
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Iterator/Http.php b/app/code/core/Mage/Dataflow/Model/Convert/Iterator/Http.php
index 734058d03a..bcd26abbab 100644
--- a/app/code/core/Mage/Dataflow/Model/Convert/Iterator/Http.php
+++ b/app/code/core/Mage/Dataflow/Model/Convert/Iterator/Http.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Dataflow
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Iterator/Interface.php b/app/code/core/Mage/Dataflow/Model/Convert/Iterator/Interface.php
index 625cc0f957..ab927231ab 100644
--- a/app/code/core/Mage/Dataflow/Model/Convert/Iterator/Interface.php
+++ b/app/code/core/Mage/Dataflow/Model/Convert/Iterator/Interface.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Dataflow
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Mapper/Abstract.php b/app/code/core/Mage/Dataflow/Model/Convert/Mapper/Abstract.php
index 3048abb493..1cf95cd24a 100644
--- a/app/code/core/Mage/Dataflow/Model/Convert/Mapper/Abstract.php
+++ b/app/code/core/Mage/Dataflow/Model/Convert/Mapper/Abstract.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Dataflow
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Mapper/Column.php b/app/code/core/Mage/Dataflow/Model/Convert/Mapper/Column.php
index 655a2cb02b..d351879f25 100644
--- a/app/code/core/Mage/Dataflow/Model/Convert/Mapper/Column.php
+++ b/app/code/core/Mage/Dataflow/Model/Convert/Mapper/Column.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Dataflow
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Mapper/Interface.php b/app/code/core/Mage/Dataflow/Model/Convert/Mapper/Interface.php
index a04f4adf75..f375726b3f 100644
--- a/app/code/core/Mage/Dataflow/Model/Convert/Mapper/Interface.php
+++ b/app/code/core/Mage/Dataflow/Model/Convert/Mapper/Interface.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Dataflow
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Parser/Abstract.php b/app/code/core/Mage/Dataflow/Model/Convert/Parser/Abstract.php
index 1bc51d2d7c..497cd11141 100644
--- a/app/code/core/Mage/Dataflow/Model/Convert/Parser/Abstract.php
+++ b/app/code/core/Mage/Dataflow/Model/Convert/Parser/Abstract.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Dataflow
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Parser/Csv.php b/app/code/core/Mage/Dataflow/Model/Convert/Parser/Csv.php
index bb52aed8da..69af8c5e53 100644
--- a/app/code/core/Mage/Dataflow/Model/Convert/Parser/Csv.php
+++ b/app/code/core/Mage/Dataflow/Model/Convert/Parser/Csv.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Dataflow
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Parser/Interface.php b/app/code/core/Mage/Dataflow/Model/Convert/Parser/Interface.php
index 8799e6b508..7779fa3f3e 100644
--- a/app/code/core/Mage/Dataflow/Model/Convert/Parser/Interface.php
+++ b/app/code/core/Mage/Dataflow/Model/Convert/Parser/Interface.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Dataflow
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Parser/Serialize.php b/app/code/core/Mage/Dataflow/Model/Convert/Parser/Serialize.php
index 8b201ec197..a810d2a85c 100644
--- a/app/code/core/Mage/Dataflow/Model/Convert/Parser/Serialize.php
+++ b/app/code/core/Mage/Dataflow/Model/Convert/Parser/Serialize.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Dataflow
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Parser/Xml/Excel.php b/app/code/core/Mage/Dataflow/Model/Convert/Parser/Xml/Excel.php
index 952eb22dc5..86968ed80b 100644
--- a/app/code/core/Mage/Dataflow/Model/Convert/Parser/Xml/Excel.php
+++ b/app/code/core/Mage/Dataflow/Model/Convert/Parser/Xml/Excel.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Dataflow
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Profile.php b/app/code/core/Mage/Dataflow/Model/Convert/Profile.php
index a9bdccc14b..874e337923 100644
--- a/app/code/core/Mage/Dataflow/Model/Convert/Profile.php
+++ b/app/code/core/Mage/Dataflow/Model/Convert/Profile.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Dataflow
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Profile/Abstract.php b/app/code/core/Mage/Dataflow/Model/Convert/Profile/Abstract.php
index ee907f7305..0d3dd588b6 100644
--- a/app/code/core/Mage/Dataflow/Model/Convert/Profile/Abstract.php
+++ b/app/code/core/Mage/Dataflow/Model/Convert/Profile/Abstract.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Dataflow
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Profile/Collection.php b/app/code/core/Mage/Dataflow/Model/Convert/Profile/Collection.php
index a298cad1bd..0ea13f2152 100644
--- a/app/code/core/Mage/Dataflow/Model/Convert/Profile/Collection.php
+++ b/app/code/core/Mage/Dataflow/Model/Convert/Profile/Collection.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Dataflow
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Profile/Interface.php b/app/code/core/Mage/Dataflow/Model/Convert/Profile/Interface.php
index 308058ca83..5167b89153 100644
--- a/app/code/core/Mage/Dataflow/Model/Convert/Profile/Interface.php
+++ b/app/code/core/Mage/Dataflow/Model/Convert/Profile/Interface.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Dataflow
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Validator/Abstract.php b/app/code/core/Mage/Dataflow/Model/Convert/Validator/Abstract.php
index 9166675f02..8b16d8e75d 100644
--- a/app/code/core/Mage/Dataflow/Model/Convert/Validator/Abstract.php
+++ b/app/code/core/Mage/Dataflow/Model/Convert/Validator/Abstract.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Dataflow
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Validator/Column.php b/app/code/core/Mage/Dataflow/Model/Convert/Validator/Column.php
index a22895e36b..068c8ce0e1 100644
--- a/app/code/core/Mage/Dataflow/Model/Convert/Validator/Column.php
+++ b/app/code/core/Mage/Dataflow/Model/Convert/Validator/Column.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Dataflow
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Validator/Dryrun.php b/app/code/core/Mage/Dataflow/Model/Convert/Validator/Dryrun.php
index 9fff135ca8..04d090f188 100644
--- a/app/code/core/Mage/Dataflow/Model/Convert/Validator/Dryrun.php
+++ b/app/code/core/Mage/Dataflow/Model/Convert/Validator/Dryrun.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Dataflow
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Validator/Interface.php b/app/code/core/Mage/Dataflow/Model/Convert/Validator/Interface.php
index 3d9a66f4aa..0878b0fa47 100644
--- a/app/code/core/Mage/Dataflow/Model/Convert/Validator/Interface.php
+++ b/app/code/core/Mage/Dataflow/Model/Convert/Validator/Interface.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Dataflow
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Dataflow/Model/Import.php b/app/code/core/Mage/Dataflow/Model/Import.php
index 77ea9402d6..2e968880c4 100644
--- a/app/code/core/Mage/Dataflow/Model/Import.php
+++ b/app/code/core/Mage/Dataflow/Model/Import.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Dataflow
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Dataflow/Model/Mysql4/Batch.php b/app/code/core/Mage/Dataflow/Model/Mysql4/Batch.php
index beccca47a8..b06e1b1c3b 100644
--- a/app/code/core/Mage/Dataflow/Model/Mysql4/Batch.php
+++ b/app/code/core/Mage/Dataflow/Model/Mysql4/Batch.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Dataflow
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Abstract.php b/app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Abstract.php
index 60776476a2..ccd778e8a8 100644
--- a/app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Abstract.php
+++ b/app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Abstract.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Dataflow
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Collection.php b/app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Collection.php
index e796fb984c..260aa77eaf 100755
--- a/app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Collection.php
+++ b/app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Collection.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Dataflow
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Export.php b/app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Export.php
index aa9cd3430f..09f83a349f 100644
--- a/app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Export.php
+++ b/app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Export.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Dataflow
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Import.php b/app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Import.php
index 74f4ab797d..329b76672a 100644
--- a/app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Import.php
+++ b/app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Import.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Dataflow
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Dataflow/Model/Mysql4/Catalogold.php b/app/code/core/Mage/Dataflow/Model/Mysql4/Catalogold.php
index a689796a0c..781c0a1118 100644
--- a/app/code/core/Mage/Dataflow/Model/Mysql4/Catalogold.php
+++ b/app/code/core/Mage/Dataflow/Model/Mysql4/Catalogold.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Dataflow/Model/Mysql4/Import.php b/app/code/core/Mage/Dataflow/Model/Mysql4/Import.php
index 463cb43bb4..54ae451522 100644
--- a/app/code/core/Mage/Dataflow/Model/Mysql4/Import.php
+++ b/app/code/core/Mage/Dataflow/Model/Mysql4/Import.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Dataflow
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Dataflow/Model/Mysql4/Import/Collection.php b/app/code/core/Mage/Dataflow/Model/Mysql4/Import/Collection.php
index 9fb4b1dbb2..89f7b5b359 100644
--- a/app/code/core/Mage/Dataflow/Model/Mysql4/Import/Collection.php
+++ b/app/code/core/Mage/Dataflow/Model/Mysql4/Import/Collection.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Dataflow
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Dataflow/Model/Mysql4/Profile.php b/app/code/core/Mage/Dataflow/Model/Mysql4/Profile.php
index 556215ed46..d55d17aade 100644
--- a/app/code/core/Mage/Dataflow/Model/Mysql4/Profile.php
+++ b/app/code/core/Mage/Dataflow/Model/Mysql4/Profile.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Dataflow
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Dataflow/Model/Mysql4/Profile/Collection.php b/app/code/core/Mage/Dataflow/Model/Mysql4/Profile/Collection.php
index e0c4b94622..8fb9f1cb7e 100644
--- a/app/code/core/Mage/Dataflow/Model/Mysql4/Profile/Collection.php
+++ b/app/code/core/Mage/Dataflow/Model/Mysql4/Profile/Collection.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Dataflow
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Dataflow/Model/Mysql4/Profile/History.php b/app/code/core/Mage/Dataflow/Model/Mysql4/Profile/History.php
index c6d2119c36..76e57b4b5e 100644
--- a/app/code/core/Mage/Dataflow/Model/Mysql4/Profile/History.php
+++ b/app/code/core/Mage/Dataflow/Model/Mysql4/Profile/History.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Dataflow
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Dataflow/Model/Mysql4/Profile/History/Collection.php b/app/code/core/Mage/Dataflow/Model/Mysql4/Profile/History/Collection.php
index 3e79985f35..641373d955 100644
--- a/app/code/core/Mage/Dataflow/Model/Mysql4/Profile/History/Collection.php
+++ b/app/code/core/Mage/Dataflow/Model/Mysql4/Profile/History/Collection.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Dataflow
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Dataflow/Model/Mysql4/Session.php b/app/code/core/Mage/Dataflow/Model/Mysql4/Session.php
index 19de564482..607e6aaead 100644
--- a/app/code/core/Mage/Dataflow/Model/Mysql4/Session.php
+++ b/app/code/core/Mage/Dataflow/Model/Mysql4/Session.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Dataflow
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Dataflow/Model/Profile.php b/app/code/core/Mage/Dataflow/Model/Profile.php
index 2f9eb72e2a..7d4f8a4d11 100644
--- a/app/code/core/Mage/Dataflow/Model/Profile.php
+++ b/app/code/core/Mage/Dataflow/Model/Profile.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Dataflow
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -25,8 +31,8 @@
  */
 class Mage_Dataflow_Model_Profile extends Mage_Core_Model_Abstract
 {
-	const DEFAULT_EXPORT_PATH = 'var/export';
-	const DEFAULT_EXPORT_FILENAME = 'export_';
+    const DEFAULT_EXPORT_PATH = 'var/export';
+    const DEFAULT_EXPORT_FILENAME = 'export_';
 
     protected function _construct()
     {
@@ -55,19 +61,19 @@ protected function _beforeSave()
         }
 
         if (is_array($this->getGuiData())) {
-        	$data = $this->getData();
-        	$guiData = $this->getGuiData();
-        	if (isset($guiData['file']['type']) && $guiData['file']['type'] == 'file') {
-        		if (strlen($guiData['file']['path']) == 0
-        		|| (strlen($guiData['file']['path']) == 1
-        		&& in_array($guiData['file']['path'], array('\\','/','.','!','@','#','$','%','&', '*','~', '^')))) {
-        			$guiData['file']['path'] = self::DEFAULT_EXPORT_PATH;
-        		}
-        		if (strlen($guiData['file']['filename']) == 0 ) {
-        			$guiData['file']['filename'] = self::DEFAULT_EXPORT_FILENAME.$data['entity_type'].'.'.($guiData['parse']['type']=='csv'?$guiData['parse']['type']:'xml');
-        		}
-        		$this->setGuiData($guiData);
-        	}
+            $data = $this->getData();
+            $guiData = $this->getGuiData();
+            if (isset($guiData['file']['type']) && $guiData['file']['type'] == 'file') {
+                if (strlen($guiData['file']['path']) == 0
+                || (strlen($guiData['file']['path']) == 1
+                && in_array($guiData['file']['path'], array('\\','/','.','!','@','#','$','%','&', '*','~', '^')))) {
+                    $guiData['file']['path'] = self::DEFAULT_EXPORT_PATH;
+                }
+                if (strlen($guiData['file']['filename']) == 0 ) {
+                    $guiData['file']['filename'] = self::DEFAULT_EXPORT_FILENAME.$data['entity_type'].'.'.($guiData['parse']['type']=='csv'?$guiData['parse']['type']:'xml');
+                }
+                $this->setGuiData($guiData);
+            }
 //        	echo '
    ';
 //        	print_r($this->getGuiData());
             $this->_parseGuiData();
@@ -261,13 +267,13 @@ public function _parseGuiData()
         );
 
         if ($import) {
-        	if ($this->getDataTransfer()==='interactive') {
-	            $parseFileXmlInter .= '    getStoreId().']]>'.$nl;
-        	} else {
-	            $parseDataXml = ''.$nl;
-	            $parseDataXml .= '    getStoreId().']]>'.$nl;
-	            $parseDataXml .= ''.$nl.$nl;
-        	}
+//            if ($this->getDataTransfer()==='interactive') {
+                $parseFileXmlInter .= '    getStoreId().']]>'.$nl;
+//            } else {
+//                $parseDataXml = ''.$nl;
+//                $parseDataXml = '    getStoreId().']]>'.$nl;
+//                $parseDataXml .= ''.$nl.$nl;
+//            }
 //            $parseDataXml = ''.$nl;
 //            $parseDataXml .= '    getStoreId().']]>'.$nl;
 //            $parseDataXml .= ''.$nl.$nl;
@@ -319,19 +325,19 @@ public function _parseGuiData()
                 . $numberOfRecords . '' . $nl;
             $parseFileXmlInter .= '    ' . $nl;
-        	if ($this->getDataTransfer()==='interactive') {
-        		$xml = $parseFileXmlInter;
+            if ($this->getDataTransfer()==='interactive') {
+                $xml = $parseFileXmlInter;
                 $xml .= '    '.$adapters[$this->getEntityType()].''.$nl;
                 $xml .= '    parse'.$nl;
                 $xml .= '';
-        	} else {
-        		$xml = $fileXml;
-        		$xml .= $parseFileXmlInter;
+            } else {
+                $xml = $fileXml;
+                $xml .= $parseFileXmlInter;
                 $xml .= '    '.$adapters[$this->getEntityType()].''.$nl;
                 $xml .= '    parse'.$nl;
                 $xml .= '';
-        	}
-        	//$xml = $interactiveXml.$fileXml.$parseFileXml.$mapXml.$parseDataXml.$entityXml;
+            }
+            //$xml = $interactiveXml.$fileXml.$parseFileXml.$mapXml.$parseDataXml.$entityXml;
 
         } else {
             $xml = $entityXml.$parseDataXml.$mapXml.$parseFileXml.$fileXml.$interactiveXml;
diff --git a/app/code/core/Mage/Dataflow/Model/Profile/History.php b/app/code/core/Mage/Dataflow/Model/Profile/History.php
index c7bc356b40..87f3d4e60d 100644
--- a/app/code/core/Mage/Dataflow/Model/Profile/History.php
+++ b/app/code/core/Mage/Dataflow/Model/Profile/History.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Dataflow
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Dataflow/Model/Session.php b/app/code/core/Mage/Dataflow/Model/Session.php
index bfcf3d6109..cfa0ef482b 100644
--- a/app/code/core/Mage/Dataflow/Model/Session.php
+++ b/app/code/core/Mage/Dataflow/Model/Session.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Dataflow
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Dataflow/Model/Session/Adapter/Http.php b/app/code/core/Mage/Dataflow/Model/Session/Adapter/Http.php
index 466622c0e8..2f33cd6f99 100644
--- a/app/code/core/Mage/Dataflow/Model/Session/Adapter/Http.php
+++ b/app/code/core/Mage/Dataflow/Model/Session/Adapter/Http.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Varien
  * @package    Mage_Dataflow_Model_Convert
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Dataflow/Model/Session/Parser/Csv.php b/app/code/core/Mage/Dataflow/Model/Session/Parser/Csv.php
index c75488428b..a6f2e81eaf 100644
--- a/app/code/core/Mage/Dataflow/Model/Session/Parser/Csv.php
+++ b/app/code/core/Mage/Dataflow/Model/Session/Parser/Csv.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Varien
  * @package    Varien_Convert
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Dataflow/etc/config.xml b/app/code/core/Mage/Dataflow/etc/config.xml
index 86a075b2af..7b6990e50f 100644
--- a/app/code/core/Mage/Dataflow/etc/config.xml
+++ b/app/code/core/Mage/Dataflow/etc/config.xml
@@ -13,6 +13,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Dataflow
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Dataflow/sql/dataflow_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/Dataflow/sql/dataflow_setup/mysql4-install-0.7.0.php
index 64d3d0d503..2f6116eeca 100644
--- a/app/code/core/Mage/Dataflow/sql/dataflow_setup/mysql4-install-0.7.0.php
+++ b/app/code/core/Mage/Dataflow/sql/dataflow_setup/mysql4-install-0.7.0.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Dataflow
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Dataflow/sql/dataflow_setup/mysql4-upgrade-0.7.2-0.7.3.php b/app/code/core/Mage/Dataflow/sql/dataflow_setup/mysql4-upgrade-0.7.2-0.7.3.php
index db21564096..cebb37e875 100644
--- a/app/code/core/Mage/Dataflow/sql/dataflow_setup/mysql4-upgrade-0.7.2-0.7.3.php
+++ b/app/code/core/Mage/Dataflow/sql/dataflow_setup/mysql4-upgrade-0.7.2-0.7.3.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Dataflow
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Dataflow/sql/dataflow_setup/mysql4-upgrade-0.7.3-0.7.4.php b/app/code/core/Mage/Dataflow/sql/dataflow_setup/mysql4-upgrade-0.7.3-0.7.4.php
index fd80486d85..e7af1c78f7 100644
--- a/app/code/core/Mage/Dataflow/sql/dataflow_setup/mysql4-upgrade-0.7.3-0.7.4.php
+++ b/app/code/core/Mage/Dataflow/sql/dataflow_setup/mysql4-upgrade-0.7.3-0.7.4.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Dataflow
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Directory/Block/Adminhtml/Frontend/Currency/Base.php b/app/code/core/Mage/Directory/Block/Adminhtml/Frontend/Currency/Base.php
index cc6ae54ed3..77ea4daf24 100644
--- a/app/code/core/Mage/Directory/Block/Adminhtml/Frontend/Currency/Base.php
+++ b/app/code/core/Mage/Directory/Block/Adminhtml/Frontend/Currency/Base.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Directory
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Directory/Block/Adminhtml/Frontend/Region/Updater.php b/app/code/core/Mage/Directory/Block/Adminhtml/Frontend/Region/Updater.php
index 81a9d347dd..ba70726bf2 100644
--- a/app/code/core/Mage/Directory/Block/Adminhtml/Frontend/Region/Updater.php
+++ b/app/code/core/Mage/Directory/Block/Adminhtml/Frontend/Region/Updater.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Directory/Block/Currency.php b/app/code/core/Mage/Directory/Block/Currency.php
index 6948eb8c69..eea3faa04e 100644
--- a/app/code/core/Mage/Directory/Block/Currency.php
+++ b/app/code/core/Mage/Directory/Block/Currency.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Directory
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Directory/Block/Data.php b/app/code/core/Mage/Directory/Block/Data.php
index 0776d2d9d7..25daddb237 100644
--- a/app/code/core/Mage/Directory/Block/Data.php
+++ b/app/code/core/Mage/Directory/Block/Data.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Directory
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Directory/Exception.php b/app/code/core/Mage/Directory/Exception.php
index 47454f71a1..285bdf0394 100644
--- a/app/code/core/Mage/Directory/Exception.php
+++ b/app/code/core/Mage/Directory/Exception.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Directory
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Directory/Helper/Data.php b/app/code/core/Mage/Directory/Helper/Data.php
index 723cf15681..93948dfc28 100644
--- a/app/code/core/Mage/Directory/Helper/Data.php
+++ b/app/code/core/Mage/Directory/Helper/Data.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Directory
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Directory/Helper/Url.php b/app/code/core/Mage/Directory/Helper/Url.php
index e12f7d6910..dd1460acf7 100644
--- a/app/code/core/Mage/Directory/Helper/Url.php
+++ b/app/code/core/Mage/Directory/Helper/Url.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Directory
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Directory/Model/Country.php b/app/code/core/Mage/Directory/Model/Country.php
index bb574b0a65..92a3d9031e 100644
--- a/app/code/core/Mage/Directory/Model/Country.php
+++ b/app/code/core/Mage/Directory/Model/Country.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Directory
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Directory/Model/Country/Api.php b/app/code/core/Mage/Directory/Model/Country/Api.php
index a2dbd0bf9b..b431a02742 100644
--- a/app/code/core/Mage/Directory/Model/Country/Api.php
+++ b/app/code/core/Mage/Directory/Model/Country/Api.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Directory
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Directory/Model/Country/Format.php b/app/code/core/Mage/Directory/Model/Country/Format.php
index f4a1f24319..433cbf6076 100644
--- a/app/code/core/Mage/Directory/Model/Country/Format.php
+++ b/app/code/core/Mage/Directory/Model/Country/Format.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Directory
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Directory/Model/Currency.php b/app/code/core/Mage/Directory/Model/Currency.php
index 119fb52ed1..74a33372cf 100644
--- a/app/code/core/Mage/Directory/Model/Currency.php
+++ b/app/code/core/Mage/Directory/Model/Currency.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Directory
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Directory/Model/Currency/Filter.php b/app/code/core/Mage/Directory/Model/Currency/Filter.php
index f2f8fcba4b..dd0dc901ec 100644
--- a/app/code/core/Mage/Directory/Model/Currency/Filter.php
+++ b/app/code/core/Mage/Directory/Model/Currency/Filter.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Directory
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Directory/Model/Currency/Import/Abstract.php b/app/code/core/Mage/Directory/Model/Currency/Import/Abstract.php
index f233417571..a926815b46 100644
--- a/app/code/core/Mage/Directory/Model/Currency/Import/Abstract.php
+++ b/app/code/core/Mage/Directory/Model/Currency/Import/Abstract.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Directory
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Directory/Model/Currency/Import/Webservicex.php b/app/code/core/Mage/Directory/Model/Currency/Import/Webservicex.php
index 4102ee016a..d91999444d 100644
--- a/app/code/core/Mage/Directory/Model/Currency/Import/Webservicex.php
+++ b/app/code/core/Mage/Directory/Model/Currency/Import/Webservicex.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Directory
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Directory/Model/Mysql4/Country.php b/app/code/core/Mage/Directory/Model/Mysql4/Country.php
index 744cc78a43..840d0efe15 100644
--- a/app/code/core/Mage/Directory/Model/Mysql4/Country.php
+++ b/app/code/core/Mage/Directory/Model/Mysql4/Country.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Directory
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Directory/Model/Mysql4/Country/Collection.php b/app/code/core/Mage/Directory/Model/Mysql4/Country/Collection.php
index dd340d8d42..a4e335ae40 100644
--- a/app/code/core/Mage/Directory/Model/Mysql4/Country/Collection.php
+++ b/app/code/core/Mage/Directory/Model/Mysql4/Country/Collection.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Directory
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -103,7 +109,7 @@ public function addCountryIdFilter($countryId)
         return $this;
     }
 
-    public function toOptionArray($emptyLabel = '')
+    public function toOptionArray($emptyLabel = ' ')
     {
         $options = $this->_toOptionArray('country_id', 'name', array('title'=>'iso2_code'));
 
diff --git a/app/code/core/Mage/Directory/Model/Mysql4/Country/Format.php b/app/code/core/Mage/Directory/Model/Mysql4/Country/Format.php
index 1c0f64a452..597c674cfb 100644
--- a/app/code/core/Mage/Directory/Model/Mysql4/Country/Format.php
+++ b/app/code/core/Mage/Directory/Model/Mysql4/Country/Format.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Directory
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Directory/Model/Mysql4/Country/Format/Collection.php b/app/code/core/Mage/Directory/Model/Mysql4/Country/Format/Collection.php
index 925e713caa..5c7f091071 100644
--- a/app/code/core/Mage/Directory/Model/Mysql4/Country/Format/Collection.php
+++ b/app/code/core/Mage/Directory/Model/Mysql4/Country/Format/Collection.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Directory
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Directory/Model/Mysql4/Currency.php b/app/code/core/Mage/Directory/Model/Mysql4/Currency.php
index 659c1166a0..34800f98cd 100644
--- a/app/code/core/Mage/Directory/Model/Mysql4/Currency.php
+++ b/app/code/core/Mage/Directory/Model/Mysql4/Currency.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Directory
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Directory/Model/Mysql4/Currency/Collection.php b/app/code/core/Mage/Directory/Model/Mysql4/Currency/Collection.php
index 8ea128ba58..cc451946bc 100644
--- a/app/code/core/Mage/Directory/Model/Mysql4/Currency/Collection.php
+++ b/app/code/core/Mage/Directory/Model/Mysql4/Currency/Collection.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Directory
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Directory/Model/Mysql4/Region.php b/app/code/core/Mage/Directory/Model/Mysql4/Region.php
index 57618946fc..3bd8d1dde9 100644
--- a/app/code/core/Mage/Directory/Model/Mysql4/Region.php
+++ b/app/code/core/Mage/Directory/Model/Mysql4/Region.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Directory
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Directory/Model/Mysql4/Region/Collection.php b/app/code/core/Mage/Directory/Model/Mysql4/Region/Collection.php
index 58daa0a5b3..4697956740 100644
--- a/app/code/core/Mage/Directory/Model/Mysql4/Region/Collection.php
+++ b/app/code/core/Mage/Directory/Model/Mysql4/Region/Collection.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Directory
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Directory/Model/Observer.php b/app/code/core/Mage/Directory/Model/Observer.php
index e9e4575a2c..6f00cb7b61 100644
--- a/app/code/core/Mage/Directory/Model/Observer.php
+++ b/app/code/core/Mage/Directory/Model/Observer.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Directory
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Directory/Model/Region.php b/app/code/core/Mage/Directory/Model/Region.php
index 0dada78a71..1157a989d3 100644
--- a/app/code/core/Mage/Directory/Model/Region.php
+++ b/app/code/core/Mage/Directory/Model/Region.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Directory
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Directory/Model/Region/Api.php b/app/code/core/Mage/Directory/Model/Region/Api.php
index 6ebab8c322..7e89c1991a 100644
--- a/app/code/core/Mage/Directory/Model/Region/Api.php
+++ b/app/code/core/Mage/Directory/Model/Region/Api.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Directory
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Directory/controllers/CurrencyController.php b/app/code/core/Mage/Directory/controllers/CurrencyController.php
index 59c35d10ac..d6f573463d 100644
--- a/app/code/core/Mage/Directory/controllers/CurrencyController.php
+++ b/app/code/core/Mage/Directory/controllers/CurrencyController.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Directory
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Directory/etc/api.xml b/app/code/core/Mage/Directory/etc/api.xml
index a878a5a57d..8efdd1bca0 100644
--- a/app/code/core/Mage/Directory/etc/api.xml
+++ b/app/code/core/Mage/Directory/etc/api.xml
@@ -13,6 +13,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category    Mage
  * @package     Mage_Directory
  * @copyright   Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Directory/etc/config.xml b/app/code/core/Mage/Directory/etc/config.xml
index 1a3bb2f205..f5ea175a5d 100644
--- a/app/code/core/Mage/Directory/etc/config.xml
+++ b/app/code/core/Mage/Directory/etc/config.xml
@@ -13,6 +13,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Directory
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -22,7 +28,7 @@
 
     
         
-            0.8.0
+            0.8.1
         
     
     
@@ -133,8 +139,8 @@
     
         
             
-                AFN,ALL,DZD,AOA,ARS,AMD,AWG,AUD,BSD,BHD,BDT,BBD,BYR,BZD,BMD,BTN,BOB,BAM,BWP,BRL,GBP,BND,BGN,BUK,BIF,KHR,CAD,CVE,CZK,KYD,CLP,CNY,COP,KMF,CDF,CRC,HRK,CUP,DKK,DJF,DOP,XCD,EGP,SVC,GQE,ERN,EEK,ETB,EUR,FKP,FJD,GMD,GEK,GHS,GIP,GTQ,GNF,GYD,HTG,HNL,HKD,HUF,ISK,INR,IDR,IRR,IQD,ILS,JMD,JPY,JOD,KZT,KES,KWD,KGS,LAK,LVL,LBP,LSL,LRD,LYD,LTL,MOP,MKD,MGA,MWK,MYR,MVR,LSM,MRO,MUR,MXN,MDL,MNT,MAD,MZN,MMK,NAD,NPR,ANG,TRL,TRY,NZD,NIC,NGN,KPW,NOK,OMR,PKR,PAB,PGK,PYG,PES,PHP,PLN,QAR,RHD,RON,RUB,RWF,SHP,STD,SAR,RSD,SCR,SLL,SGD,SKK,SBD,SOS,ZAR,KRW,LKR,SDG,SRD,SZL,SEK,CHF,SYP,TWD,TJS,TZS,THB,TOP,TTD,TND,TMM,USD,UGX,UAH,AED,UYU,UZS,VUV,VEB,VND,CHE,CHW,XOF,WST,YER,ZMK,ZWD
-                
+                AZN,AZM,AFN,ALL,DZD,AOA,ARS,AMD,AWG,AUD,BSD,BHD,BDT,BBD,BYR,BZD,BMD,BTN,BOB,BAM,BWP,BRL,GBP,BND,BGN,BUK,BIF,KHR,CAD,CVE,CZK,KYD,CLP,CNY,COP,KMF,CDF,CRC,HRK,CUP,DKK,DJF,DOP,XCD,EGP,SVC,GQE,ERN,EEK,ETB,EUR,FKP,FJD,GMD,GEK,GHS,GIP,GTQ,GNF,GYD,HTG,HNL,HKD,HUF,ISK,INR,IDR,IRR,IQD,ILS,JMD,JPY,JOD,KZT,KES,KWD,KGS,LAK,LVL,LBP,LSL,LRD,LYD,LTL,MOP,MKD,MGA,MWK,MYR,MVR,LSM,MRO,MUR,MXN,MDL,MNT,MAD,MZN,MMK,NAD,NPR,ANG,TRL,TRY,NZD,NIC,NGN,KPW,NOK,OMR,PKR,PAB,PGK,PYG,PES,PHP,PLN,QAR,RHD,RON,ROL,RUB,RWF,SHP,STD,SAR,RSD,SCR,SLL,SGD,SKK,SBD,SOS,ZAR,KRW,LKR,SDG,SRD,SZL,SEK,CHF,SYP,TWD,TJS,TZS,THB,TOP,TTD,TND,TMM,USD,UGX,UAH,AED,UYU,UZS,VUV,VEB,VND,CHE,CHW,XOF,WST,YER,ZMK,ZWD
+            
         
 
         
diff --git a/app/code/core/Mage/Directory/etc/system.xml b/app/code/core/Mage/Directory/etc/system.xml
index 8ad1285081..658d9f06c6 100644
--- a/app/code/core/Mage/Directory/etc/system.xml
+++ b/app/code/core/Mage/Directory/etc/system.xml
@@ -36,7 +36,7 @@
                     1
                     1
                     
-                        
+                        
                             
                             select
                             directory/adminhtml_frontend_currency_base
diff --git a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-install-0.7.0.php
index 001d281748..640b7bb6e2 100644
--- a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-install-0.7.0.php
+++ b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-install-0.7.0.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Directory
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-install-0.8.0.php b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-install-0.8.0.php
index c05d17cfa2..0e7f85ce4d 100644
--- a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-install-0.8.0.php
+++ b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-install-0.8.0.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Directory
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.7.0-0.7.1.php
index 475ace8aa7..3bf5374fd7 100644
--- a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.7.0-0.7.1.php
+++ b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.7.0-0.7.1.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Directory
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.7.1-0.7.2.php
index 574dc9848c..53e64278fe 100644
--- a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.7.1-0.7.2.php
+++ b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.7.1-0.7.2.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Directory
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.0-0.8.1.php b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.0-0.8.1.php
new file mode 100644
index 0000000000..9702f7d0a2
--- /dev/null
+++ b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.0-0.8.1.php
@@ -0,0 +1,73 @@
+
+ */
+$installer = $this;
+/* @var $installer Mage_Core_Model_Resource_Setup */
+$installer->startSetup();
+$installer->run("
+INSERT INTO `{$installer->getTable('directory_country_region')}` (`country_id`, `code`, `default_name`)
+VALUES
+('FR', '01', 'Ain'),('FR', '02', 'Aisne'),('FR', '03', 'Allier'),
+('FR', '04', 'Alpes-de-Haute-Provence'),('FR', '05', 'Hautes-Alpes'),('FR', '06', 'Alpes-Maritimes'),
+('FR', '07', 'Ardèche'),('FR', '08', 'Ardennes'),('FR', '09', 'Ariège'),
+('FR', '10', 'Aube'),('FR', '11', 'Aude'),('FR', '12', 'Aveyron'),
+('FR', '13', 'Bouches-du-Rhône'),('FR', '14', 'Calvados'),('FR', '15', 'Cantal'),
+('FR', '16', 'Charente'),('FR', '17', 'Charente-Maritime'),('FR', '18', 'Cher'),
+('FR', '19', 'Corrèze'),('FR', '2A', 'Corse-du-Sud'),('FR', '2B', 'Haute-Corse'),
+('FR', '21', 'Côte-d\\'Or'),('FR', '22', 'Côtes-d\\'Armor'),('FR', '23', 'Creuse'),
+('FR', '24', 'Dordogne'),('FR', '25', 'Doubs'),('FR', '26', 'Drôme'),
+('FR', '27', 'Eure'),('FR', '28', 'Eure-et-Loir'),('FR', '29', 'Finistère'),
+('FR', '30', 'Gard'),('FR', '31', 'Haute-Garonne'),('FR', '32', 'Gers'),
+('FR', '33', 'Gironde'),('FR', '34', 'Hérault'),('FR', '35', 'Ille-et-Vilaine'),
+('FR', '36', 'Indre'),('FR', '37', 'Indre-et-Loire'),('FR', '38', 'Isère'),
+('FR', '39', 'Jura'),('FR', '40', 'Landes'),('FR', '41', 'Loir-et-Cher'),
+('FR', '42', 'Loire'),('FR', '43', 'Haute-Loire'),('FR', '44', 'Loire-Atlantique'),
+('FR', '45', 'Loiret'),('FR', '46', 'Lot'),('FR', '47', 'Lot-et-Garonne'),
+('FR', '48', 'Lozère'),('FR', '49', 'Maine-et-Loire'),('FR', '50', 'Manche'),
+('FR', '51', 'Marne'),('FR', '52', 'Haute-Marne'),('FR', '53', 'Mayenne'),
+('FR', '54', 'Meurthe-et-Moselle'),('FR', '55', 'Meuse'),('FR', '56', 'Morbihan'),
+('FR', '57', 'Moselle'),('FR', '58', 'Nièvre'),('FR', '59', 'Nord'),
+('FR', '60', 'Oise'),('FR', '61', 'Orne'),('FR', '62', 'Pas-de-Calais'),
+('FR', '63', 'Puy-de-Dôme'),('FR', '64', 'Pyrénées-Atlantiques'),('FR', '65', 'Hautes-Pyrénées'),
+('FR', '66', 'Pyrénées-Orientales'),('FR', '67', 'Bas-Rhin'),('FR', '68', 'Haut-Rhin'),
+('FR', '69', 'Rhône'),('FR', '70', 'Haute-Saône'),('FR', '71', 'Saône-et-Loire'),
+('FR', '72', 'Sarthe'),('FR', '73', 'Savoie'),('FR', '74', 'Haute-Savoie'),
+('FR', '75', 'Paris'),('FR', '76', 'Seine-Maritime'),('FR', '77', 'Seine-et-Marne'),
+('FR', '78', 'Yvelines'),('FR', '79', 'Deux-Sèvres'),('FR', '80', 'Somme'),
+('FR', '81', 'Tarn'),('FR', '82', 'Tarn-et-Garonne'),('FR', '83', 'Var'),
+('FR', '84', 'Vaucluse'),('FR', '85', 'Vendée'),('FR', '86', 'Vienne'),
+('FR', '87', 'Haute-Vienne'),('FR', '88', 'Vosges'),('FR', '89', 'Yonne'),
+('FR', '90', 'Territoire-de-Belfort'),('FR', '91', 'Essonne'),('FR', '92', 'Hauts-de-Seine'),
+('FR', '93', 'Seine-Saint-Denis'),('FR', '94', 'Val-de-Marne'),('FR', '95', 'Val-d\\'Oise');
+");
+$installer->endSetup();
diff --git a/app/code/core/Mage/Eav/Exception.php b/app/code/core/Mage/Eav/Exception.php
index 4a0fead06b..959e229b2d 100644
--- a/app/code/core/Mage/Eav/Exception.php
+++ b/app/code/core/Mage/Eav/Exception.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Eav
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Eav/Helper/Data.php b/app/code/core/Mage/Eav/Helper/Data.php
index 21d1cd550d..2884d86245 100644
--- a/app/code/core/Mage/Eav/Helper/Data.php
+++ b/app/code/core/Mage/Eav/Helper/Data.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Eav
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Eav/Model/Config.php b/app/code/core/Mage/Eav/Model/Config.php
index eb8c600099..e4af74915f 100644
--- a/app/code/core/Mage/Eav/Model/Config.php
+++ b/app/code/core/Mage/Eav/Model/Config.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Eav
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Eav/Model/Convert/Adapter/Entity.php b/app/code/core/Mage/Eav/Model/Convert/Adapter/Entity.php
index 799f93d09e..7fc9312017 100644
--- a/app/code/core/Mage/Eav/Model/Convert/Adapter/Entity.php
+++ b/app/code/core/Mage/Eav/Model/Convert/Adapter/Entity.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Eav
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -95,7 +101,7 @@ public function setFilter($attrFilterArray, $attrToDb = null, $bind = null, $joi
                 $type = $type['type'];
             }
 
-            if ($type == 'dateFromTo') {
+            if ($type == 'dateFromTo' || $type == 'datetimeFromTo') {
                 foreach ($filters as $k => $v) {
                     if (strpos($k, $key . '/') === 0) {
                         $split = split('/', $k);
@@ -155,6 +161,14 @@ public function setFilter($attrFilterArray, $attrToDb = null, $bind = null, $joi
                         'date'      => true
                     );
                     break;
+                case 'datetimeFromTo':
+                    $attr = array(
+                        'attribute' => $keyDB,
+                        'from'      => $val['from'],
+                        'to'        => $val['to'],
+                        'datetime'  => true
+                    );
+                    break;
                 default:
                 break;
             }
diff --git a/app/code/core/Mage/Eav/Model/Convert/Adapter/Grid.php b/app/code/core/Mage/Eav/Model/Convert/Adapter/Grid.php
index ea400f95a5..3ffb2004c6 100644
--- a/app/code/core/Mage/Eav/Model/Convert/Adapter/Grid.php
+++ b/app/code/core/Mage/Eav/Model/Convert/Adapter/Grid.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Eav
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Eav/Model/Convert/Parser/Abstract.php b/app/code/core/Mage/Eav/Model/Convert/Parser/Abstract.php
index 6fdc55886d..0b8585f48b 100644
--- a/app/code/core/Mage/Eav/Model/Convert/Parser/Abstract.php
+++ b/app/code/core/Mage/Eav/Model/Convert/Parser/Abstract.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Catalog
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Eav/Model/Entity.php b/app/code/core/Mage/Eav/Model/Entity.php
index 35181eb1f0..00b41248e8 100644
--- a/app/code/core/Mage/Eav/Model/Entity.php
+++ b/app/code/core/Mage/Eav/Model/Entity.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Eav
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Eav/Model/Entity/Abstract.php b/app/code/core/Mage/Eav/Model/Entity/Abstract.php
index 80ffb9a95e..7e563747ab 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Abstract.php
+++ b/app/code/core/Mage/Eav/Model/Entity/Abstract.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Eav
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -498,7 +504,7 @@ public function attributesCompare($attribute1, $attribute2)
      * @param   Mage_Catalog_Model_Resource_Eav_Attribute $attribute
      * @return  boolean
      */
-    protected function _isApplicableAttribute ($object, $attribute)
+    protected function _isApplicableAttribute($object, $attribute)
     {
         return true;
     }
@@ -554,9 +560,13 @@ public function walkAttributes($partMethod, array $args=array())
                     $instance = $attribute->getSource();
                     break;
             }
+
             try {
                 $results[$attrCode] = call_user_func_array(array($instance, $method), $args);
             }
+            catch (Mage_Eav_Model_Entity_Attribute_Exception $e) {
+                throw $e;
+            }
             catch (Exception $e) {
                 $exception = new Mage_Eav_Model_Entity_Attribute_Exception($e->getMessage());
                 $exception->setAttributeCode($attrCode)->setPart($part);
diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute.php b/app/code/core/Mage/Eav/Model/Entity/Attribute.php
index 2e15dbb4f0..21935f0555 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Attribute.php
+++ b/app/code/core/Mage/Eav/Model/Entity/Attribute.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Eav
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Abstract.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Abstract.php
index a754f15ed0..bbe196621e 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Abstract.php
+++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Abstract.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Eav
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Abstract.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Abstract.php
index 4f1c43fec7..6e789e51ca 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Abstract.php
+++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Abstract.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Eav
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Array.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Array.php
index 972f304b04..54f6169a31 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Array.php
+++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Array.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Eav
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Datetime.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Datetime.php
index 8568c551e4..78493d810e 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Datetime.php
+++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Datetime.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Eav
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -26,6 +32,15 @@ public function beforeSave($object)
         $object->setData($this->getAttribute()->getName(), $value);
     }
 
+    /**
+     * Prepare date for save in DB
+     *
+     * string format used from input fields (all date input fields need apply locale settings)
+     * int value can be declared in code (this meen whot we use valid date)
+     *
+     * @param   string | int $date
+     * @return  string
+     */
     public function formatDate($date)
     {
     	if (empty($date)) {
diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Default.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Default.php
index 8e464a33e4..d9bb5db7a1 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Default.php
+++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Default.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Eav
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Increment.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Increment.php
index d2fa4a4f89..0d2efeb11d 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Increment.php
+++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Increment.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Eav
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Interface.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Interface.php
index 0cf7f4001d..bb09370ffb 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Interface.php
+++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Interface.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Eav
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Store.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Store.php
index 67fca320ba..cac891506d 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Store.php
+++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Store.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Eav
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Time/Created.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Time/Created.php
index 4a37c79342..39ad33c7fd 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Time/Created.php
+++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Time/Created.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Eav
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Time/Updated.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Time/Updated.php
index 1eeb4c395d..a8cda47f20 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Time/Updated.php
+++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Time/Updated.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Eav
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Exception.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Exception.php
index 8e58706e43..ca27b4dc65 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Exception.php
+++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Exception.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Eav
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Abstract.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Abstract.php
index 5ce8000bb9..0e17167f36 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Abstract.php
+++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Abstract.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Eav
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Datetime.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Datetime.php
index 3d0dcb6af2..80f6eed9df 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Datetime.php
+++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Datetime.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Eav
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Default.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Default.php
index 15e38e4046..d6188b439c 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Default.php
+++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Default.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Eav
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Interface.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Interface.php
index 9c99102bc8..4e1e354386 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Interface.php
+++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Interface.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Eav
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Group.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Group.php
index e7ad60d686..b68451e107 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Group.php
+++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Group.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Eav
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Interface.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Interface.php
index 07ba67f132..6f8009f4e1 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Interface.php
+++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Interface.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Eav
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Option.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Option.php
index cae786c936..d6e8538320 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Option.php
+++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Option.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Eav
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Set.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Set.php
index 76472bfd9e..ea666652eb 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Set.php
+++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Set.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Eav
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Abstract.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Abstract.php
index a1abd5313b..2a19a853a4 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Abstract.php
+++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Abstract.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Eav
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Boolean.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Boolean.php
index 6756e637cf..a0095db0a9 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Boolean.php
+++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Boolean.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Eav
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Config.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Config.php
index 4cccec4457..ad9f3048a0 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Config.php
+++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Config.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Eav
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Interface.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Interface.php
index ecaac2075c..f78e59813e 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Interface.php
+++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Interface.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Eav
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Store.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Store.php
index d2204bef42..5282146fe4 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Store.php
+++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Store.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Eav
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Table.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Table.php
index 14686a19c0..a5611a63aa 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Table.php
+++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Table.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Eav
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -21,17 +27,20 @@
 
 class Mage_Eav_Model_Entity_Attribute_Source_Table extends Mage_Eav_Model_Entity_Attribute_Source_Abstract
 {
-    public function getAllOptions($withEmpty = true)
+    protected $_optionsDefault = array();
+
+    public function getAllOptions($withEmpty = true, $defaultValues = false)
     {
         if (is_null($this->_options)) {
-            $this->_options = Mage::getResourceModel('eav/entity_attribute_option_collection')
+            $collection = Mage::getResourceModel('eav/entity_attribute_option_collection')
+                ->setPositionOrder('asc')
                 ->setAttributeFilter($this->getAttribute()->getId())
                 ->setStoreFilter($this->getAttribute()->getStoreId())
-                ->setPositionOrder('asc')
-                ->load()
-                ->toOptionArray();
+                ->load();
+            $this->_options        = $collection->toOptionArray();
+            $this->_optionsDefault = $collection->toOptionArray('default_value');
         }
-        $options = $this->_options;
+        $options = ($defaultValues ? $this->_optionsDefault : $this->_options);
         if ($withEmpty) {
             array_unshift($options, array('label'=>'', 'value'=>''));
         }
diff --git a/app/code/core/Mage/Eav/Model/Entity/Collection.php b/app/code/core/Mage/Eav/Model/Entity/Collection.php
index d336eaaae3..b138174022 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Collection.php
+++ b/app/code/core/Mage/Eav/Model/Entity/Collection.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Eav
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Eav/Model/Entity/Collection/Abstract.php b/app/code/core/Mage/Eav/Model/Entity/Collection/Abstract.php
index e38a0f6570..a713f64d96 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Collection/Abstract.php
+++ b/app/code/core/Mage/Eav/Model/Entity/Collection/Abstract.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Eav
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Eav/Model/Entity/Increment/Abstract.php b/app/code/core/Mage/Eav/Model/Entity/Increment/Abstract.php
index 225ddb2290..b437af87a2 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Increment/Abstract.php
+++ b/app/code/core/Mage/Eav/Model/Entity/Increment/Abstract.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Eav
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Eav/Model/Entity/Increment/Alphanum.php b/app/code/core/Mage/Eav/Model/Entity/Increment/Alphanum.php
index 6509600026..75fe5678f3 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Increment/Alphanum.php
+++ b/app/code/core/Mage/Eav/Model/Entity/Increment/Alphanum.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Eav
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Eav/Model/Entity/Increment/Interface.php b/app/code/core/Mage/Eav/Model/Entity/Increment/Interface.php
index 4ba80b4600..9788d32196 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Increment/Interface.php
+++ b/app/code/core/Mage/Eav/Model/Entity/Increment/Interface.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Eav
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Eav/Model/Entity/Increment/Numeric.php b/app/code/core/Mage/Eav/Model/Entity/Increment/Numeric.php
index a67c2d676b..419091d929 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Increment/Numeric.php
+++ b/app/code/core/Mage/Eav/Model/Entity/Increment/Numeric.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Eav
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Eav/Model/Entity/Interface.php b/app/code/core/Mage/Eav/Model/Entity/Interface.php
index f54c7dee2b..0f39227f77 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Interface.php
+++ b/app/code/core/Mage/Eav/Model/Entity/Interface.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Eav
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Eav/Model/Entity/Setup.php b/app/code/core/Mage/Eav/Model/Entity/Setup.php
index 31cb3e419f..bdc7bc8351 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Setup.php
+++ b/app/code/core/Mage/Eav/Model/Entity/Setup.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Eav
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Eav/Model/Entity/Store.php b/app/code/core/Mage/Eav/Model/Entity/Store.php
index 7d94c2a1b5..cdfd5d298c 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Store.php
+++ b/app/code/core/Mage/Eav/Model/Entity/Store.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Eav
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Eav/Model/Entity/Type.php b/app/code/core/Mage/Eav/Model/Entity/Type.php
index 03c220fe6a..96652e2b40 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Type.php
+++ b/app/code/core/Mage/Eav/Model/Entity/Type.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Eav
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Eav/Model/Mysql4/Config.php b/app/code/core/Mage/Eav/Model/Mysql4/Config.php
index 0e4e262bd5..932e7436ff 100644
--- a/app/code/core/Mage/Eav/Model/Mysql4/Config.php
+++ b/app/code/core/Mage/Eav/Model/Mysql4/Config.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Eav
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute.php b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute.php
index 980ddb0fc6..355967714a 100644
--- a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute.php
+++ b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Eav
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -152,8 +158,14 @@ protected function _beforeSave(Mage_Core_Model_Abstract $object)
             }
             $object->setFrontendLabel($frontendLabel[0]);
 
+            if ($object->getData('modulePrefix')) {
+                $str = $object->getData('modulePrefix') . Mage_Core_Model_Translate::SCOPE_SEPARATOR . $frontendLabel[0];
+            }
+            else {
+                $str = $frontendLabel[0];
+            }
             Mage::getModel('core/translate_string')
-                ->setString($frontendLabel[0])
+                ->setString($str)
                 ->setTranslate($frontendLabel[0])
                 ->setStoreTranslations($frontendLabel)
                 ->save();
@@ -289,7 +301,7 @@ protected function _saveOption(Mage_Core_Model_Abstract $object)
 
                     $write->delete($optionValueTable, $write->quoteInto('option_id=?', $intOptionId));
                     foreach ($stores as $store) {
-                        if (!empty($values[$store->getId()]) || $values[$store->getId()] == "0") {
+                        if (isset($values[$store->getId()]) && (!empty($values[$store->getId()]) || $values[$store->getId()] == "0")) {
                             $data = array(
                                 'option_id' => $intOptionId,
                                 'store_id'  => $store->getId(),
diff --git a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Collection.php b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Collection.php
index 97dd0072ae..df0b3f1889 100644
--- a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Collection.php
+++ b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Collection.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Eav
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Group.php b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Group.php
index 9b222adc19..5aefb82e0d 100644
--- a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Group.php
+++ b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Group.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Eav
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Group/Collection.php b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Group/Collection.php
index 2406318c7c..5edcd1e9bb 100644
--- a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Group/Collection.php
+++ b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Group/Collection.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Eav
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Option.php b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Option.php
index c5d4d5f9dd..efaded96d6 100644
--- a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Option.php
+++ b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Option.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Eav
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Option/Collection.php b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Option/Collection.php
index c539e36bd7..6bd3b0dd6d 100644
--- a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Option/Collection.php
+++ b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Option/Collection.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Eav
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -46,6 +52,7 @@ public function setStoreFilter($storeId=null, $useDefaultValue=true)
         if (is_null($storeId)) {
             $storeId = Mage::app()->getStore()->getId();
         }
+        $sortBy = 'store_default_value';
         if ($useDefaultValue) {
             $this->getSelect()
                 ->join(array('store_default_value'=>$this->_optionValueTable),
@@ -58,12 +65,14 @@ public function setStoreFilter($storeId=null, $useDefaultValue=true)
                 ->where($this->getConnection()->quoteInto('store_default_value.store_id=?', 0));
         }
         else {
+            $sortBy = 'store_value';
             $this->getSelect()
                 ->joinLeft(array('store_value'=>$this->_optionValueTable),
                     'store_value.option_id=main_table.option_id AND '.$this->getConnection()->quoteInto('store_value.store_id=?', $storeId),
                     'value')
                 ->where($this->getConnection()->quoteInto('store_value.store_id=?', $storeId));
         }
+        $this->setOrder("{$sortBy}.value", 'ASC');
 
         return $this;
     }
@@ -79,14 +88,21 @@ public function setIdFilter($id)
         return $this;
     }
 
-    public function toOptionArray()
+    public function toOptionArray($valueKey = 'value')
     {
-        return $this->_toOptionArray('option_id', 'value');
+        return $this->_toOptionArray('option_id', $valueKey);
     }
 
-    public function setPositionOrder($dir='asc')
+    public function setPositionOrder($dir = 'ASC', $sortAlpha = false)
     {
         $this->setOrder('main_table.sort_order', $dir);
+        // sort alphabetically by values in admin
+        if ($sortAlpha) {
+            $this->getSelect()->joinLeft(array('sort_alpha_value' => $this->_optionValueTable),
+                'sort_alpha_value.option_id=main_table.option_id AND sort_alpha_value.store_id=0', 'value'
+            );
+            $this->setOrder('sort_alpha_value.value', $dir);
+        }
         return $this;
     }
 }
diff --git a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Set.php b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Set.php
index 2b18926cd6..7495e74845 100644
--- a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Set.php
+++ b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Set.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Eav
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Set/Collection.php b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Set/Collection.php
index 85014395cb..65991e408d 100644
--- a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Set/Collection.php
+++ b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Set/Collection.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Eav
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Store.php b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Store.php
index 823d2a0f1d..b50627476d 100644
--- a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Store.php
+++ b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Store.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Eav
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Type.php b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Type.php
index 756a6b3bf8..601600a0ee 100644
--- a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Type.php
+++ b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Type.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Eav
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Type/Collection.php b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Type/Collection.php
index 9e88b6ef89..3b12a026b2 100644
--- a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Type/Collection.php
+++ b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Type/Collection.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Eav
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Eav/etc/config.xml b/app/code/core/Mage/Eav/etc/config.xml
index fb25fb0bce..0fae8ac96c 100644
--- a/app/code/core/Mage/Eav/etc/config.xml
+++ b/app/code/core/Mage/Eav/etc/config.xml
@@ -13,6 +13,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Eav
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -75,7 +81,7 @@
         
         
             
-                
+                
             
         
     
diff --git a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-install-0.7.0.php
index c7ca7afea1..ad0e1d2606 100644
--- a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-install-0.7.0.php
+++ b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-install-0.7.0.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Eav
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.0-0.7.1.php
index a741f247c4..53d4950f06 100644
--- a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.0-0.7.1.php
+++ b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.0-0.7.1.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Eav
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.1-0.7.2.php
index d3eca737c0..c7eeb555f2 100644
--- a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.1-0.7.2.php
+++ b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.1-0.7.2.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Eav
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.2-0.7.3.php b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.2-0.7.3.php
index 7e76f4f7f8..3ca23641be 100644
--- a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.2-0.7.3.php
+++ b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.2-0.7.3.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Eav
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.3-0.7.4.php b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.3-0.7.4.php
index 89b97f173c..f08425be00 100644
--- a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.3-0.7.4.php
+++ b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.3-0.7.4.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Eav
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.4-0.7.5.php b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.4-0.7.5.php
index 082c954dc2..a5d29e6b77 100644
--- a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.4-0.7.5.php
+++ b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.4-0.7.5.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Eav
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.5-0.7.6.php b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.5-0.7.6.php
index 1a5b40bd23..a27e5a2711 100644
--- a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.5-0.7.6.php
+++ b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.5-0.7.6.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Eav
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.6-0.7.7.php b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.6-0.7.7.php
index 318dd39ed8..22a0a99b04 100644
--- a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.6-0.7.7.php
+++ b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.6-0.7.7.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Eav
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.7-0.7.8.php b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.7-0.7.8.php
index 6d5b6545e7..2af10b70ab 100644
--- a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.7-0.7.8.php
+++ b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.7-0.7.8.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Eav
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.8-0.7.9.php b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.8-0.7.9.php
index f3e48c5f35..d29792776c 100644
--- a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.8-0.7.9.php
+++ b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.8-0.7.9.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Eav
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.9-0.7.10.php b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.9-0.7.10.php
index 8a1cae0e9c..7d8f3cba5c 100644
--- a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.9-0.7.10.php
+++ b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.9-0.7.10.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Eav
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/GiftMessage/Block/Message/Form.php b/app/code/core/Mage/GiftMessage/Block/Message/Form.php
index 849385e3e7..9d06478edd 100644
--- a/app/code/core/Mage/GiftMessage/Block/Message/Form.php
+++ b/app/code/core/Mage/GiftMessage/Block/Message/Form.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_GiftMessage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/GiftMessage/Block/Message/Helper.php b/app/code/core/Mage/GiftMessage/Block/Message/Helper.php
index 77b5955dd7..7a8213b6ed 100644
--- a/app/code/core/Mage/GiftMessage/Block/Message/Helper.php
+++ b/app/code/core/Mage/GiftMessage/Block/Message/Helper.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_GiftMessage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/GiftMessage/Block/Message/Inline.php b/app/code/core/Mage/GiftMessage/Block/Message/Inline.php
index f054583e3b..8e76001364 100644
--- a/app/code/core/Mage/GiftMessage/Block/Message/Inline.php
+++ b/app/code/core/Mage/GiftMessage/Block/Message/Inline.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_GiftMessage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/GiftMessage/Helper/Data.php b/app/code/core/Mage/GiftMessage/Helper/Data.php
index fc0a645daf..7292965c07 100644
--- a/app/code/core/Mage/GiftMessage/Helper/Data.php
+++ b/app/code/core/Mage/GiftMessage/Helper/Data.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_GiftMessage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/GiftMessage/Helper/Message.php b/app/code/core/Mage/GiftMessage/Helper/Message.php
index be569416f8..6f06b90420 100644
--- a/app/code/core/Mage/GiftMessage/Helper/Message.php
+++ b/app/code/core/Mage/GiftMessage/Helper/Message.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_GiftMessage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/GiftMessage/Helper/Url.php b/app/code/core/Mage/GiftMessage/Helper/Url.php
index a0c3195d86..b7d2ae99b7 100644
--- a/app/code/core/Mage/GiftMessage/Helper/Url.php
+++ b/app/code/core/Mage/GiftMessage/Helper/Url.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_GiftMessage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/GiftMessage/Model/Entity/Attribute/Backend/Boolean/Config.php b/app/code/core/Mage/GiftMessage/Model/Entity/Attribute/Backend/Boolean/Config.php
index 6a7c57a94b..df213b0aab 100644
--- a/app/code/core/Mage/GiftMessage/Model/Entity/Attribute/Backend/Boolean/Config.php
+++ b/app/code/core/Mage/GiftMessage/Model/Entity/Attribute/Backend/Boolean/Config.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_GiftMessage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/GiftMessage/Model/Entity/Attribute/Source/Boolean/Config.php b/app/code/core/Mage/GiftMessage/Model/Entity/Attribute/Source/Boolean/Config.php
index c0b2018c5f..f131f3f361 100644
--- a/app/code/core/Mage/GiftMessage/Model/Entity/Attribute/Source/Boolean/Config.php
+++ b/app/code/core/Mage/GiftMessage/Model/Entity/Attribute/Source/Boolean/Config.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Giftmessage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/GiftMessage/Model/Message.php b/app/code/core/Mage/GiftMessage/Model/Message.php
index fcbb57e159..3c45576dd8 100644
--- a/app/code/core/Mage/GiftMessage/Model/Message.php
+++ b/app/code/core/Mage/GiftMessage/Model/Message.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_GiftMessage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/GiftMessage/Model/Mysql4/Message.php b/app/code/core/Mage/GiftMessage/Model/Mysql4/Message.php
index fa66ce9d01..0eb4291dc0 100644
--- a/app/code/core/Mage/GiftMessage/Model/Mysql4/Message.php
+++ b/app/code/core/Mage/GiftMessage/Model/Mysql4/Message.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_GiftMessage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/GiftMessage/Model/Mysql4/Message/Collection.php b/app/code/core/Mage/GiftMessage/Model/Mysql4/Message/Collection.php
index 137f5d9e7f..e5f8537ff1 100644
--- a/app/code/core/Mage/GiftMessage/Model/Mysql4/Message/Collection.php
+++ b/app/code/core/Mage/GiftMessage/Model/Mysql4/Message/Collection.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_GiftMessage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/GiftMessage/Model/Mysql4/Setup.php b/app/code/core/Mage/GiftMessage/Model/Mysql4/Setup.php
index 275c3cdb4b..38621f172e 100644
--- a/app/code/core/Mage/GiftMessage/Model/Mysql4/Setup.php
+++ b/app/code/core/Mage/GiftMessage/Model/Mysql4/Setup.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_GiftMessage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/GiftMessage/Model/Observer.php b/app/code/core/Mage/GiftMessage/Model/Observer.php
index 7412c8a45b..ce765e2f92 100644
--- a/app/code/core/Mage/GiftMessage/Model/Observer.php
+++ b/app/code/core/Mage/GiftMessage/Model/Observer.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_GiftMessage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/GiftMessage/controllers/IndexController.php b/app/code/core/Mage/GiftMessage/controllers/IndexController.php
index d1b01e14d1..d730e811d6 100644
--- a/app/code/core/Mage/GiftMessage/controllers/IndexController.php
+++ b/app/code/core/Mage/GiftMessage/controllers/IndexController.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_GiftMessage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/GiftMessage/etc/config.xml b/app/code/core/Mage/GiftMessage/etc/config.xml
index 2538b6011b..242e79d93c 100644
--- a/app/code/core/Mage/GiftMessage/etc/config.xml
+++ b/app/code/core/Mage/GiftMessage/etc/config.xml
@@ -13,6 +13,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_GiftMessage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/GiftMessage/etc/system.xml b/app/code/core/Mage/GiftMessage/etc/system.xml
index 37d868e61e..b59ed71564 100644
--- a/app/code/core/Mage/GiftMessage/etc/system.xml
+++ b/app/code/core/Mage/GiftMessage/etc/system.xml
@@ -13,6 +13,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_GiftMessage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-install-0.7.0.php
index 7af56546cd..2d9b3d8174 100644
--- a/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-install-0.7.0.php
+++ b/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-install-0.7.0.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_GiftMessage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.1.3-0.7.0.php b/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.1.3-0.7.0.php
index 9aedeba723..009b315493 100644
--- a/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.1.3-0.7.0.php
+++ b/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.1.3-0.7.0.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_GiftMessage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.7.0-0.7.1.php
index ab5201ad75..d6c561195a 100644
--- a/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.7.0-0.7.1.php
+++ b/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.7.0-0.7.1.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_GiftMessage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.7.1-0.7.2.php
index 41615d301f..7f929dc975 100644
--- a/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.7.1-0.7.2.php
+++ b/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.7.1-0.7.2.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_GiftMessage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/GoogleAnalytics/Block/Ga.php b/app/code/core/Mage/GoogleAnalytics/Block/Ga.php
index 81565fc93a..a3fa38d270 100644
--- a/app/code/core/Mage/GoogleAnalytics/Block/Ga.php
+++ b/app/code/core/Mage/GoogleAnalytics/Block/Ga.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_GoogleAnalytics
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/GoogleAnalytics/Helper/Data.php b/app/code/core/Mage/GoogleAnalytics/Helper/Data.php
index 5da59cae1c..575d0c92c4 100644
--- a/app/code/core/Mage/GoogleAnalytics/Helper/Data.php
+++ b/app/code/core/Mage/GoogleAnalytics/Helper/Data.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_GoogleAnalytics
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/GoogleAnalytics/Model/Observer.php b/app/code/core/Mage/GoogleAnalytics/Model/Observer.php
index cd625a2eb7..9851120398 100644
--- a/app/code/core/Mage/GoogleAnalytics/Model/Observer.php
+++ b/app/code/core/Mage/GoogleAnalytics/Model/Observer.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_GoogleAnalytics
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/GoogleAnalytics/etc/config.xml b/app/code/core/Mage/GoogleAnalytics/etc/config.xml
index a91718d0ab..b5f897b015 100644
--- a/app/code/core/Mage/GoogleAnalytics/etc/config.xml
+++ b/app/code/core/Mage/GoogleAnalytics/etc/config.xml
@@ -13,6 +13,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_GoogleAnalytics
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/GoogleAnalytics/etc/system.xml b/app/code/core/Mage/GoogleAnalytics/etc/system.xml
index de526402bc..e1e37a1a32 100644
--- a/app/code/core/Mage/GoogleAnalytics/etc/system.xml
+++ b/app/code/core/Mage/GoogleAnalytics/etc/system.xml
@@ -13,6 +13,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_GoogleAnalytics
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/GoogleCheckout/Block/Adminhtml/Shipping/Merchant.php b/app/code/core/Mage/GoogleCheckout/Block/Adminhtml/Shipping/Merchant.php
index 8d33358ca2..365e522c8b 100644
--- a/app/code/core/Mage/GoogleCheckout/Block/Adminhtml/Shipping/Merchant.php
+++ b/app/code/core/Mage/GoogleCheckout/Block/Adminhtml/Shipping/Merchant.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -32,7 +38,7 @@ protected function _getElementHtml(Varien_Data_Form_Element_Abstract $element)
         $html .= $this->_getRowTemplateHtml();
         $html .= '';
 
-        $html .= '
    ';
+        $html .= '
      ';
         if ($this->_getValue('method')) {
             foreach ($this->_getValue('method') as $i=>$f) {
                 if ($i) {
@@ -40,16 +46,16 @@ protected function _getElementHtml(Varien_Data_Form_Element_Abstract $element)
                 }
             }
         }
-        $html .= '
    ';
+        $html .= '';
         $html .= $this->_getAddRowButtonHtml('merchant_allowed_methods_container',
-            'merchant_allowed_methods_template', 'Add Shipping Method');
+            'merchant_allowed_methods_template', $this->__('Add Shipping Method'));
 
         return $html;
     }
 
     protected function _getRowTemplateHtml($i=0)
     {
-        $html = '';
+        $html = '
  • ';
         $html .= '';
 
-        $html .= '   '.$this->__('Default price:').' ';
-        $html .= '_getDisabled().'/>';
+        $html .= '
    ';
+		$html .= ' ';
+        $html .= '_getDisabled().'/> ';
 
         $html .= $this->_getRemoveRowButtonHtml();
-        $html .= '';
+        $html .= '
    ';
+		$html .= '
    • ';
 
         return $html;
     }
@@ -122,20 +130,22 @@ protected function _getAddRowButtonHtml($container, $template, $title='Add')
                     ->setType('button')
                     ->setClass('add '.$this->_getDisabled())
                     ->setLabel($this->__($title))
-                    ->setOnClick("new Insertion.Bottom($('".$container."'), $('".$template."').innerHTML)")
+                    //$this->__('Add')
+                    ->setOnClick("Element.insert($('".$container."'), {bottom: $('".$template."').innerHTML})")
                     ->setDisabled($this->_getDisabled())
                     ->toHtml();
         }
         return $this->_addRowButtonHtml[$container];
     }
 
-    protected function _getRemoveRowButtonHtml($selector='span', $title='Remove')
+    protected function _getRemoveRowButtonHtml($selector='li', $title='Remove')
     {
         if (!$this->_removeRowButtonHtml) {
             $this->_removeRowButtonHtml = $this->getLayout()->createBlock('adminhtml/widget_button')
                     ->setType('button')
-                    ->setClass('delete '.$this->_getDisabled())
+                    ->setClass('delete v-middle '.$this->_getDisabled())
                     ->setLabel($this->__($title))
+                    //$this->__('Remove')
                     ->setOnClick("Element.remove($(this).up('".$selector."'))")
                     ->setDisabled($this->_getDisabled())
                     ->toHtml();
diff --git a/app/code/core/Mage/GoogleCheckout/Block/Form.php b/app/code/core/Mage/GoogleCheckout/Block/Form.php
index 6c625083f8..2f56849bb1 100644
--- a/app/code/core/Mage/GoogleCheckout/Block/Form.php
+++ b/app/code/core/Mage/GoogleCheckout/Block/Form.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_GoogleCheckout
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/GoogleCheckout/Block/Link.php b/app/code/core/Mage/GoogleCheckout/Block/Link.php
index 93bce42e48..89b2cba46a 100644
--- a/app/code/core/Mage/GoogleCheckout/Block/Link.php
+++ b/app/code/core/Mage/GoogleCheckout/Block/Link.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_GoogleCheckout
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/GoogleCheckout/Block/Redirect.php b/app/code/core/Mage/GoogleCheckout/Block/Redirect.php
index d80d2afed6..62ae0fe931 100644
--- a/app/code/core/Mage/GoogleCheckout/Block/Redirect.php
+++ b/app/code/core/Mage/GoogleCheckout/Block/Redirect.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_GoogleCheckout
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/GoogleCheckout/Exception.php b/app/code/core/Mage/GoogleCheckout/Exception.php
index 9d349198f0..c8d9194dc2 100644
--- a/app/code/core/Mage/GoogleCheckout/Exception.php
+++ b/app/code/core/Mage/GoogleCheckout/Exception.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_GoogleCheckout
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/GoogleCheckout/Helper/Data.php b/app/code/core/Mage/GoogleCheckout/Helper/Data.php
index b69497bcc1..d06fb5e4f6 100644
--- a/app/code/core/Mage/GoogleCheckout/Helper/Data.php
+++ b/app/code/core/Mage/GoogleCheckout/Helper/Data.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_GoogleCheckout
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/GoogleCheckout/Model/Api.php b/app/code/core/Mage/GoogleCheckout/Model/Api.php
index 9e4a86ad2e..99579fc689 100644
--- a/app/code/core/Mage/GoogleCheckout/Model/Api.php
+++ b/app/code/core/Mage/GoogleCheckout/Model/Api.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_GoogleCheckout
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -101,12 +107,11 @@ public function addTrackingData($gOrderId, $carrier, $trackingNo)
 
 // FULFILLMENT COMMANDS (ITEM BASED)
 
-    public function shipItems(Mage_Sales_Model_Order $order, array $items)
+    public function shipItems($gOrderId, array $items)
     {
         $api = $this->_getApi('order')
-            ->setOrder($order)
-            ->setItems($items)
-            ->shipItems();
+            ->setGoogleOrderNumber($gOrderId)
+            ->shipItems($items);
         return $api;
     }
 
diff --git a/app/code/core/Mage/GoogleCheckout/Model/Api/Debug.php b/app/code/core/Mage/GoogleCheckout/Model/Api/Debug.php
index 346c939fac..007cb2d9cb 100644
--- a/app/code/core/Mage/GoogleCheckout/Model/Api/Debug.php
+++ b/app/code/core/Mage/GoogleCheckout/Model/Api/Debug.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_GoogleCheckout
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/GoogleCheckout/Model/Api/Xml/Abstract.php b/app/code/core/Mage/GoogleCheckout/Model/Api/Xml/Abstract.php
index ce35290be1..bafcd41547 100644
--- a/app/code/core/Mage/GoogleCheckout/Model/Api/Xml/Abstract.php
+++ b/app/code/core/Mage/GoogleCheckout/Model/Api/Xml/Abstract.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_GoogleCheckout
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -192,6 +198,6 @@ public function _call($xml)
 
     protected function _getCallbackUrl()
     {
-        return Mage::getUrl('googlecheckout/api', array('_secure'=>true));
+        return Mage::getUrl('googlecheckout/api', array('_forced_secure'=>Mage::getStoreConfig('google/checkout/use_secure_callback_url')));
     }
 }
diff --git a/app/code/core/Mage/GoogleCheckout/Model/Api/Xml/Calculate.php b/app/code/core/Mage/GoogleCheckout/Model/Api/Xml/Calculate.php
index ea69cd5dd8..414094abcc 100644
--- a/app/code/core/Mage/GoogleCheckout/Model/Api/Xml/Calculate.php
+++ b/app/code/core/Mage/GoogleCheckout/Model/Api/Xml/Calculate.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_GoogleCheckout
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/GoogleCheckout/Model/Api/Xml/Callback.php b/app/code/core/Mage/GoogleCheckout/Model/Api/Xml/Callback.php
index 7abb02c1f9..2af1d5bd14 100644
--- a/app/code/core/Mage/GoogleCheckout/Model/Api/Xml/Callback.php
+++ b/app/code/core/Mage/GoogleCheckout/Model/Api/Xml/Callback.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_GoogleCheckout
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -126,15 +132,24 @@ protected function _responseMerchantCalculationCallback()
             $addressId = $googleAddress['id'];
 
 
-            $address->setCountryId($googleAddress['country-code']['VALUE'])
-                ->setRegion($googleAddress['region']['VALUE'])
+            $regionCode = $googleAddress['region']['VALUE'];
+            $countryCode = $googleAddress['country-code']['VALUE'];
+            $regionModel = Mage::getModel('directory/region')->loadByCode($regionCode, $countryCode);
+            $regionId = $regionModel->getId();
+
+            $address->setCountryId($countryCode)
+                ->setRegion($regionCode)
+                ->setRegionId($regionId)
                 ->setCity($googleAddress['city']['VALUE'])
                 ->setPostcode($googleAddress['postal-code']['VALUE']);
-            $billingAddress->setCountryId($googleAddress['country-code']['VALUE'])
-                ->setRegion($googleAddress['region']['VALUE'])
+            $billingAddress->setCountryId($countryCode)
+                ->setRegion($regionCode)
+                ->setRegionId($regionId)
                 ->setCity($googleAddress['city']['VALUE'])
                 ->setPostcode($googleAddress['postal-code']['VALUE']);
 
+            $address->setCollectShippingRates(true)->collectShippingRates();
+
             if ($gRequestMethods = $this->getData('root/calculate/shipping/method')) {
                 $carriers = array();
                 foreach (Mage::getStoreConfig('carriers') as $carrierCode=>$carrierConfig) {
@@ -156,11 +171,19 @@ protected function _responseMerchantCalculationCallback()
 
                 $errors = array();
                 $rates = array();
+                $rateCodes = array();
                 foreach ($result->getAllRates() as $rate) {
                     if ($rate instanceof Mage_Shipping_Model_Rate_Result_Error) {
                         $errors[$rate->getCarrierTitle()] = 1;
                     } else {
-                        $rates[$rate->getCarrierTitle().' - '.$rate->getMethodTitle()] = $rate->getPrice();
+                        $k = $rate->getCarrierTitle().' - '.$rate->getMethodTitle();
+                        $price = $rate->getPrice();
+                        if ($price) {
+                            $price = Mage::helper('tax')->getShippingPrice($price, false, $address);
+                        }
+
+                        $rates[$k] = $price;
+                        $rateCodes[$k] = $rate->getCarrier() . '_' . $rate->getMethod();
                     }
                 }
 
@@ -168,14 +191,6 @@ protected function _responseMerchantCalculationCallback()
                     $methodName = is_array($method) ? $method['name'] : $method;
                     $result = new GoogleResult($addressId);
 
-                    if ($this->getData('root/calculate/tax/VALUE')=='true') {
-                        $address->setCollectShippingRates(false)->collectTotals();
-                        $billingAddress->setCollectShippingRates(false)->collectTotals();
-                        $taxAmount = $address->getTaxAmount();
-                        $taxAmount += $billingAddress->getTaxAmount();
-                        $result->setTaxDetails($taxAmount);
-                    }
-
                     if (!empty($errors)) {
                         $continue = false;
                         foreach ($errors as $carrier=>$dummy) {
@@ -190,16 +205,33 @@ protected function _responseMerchantCalculationCallback()
                             continue;
                         }
                     }
-                    if (!empty($rates[$methodName])) {
+
+                    if (isset($rates[$methodName])) {
+                        if ($this->getData('root/calculate/tax/VALUE')=='true') {
+                            $address->setShippingMethod($rateCodes[$methodName]);
+
+                            $address->setCollectShippingRates(false)->collectTotals();
+                            $billingAddress->setCollectShippingRates(false)->collectTotals();
+
+                            $taxAmount = $address->getTaxAmount();
+                            $taxAmount += $billingAddress->getTaxAmount();
+
+                            $result->setTaxDetails($taxAmount);
+                        }
+
                         $result->SetShippingDetails($methodName, $rates[$methodName], "true");
                         $merchantCalculations->AddResult($result);
                     }
                 }
             } elseif ($this->getData('root/calculate/tax/VALUE')=='true') {
-                $billingAddress->setCollectShippingRates(false)->collectTotals();
+                $address->setShippingMethod(null);
+
                 $address->setCollectShippingRates(false)->collectTotals();
+                $billingAddress->setCollectShippingRates(false)->collectTotals();
+
                 $taxAmount = $address->getTaxAmount();
                 $taxAmount += $billingAddress->getTaxAmount();
+
                 $result = new GoogleResult($addressId);
                 $result->setTaxDetails($taxAmount);
                 $merchantCalculations->addResult($result);
@@ -278,10 +310,16 @@ protected function _responseNewOrderNotification()
 
         $payment = Mage::getModel('sales/order_payment')->setMethod('googlecheckout');
         $order->setPayment($payment);
+        $order->setCanShipPartiallyItem(false);
+
+        $emailAllowed = ($this->getData('root/buyer-marketing-preferences/email-allowed/VALUE')==='true');
 
         $order->setCustomerNote(
             $this->__('Google Order Number: %s', ''.$this->getGoogleOrderNumber()).''.
-            '
    '. $this->__('Google Buyer Id: %s', ''.$this->getData('root/buyer-id/VALUE').'')
+            '
    '.
+            $this->__('Google Buyer Id: %s', ''.$this->getData('root/buyer-id/VALUE').'').
+            '
    '.
+            $this->__('Is Buyer Willing To Receive Marketing E-Mails: %s', '' . ($emailAllowed ? $this->__('Yes') : $this->__('No')) . '')
         );
 
 #ob_start(array($this, 'log'));
@@ -297,10 +335,17 @@ protected function _responseNewOrderNotification()
             ->setLastOrderId($order->getId())
             ->setLastRealOrderId($order->getIncrementId());
 
-        if ($this->getData('root/buyer-marketing-preferences/email-allowed/VALUE')==='true') {
+        if ($emailAllowed) {
             Mage::getModel('newsletter/subscriber')->subscribe($order->getCustomerEmail());
         }
 
+        $shoppingCartQuoteId = Mage::getSingleton('checkout/session')->getQuoteId();
+        $tmpQuote = Mage::getModel('sales/quote')->load($shoppingCartQuoteId);
+/*
+        if (!$tmpQuote->getIsChanged()) {
+            $tmpQuote->delete();
+        }
+*/
         $this->getGRequest()->SendMerchantOrderNumber($order->getExtOrderId(), $order->getIncrementId());
     }
 
@@ -325,12 +370,15 @@ protected function _importGoogleAddress($gAddress, Varien_Object $qAddress=null)
                 $qAddress->setLastname($nameArr[1]);
             }
         }
+        $region = Mage::getModel('directory/region')->loadByCode($gAddress->getData('region/VALUE'), $gAddress->getData('country-code/VALUE'));
+
         $qAddress
             ->setCompany($gAddress->getData('company-name/VALUE'))
             ->setEmail($gAddress->getData('email/VALUE'))
             ->setStreet(trim($gAddress->getData('address1/VALUE')."\n".$gAddress->getData('address2/VALUE')))
             ->setCity($gAddress->getData('city/VALUE'))
             ->setRegion($gAddress->getData('region/VALUE'))
+            ->setRegionId($region->getId())
             ->setPostcode($gAddress->getData('postal-code/VALUE'))
             ->setCountryId($gAddress->getData('country-code/VALUE'))
             ->setTelephone($gAddress->getData('phone/VALUE'))
@@ -342,6 +390,7 @@ protected function _importGoogleAddress($gAddress, Varien_Object $qAddress=null)
     protected function _importGoogleTotals($qAddress)
     {
         $qAddress->setTaxAmount($this->getData('root/order-adjustment/total-tax/VALUE'));
+        $qAddress->setBaseTaxAmount($this->getData('root/order-adjustment/total-tax/VALUE'));
 
         $prefix = 'root/order-adjustment/shipping/';
         if ($shipping = $this->getData($prefix.'carrier-calculated-shipping-adjustment')) {
@@ -354,12 +403,25 @@ protected function _importGoogleTotals($qAddress)
             $method = 'googlecheckout_pickup';
         }
         if (!empty($method)) {
+            $excludingTax = $shipping['shipping-cost']['VALUE'];
+            if (!Mage::helper('tax')->shippingPriceIncludesTax()) {
+                $includingTax = Mage::helper('tax')->getShippingPrice($excludingTax, true, $qAddress, $qAddress->getQuote()->getCustomerTaxClassId());
+                $shippingTax = $includingTax - $excludingTax;
+                $qAddress->setShippingTaxAmount($shippingTax)
+                    ->setBaseShippingTaxAmount($shippingTax);
+            }
+
             $qAddress->setShippingMethod($method)
                 ->setShippingDescription($shipping['shipping-name']['VALUE'])
-                ->setShippingAmount($shipping['shipping-cost']['VALUE']);
+                ->setShippingAmount($excludingTax, true)
+                ->setBaseShippingAmount($excludingTax, true);
+        } else {
+            $qAddress->setShippingMethod(null);
         }
 
+
         $qAddress->setGrandTotal($this->getData('root/order-total/VALUE'));
+        $qAddress->setBaseGrandTotal($this->getData('root/order-total/VALUE'));
     }
 
     /**
@@ -436,6 +498,7 @@ protected function _responseChargeAmountNotification()
         $latestCharged = $this->getData('root/latest-charge-amount/VALUE');
         $totalCharged = $this->getData('root/total-charge-amount/VALUE');
         $payment->setAmountCharged($totalCharged);
+        $order->setIsInProcess(true);
 
         $msg = $this->__('Google Charge:');
         $msg .= '
    '.$this->__('Latest Charge: %s', ''.Mage::helper('core')->currency($latestCharged).'');
@@ -473,6 +536,25 @@ protected function _createInvoice()
         return $invoice;
     }
 
+    protected function _createShipment()
+    {
+        $order = $this->getOrder();
+        $shipment = $order->prepareShipment();
+        if ($shipment) {
+            $shipment->register();
+
+            $order->setIsInProcess(true);
+
+            $transactionSave = Mage::getModel('core/resource_transaction')
+                ->addObject($shipment)
+                ->addObject($shipment->getOrder())
+                ->save();
+        }
+
+        return $shipment;
+    }
+
+
     protected function _responseChargebackAmountNotification()
     {
         $this->getGResponse()->SendAck();
@@ -556,12 +638,12 @@ protected function _orderStateChangeFinancialPaymentDeclined()
 
     protected function _orderStateChangeFinancialCancelled()
     {
-        $this->getOrder()->cancel()->save();
+        $this->getOrder()->setBeingCanceledFromGoogleApi(true)->cancel()->save();
     }
 
     protected function _orderStateChangeFinancialCancelledByGoogle()
     {
-        $this->getOrder()->cancel()->save();
+        $this->getOrder()->setBeingCanceledFromGoogleApi(true)->cancel()->save();
         $this->getGRequest()->SendBuyerMessage($this->getGoogleOrderNumber(), "Sorry, your order is cancelled by Google", true);
     }
 
@@ -577,7 +659,9 @@ protected function _orderStateChangeFulfillmentProcessing()
 
     protected function _orderStateChangeFulfillmentDelivered()
     {
-
+        $shipment = $this->_createShipment();
+        if (!is_null($shipment))
+            $shipment->save();
     }
 
     protected function _orderStateChangeFulfillmentWillNotDeliver()
diff --git a/app/code/core/Mage/GoogleCheckout/Model/Api/Xml/Checkout.php b/app/code/core/Mage/GoogleCheckout/Model/Api/Xml/Checkout.php
index f37dbef9b1..e8fbc3bff1 100644
--- a/app/code/core/Mage/GoogleCheckout/Model/Api/Xml/Checkout.php
+++ b/app/code/core/Mage/GoogleCheckout/Model/Api/Xml/Checkout.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_GoogleCheckout
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -33,6 +39,7 @@ protected function _getApiUrl()
     public function checkout()
     {
         $quote = $this->getQuote();
+
         if (!($quote instanceof Mage_Sales_Model_Quote)) {
             Mage::throwException('Invalid quote');
         }
@@ -171,7 +178,7 @@ protected function _getMerchantCheckoutFlowSupportXml()
 
     protected function _getRequestBuyerPhoneNumberXml()
     {
-        $requestPhone = Mage::getStoreConfig('google/checkout/request_phone') ? 'true' : 'false';
+        $requestPhone = Mage::getStoreConfig('google/checkout/request_phone', $this->getQuote()->getStoreId()) ? 'true' : 'false';
         $xml = <<{$requestPhone}
 EOT;
@@ -195,6 +202,7 @@ protected function _getVirtualOrderShippingXml()
         $xml = <<
                 
+                    
                     0
                 
             
@@ -228,24 +236,24 @@ protected function _getCarrierCalculatedShippingXml()
             return '';
         }
 
-        $active = Mage::getStoreConfigFlag('google/checkout_shipping_carrier/active');
-        $methods = Mage::getStoreConfig('google/checkout_shipping_carrier/methods');
+        $active = Mage::getStoreConfigFlag('google/checkout_shipping_carrier/active', $this->getQuote()->getStoreId());
+        $methods = Mage::getStoreConfig('google/checkout_shipping_carrier/methods', $this->getQuote()->getStoreId());
         if (!$active || !$methods) {
             return '';
         }
 
-        $country = Mage::getStoreConfig('shipping/origin/country_id');
-        $region = Mage::getStoreConfig('shipping/origin/region_id');
-        $postcode = Mage::getStoreConfig('shipping/origin/postcode');
-        $city = Mage::getStoreConfig('shipping/origin/city');
+        $country = Mage::getStoreConfig('shipping/origin/country_id', $this->getQuote()->getStoreId());
+        $region = Mage::getStoreConfig('shipping/origin/region_id', $this->getQuote()->getStoreId());
+        $postcode = Mage::getStoreConfig('shipping/origin/postcode', $this->getQuote()->getStoreId());
+        $city = Mage::getStoreConfig('shipping/origin/city', $this->getQuote()->getStoreId());
 
         $sizeUnit = 'IN';#Mage::getStoreConfig('google/checkout_shipping_carrier/default_unit');
-        $defPrice = (float)Mage::getStoreConfig('google/checkout_shipping_carrier/default_price');
-        $width = Mage::getStoreConfig('google/checkout_shipping_carrier/default_width');
-        $height = Mage::getStoreConfig('google/checkout_shipping_carrier/default_height');
-        $length = Mage::getStoreConfig('google/checkout_shipping_carrier/default_length');
+        $defPrice = (float)Mage::getStoreConfig('google/checkout_shipping_carrier/default_price', $this->getQuote()->getStoreId());
+        $width = Mage::getStoreConfig('google/checkout_shipping_carrier/default_width', $this->getQuote()->getStoreId());
+        $height = Mage::getStoreConfig('google/checkout_shipping_carrier/default_height', $this->getQuote()->getStoreId());
+        $length = Mage::getStoreConfig('google/checkout_shipping_carrier/default_length', $this->getQuote()->getStoreId());
 
-        $addressCategory = Mage::getStoreConfig('google/checkout_shipping_carrier/address_category');
+        $addressCategory = Mage::getStoreConfig('google/checkout_shipping_carrier/address_category', $this->getQuote()->getStoreId());
 
         $defPrice = Mage::helper('tax')->getShippingPrice($defPrice, false, false);
 
@@ -299,13 +307,17 @@ protected function _getFlatRateShippingXml()
             return '';
         }
 
-        if (!Mage::getStoreConfigFlag('google/checkout_shipping_flatrate/active')) {
+        if (!Mage::getStoreConfigFlag('google/checkout_shipping_flatrate/active', $this->getQuote()->getStoreId())) {
             return '';
         }
 
         for ($xml='', $i=1; $i<=3; $i++) {
-            $title = Mage::getStoreConfig('google/checkout_shipping_flatrate/title_'.$i);
-            $price = Mage::getStoreConfig('google/checkout_shipping_flatrate/price_'.$i);
+            $allowSpecific = Mage::getStoreConfigFlag('google/checkout_shipping_flatrate/sallowspecific_'.$i, $this->getQuote()->getStoreId());
+            $specificCountries = Mage::getStoreConfig('google/checkout_shipping_flatrate/specificcountry_'.$i, $this->getQuote()->getStoreId());
+            $allowedAreasXml = $this->_getAllowedCountries($allowSpecific, $specificCountries);
+
+            $title = Mage::getStoreConfig('google/checkout_shipping_flatrate/title_'.$i, $this->getQuote()->getStoreId());
+            $price = Mage::getStoreConfig('google/checkout_shipping_flatrate/price_'.$i, $this->getQuote()->getStoreId());
             $price = number_format($price, 2, '.','');
             $price = Mage::helper('tax')->getShippingPrice($price, false, false);
 
@@ -315,6 +327,11 @@ protected function _getFlatRateShippingXml()
 
             $xml .= <<
+                    
+                        
+                        {$allowedAreasXml}
+                        
+                    
                     {$price}
                 
 EOT;
@@ -323,6 +340,24 @@ protected function _getFlatRateShippingXml()
         return $xml;
     }
 
+    protected function _getAllowedCountries($allowSpecific, $specific)
+    {
+        $xml = '';
+        if ($allowSpecific == 1) {
+            if($specific) {
+                foreach (explode(',', $specific) as $country) {
+                    $xml .= "{$country}\n";
+                }
+            }
+        }
+
+        if ($xml) {
+            return $xml;
+        }
+
+        return '';
+    }
+
     protected function _getMerchantCalculatedShippingXml()
     {
         /*
@@ -332,8 +367,8 @@ protected function _getMerchantCalculatedShippingXml()
             return '';
         }
 
-        $active = Mage::getStoreConfigFlag('google/checkout_shipping_merchant/active');
-        $methods = Mage::getStoreConfig('google/checkout_shipping_merchant/allowed_methods');
+        $active = Mage::getStoreConfigFlag('google/checkout_shipping_merchant/active', $this->getQuote()->getStoreId());
+        $methods = Mage::getStoreConfig('google/checkout_shipping_merchant/allowed_methods', $this->getQuote()->getStoreId());
 
         if (!$active || !$methods) {
             return '';
@@ -349,21 +384,30 @@ protected function _getMerchantCalculatedShippingXml()
             list($carrierCode, $methodCode) = explode('/', $method);
             if ($carrierCode) {
                 $carrier = Mage::getModel('shipping/shipping')->getCarrierByCode($carrierCode);
-                $allowedMethods = $carrier->getAllowedMethods();
+                if ($carrier) {
+                    $allowedMethods = $carrier->getAllowedMethods();
 
-                if (isset($allowedMethods[$methodCode])) {
-                    $method = Mage::getStoreConfig('carriers/'.$carrierCode.'/title');
-                    $method .= ' - '.$allowedMethods[$methodCode];
-                }
+                    if (isset($allowedMethods[$methodCode])) {
+                        $method = Mage::getStoreConfig('carriers/'.$carrierCode.'/title', $this->getQuote()->getStoreId());
+                        $method .= ' - '.$allowedMethods[$methodCode];
+                    }
 
-                $defaultPrice = $methods['price'][$i];
-                $defaultPrice = Mage::helper('tax')->getShippingPrice($defaultPrice, false, false);
+                    $defaultPrice = $methods['price'][$i];
+                    $defaultPrice = Mage::helper('tax')->getShippingPrice($defaultPrice, false, false);
 
-                $xml .= <<
-                        {$defaultPrice}
-                    
+                    $allowedAreasXml = $this->_getAllowedCountries($carrier->getConfigData('sallowspecific'), $carrier->getConfigData('specificcountry'));
+
+                    $xml .= <<
+                            
+                                
+                                    {$allowedAreasXml}
+                                
+                            
+                            {$defaultPrice}
+                        
 EOT;
+                }
             }
         }
         $this->_shippingCalculated = true;
@@ -372,12 +416,12 @@ protected function _getMerchantCalculatedShippingXml()
 
     protected function _getPickupXml()
     {
-        if (!Mage::getStoreConfig('google/checkout_shipping_pickup/active')) {
+        if (!Mage::getStoreConfig('google/checkout_shipping_pickup/active', $this->getQuote()->getStoreId())) {
             return '';
         }
 
-        $title = Mage::getStoreConfig('google/checkout_shipping_pickup/title');
-        $price = Mage::getStoreConfig('google/checkout_shipping_pickup/price');
+        $title = Mage::getStoreConfig('google/checkout_shipping_pickup/title', $this->getQuote()->getStoreId());
+        $price = Mage::getStoreConfig('google/checkout_shipping_pickup/price', $this->getQuote()->getStoreId());
         $price = Mage::helper('tax')->getShippingPrice($price, false, false);
 
         $xml = <<_getCustomerTaxClass();
-        if ($shippingTaxClass = Mage::getStoreConfig(Mage_Tax_Model_Config::CONFIG_XML_PATH_SHIPPING_TAX_CLASS)) {
+        if ($shippingTaxClass = Mage::getStoreConfig(Mage_Tax_Model_Config::CONFIG_XML_PATH_SHIPPING_TAX_CLASS, $this->getQuote()->getStoreId())) {
             if (Mage::helper('tax')->getTaxBasedOn() == 'origin') {
                 $request = Mage::getSingleton('tax/calculation')->getRateRequest();
                 $request
diff --git a/app/code/core/Mage/GoogleCheckout/Model/Api/Xml/Order.php b/app/code/core/Mage/GoogleCheckout/Model/Api/Xml/Order.php
index 443d042d96..4e0757d553 100644
--- a/app/code/core/Mage/GoogleCheckout/Model/Api/Xml/Order.php
+++ b/app/code/core/Mage/GoogleCheckout/Model/Api/Xml/Order.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_GoogleCheckout
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -101,8 +107,13 @@ public function addTrackingData($carrier, $trackingNo)
 
     public function shipItems($items, $sendMail=true)
     {
+        $googleShipItems = array();
+        foreach ($items as $item) {
+            $googleShipItems[] = new GoogleShipItem($item);
+        }
+
         $response = $this->getGRequest()
-            ->SendShipItems($this->getGoogleOrderNumber(), $items, $sendMail?'true':'false');
+            ->SendShipItems($this->getGoogleOrderNumber(), $googleShipItems, $sendMail?'true':'false');
         return $this->_processGResponse($response);
     }
 
diff --git a/app/code/core/Mage/GoogleCheckout/Model/Mysql4/Api/Debug.php b/app/code/core/Mage/GoogleCheckout/Model/Mysql4/Api/Debug.php
index 83c2d91618..fa69b2f244 100644
--- a/app/code/core/Mage/GoogleCheckout/Model/Mysql4/Api/Debug.php
+++ b/app/code/core/Mage/GoogleCheckout/Model/Mysql4/Api/Debug.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Paygate
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/GoogleCheckout/Model/Mysql4/Api/Debug/Collection.php b/app/code/core/Mage/GoogleCheckout/Model/Mysql4/Api/Debug/Collection.php
index 76ba5e664e..a902831317 100644
--- a/app/code/core/Mage/GoogleCheckout/Model/Mysql4/Api/Debug/Collection.php
+++ b/app/code/core/Mage/GoogleCheckout/Model/Mysql4/Api/Debug/Collection.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_GoogleCheckout
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/GoogleCheckout/Model/Mysql4/Setup.php b/app/code/core/Mage/GoogleCheckout/Model/Mysql4/Setup.php
index 99c571d38d..94087326c5 100644
--- a/app/code/core/Mage/GoogleCheckout/Model/Mysql4/Setup.php
+++ b/app/code/core/Mage/GoogleCheckout/Model/Mysql4/Setup.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_GoogleCheckout
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/GoogleCheckout/Model/Mysql4/Tax.php b/app/code/core/Mage/GoogleCheckout/Model/Mysql4/Tax.php
index acaeaf8337..dcd0454b21 100644
--- a/app/code/core/Mage/GoogleCheckout/Model/Mysql4/Tax.php
+++ b/app/code/core/Mage/GoogleCheckout/Model/Mysql4/Tax.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_GoogleCheckout
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/GoogleCheckout/Model/Observer.php b/app/code/core/Mage/GoogleCheckout/Model/Observer.php
index 16da0588d4..1892dff93c 100644
--- a/app/code/core/Mage/GoogleCheckout/Model/Observer.php
+++ b/app/code/core/Mage/GoogleCheckout/Model/Observer.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_GoogleCheckout
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -41,4 +47,26 @@ public function salesOrderShipmentTrackSaveAfter(Varien_Event_Observer $observer
 
         $api->deliver($order->getExtOrderId(), $track->getCarrierCode(), $track->getNumber());
     }
+
+    public function salesOrderShipmentSaveAfter(Varien_Event_Observer $observer)
+    {
+        $googleShipmentNames = array('googlecheckout_carrier', 'googlecheckout_merchant', 'googlecheckout_flatrate', 'googlecheckout_pickup');
+
+        $shipment = $observer->getEvent()->getShipment();
+        $order = $shipment->getOrder();
+
+        if (!in_array($order->getShippingMethod(), $googleShipmentNames)) {
+            return;
+        }
+
+        $items = array();
+
+        foreach ($shipment->getAllItems() as $item) {
+            $items[] = $item->getSku();
+        }
+
+        if ($items) {
+            Mage::getModel('googlecheckout/api')->shipItems($order->getExtOrderId(), $items);
+        }
+    }
 }
diff --git a/app/code/core/Mage/GoogleCheckout/Model/Payment.php b/app/code/core/Mage/GoogleCheckout/Model/Payment.php
index 69d14bace3..df23de492b 100644
--- a/app/code/core/Mage/GoogleCheckout/Model/Payment.php
+++ b/app/code/core/Mage/GoogleCheckout/Model/Payment.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_GoogleCheckout
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -36,7 +42,7 @@ class Mage_GoogleCheckout_Model_Payment extends Mage_Payment_Model_Method_Abstra
     protected $_canRefund               = true;
     protected $_canVoid                 = true;
     protected $_canUseInternal          = false;
-    protected $_canUseCheckout          = true;
+    protected $_canUseCheckout          = false;
     protected $_canUseForMultishipping  = false;
 
     /**
@@ -144,12 +150,14 @@ public function void(Varien_Object $payment)
      */
     public function cancel(Varien_Object $payment)
     {
-        $hlp = Mage::helper('googlecheckout');
-        $reason = $this->getReason() ? $this->getReason() : $hlp->__('Unknown Reason');
-        $comment = $this->getComment() ? $this->getComment() : $hlp->__('No Comment');
+        if (!$payment->getOrder()->getBeingCanceledFromGoogleApi()) {
+            $hlp = Mage::helper('googlecheckout');
+            $reason = $this->getReason() ? $this->getReason() : $hlp->__('Unknown Reason');
+            $comment = $this->getComment() ? $this->getComment() : $hlp->__('No Comment');
 
-        $api = Mage::getModel('googlecheckout/api');
-        #$api->cancel($payment->getOrder()->getExtOrderId(), $reason, $comment);
+            $api = Mage::getModel('googlecheckout/api');
+            $api->cancel($payment->getOrder()->getExtOrderId(), $reason, $comment);
+        }
 
         return $this;
     }
diff --git a/app/code/core/Mage/GoogleCheckout/Model/Shipping.php b/app/code/core/Mage/GoogleCheckout/Model/Shipping.php
index bf02bd52ce..b6780c2986 100644
--- a/app/code/core/Mage/GoogleCheckout/Model/Shipping.php
+++ b/app/code/core/Mage/GoogleCheckout/Model/Shipping.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_GoogleCheckout
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/GoogleCheckout/Model/Source/Checkout/Image.php b/app/code/core/Mage/GoogleCheckout/Model/Source/Checkout/Image.php
index a1ceca2acd..0fc094da5c 100644
--- a/app/code/core/Mage/GoogleCheckout/Model/Source/Checkout/Image.php
+++ b/app/code/core/Mage/GoogleCheckout/Model/Source/Checkout/Image.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Adminhtml
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -23,17 +29,15 @@ class Mage_GoogleCheckout_Model_Source_Checkout_Image
 {
     public function toOptionArray()
     {
-        $hlp = Mage::helper('googlecheckout');
-
         $sizes = array(
-            '180/46' => $hlp->__('Large - %s', '180x46'),
-            '168/44' => $hlp->__('Medium - %s', '168x44'),
-            '160/43' => $hlp->__('Small - %s', '160x43'),
+            '180/46' => Mage::helper('googlecheckout')->__('Large - %s', '180x46'),
+            '168/44' => Mage::helper('googlecheckout')->__('Medium - %s', '168x44'),
+            '160/43' => Mage::helper('googlecheckout')->__('Small - %s', '160x43'),
         );
 
         $styles = array(
-            'trans' => $hlp->__('Transparent'),
-            'white'   => $hlp->__('White Background'),
+            'trans' => Mage::helper('googlecheckout')->__('Transparent'),
+            'white'   => Mage::helper('googlecheckout')->__('White Background'),
         );
 
         $options = array();
diff --git a/app/code/core/Mage/GoogleCheckout/Model/Source/Locale.php b/app/code/core/Mage/GoogleCheckout/Model/Source/Locale.php
index d0e5f1211a..cf2774a991 100644
--- a/app/code/core/Mage/GoogleCheckout/Model/Source/Locale.php
+++ b/app/code/core/Mage/GoogleCheckout/Model/Source/Locale.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Adminhtml
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -23,10 +29,9 @@ class Mage_GoogleCheckout_Model_Source_Locale
 {
     public function toOptionArray()
     {
-        $hlp = Mage::helper('googlecheckout');
         return array(
-            array('value'=>'en_US', 'label'=>$hlp->__('United States')),
-            array('value'=>'en_GB', 'label'=>$hlp->__('United Kingdom')),
+            array('value'=>'en_US', 'label'=>Mage::helper('googlecheckout')->__('United States')),
+            array('value'=>'en_GB', 'label'=>Mage::helper('googlecheckout')->__('United Kingdom')),
         );
     }
 }
\ No newline at end of file
diff --git a/app/code/core/Mage/GoogleCheckout/Model/Source/Shipping/Carrier.php b/app/code/core/Mage/GoogleCheckout/Model/Source/Shipping/Carrier.php
index 15d6b583de..3c2bc123c0 100644
--- a/app/code/core/Mage/GoogleCheckout/Model/Source/Shipping/Carrier.php
+++ b/app/code/core/Mage/GoogleCheckout/Model/Source/Shipping/Carrier.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Adminhtml
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/GoogleCheckout/Model/Source/Shipping/Category.php b/app/code/core/Mage/GoogleCheckout/Model/Source/Shipping/Category.php
index 812b476126..e4a33d114f 100644
--- a/app/code/core/Mage/GoogleCheckout/Model/Source/Shipping/Category.php
+++ b/app/code/core/Mage/GoogleCheckout/Model/Source/Shipping/Category.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Adminhtml
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/GoogleCheckout/Model/Source/Shipping/Units.php b/app/code/core/Mage/GoogleCheckout/Model/Source/Shipping/Units.php
index ec66982d65..b76ccce983 100644
--- a/app/code/core/Mage/GoogleCheckout/Model/Source/Shipping/Units.php
+++ b/app/code/core/Mage/GoogleCheckout/Model/Source/Shipping/Units.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Adminhtml
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/GoogleCheckout/controllers/ApiController.php b/app/code/core/Mage/GoogleCheckout/controllers/ApiController.php
index 0b7ce9a8f4..bf0856b39a 100644
--- a/app/code/core/Mage/GoogleCheckout/controllers/ApiController.php
+++ b/app/code/core/Mage/GoogleCheckout/controllers/ApiController.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_GoogleCheckout
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/GoogleCheckout/controllers/RedirectController.php b/app/code/core/Mage/GoogleCheckout/controllers/RedirectController.php
index 83c3f9ceec..fd73286cb4 100644
--- a/app/code/core/Mage/GoogleCheckout/controllers/RedirectController.php
+++ b/app/code/core/Mage/GoogleCheckout/controllers/RedirectController.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_GoogleCheckout
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -37,6 +43,21 @@ protected function _getApi ()
             $api->setError(true);
         }
 
+        $storeQuote = Mage::getModel('sales/quote')->setStoreId(Mage::app()->getStore()->getId());
+        $storeQuote->merge($session->getQuote());
+        $storeQuote
+            ->setItemsCount($session->getQuote()->getItemsCount())
+            ->setItemsQty($session->getQuote()->getItemsQty())
+            ->setChangedFlag(false);
+        $storeQuote->save();
+
+        $baseCurrency = $session->getQuote()->getBaseCurrencyCode();
+        $currency = Mage::app()->getStore($session->getQuote()->getStoreId())->getBaseCurrency();
+        $session->getQuote()
+            ->setForcedCurrency($currency)
+            ->collectTotals()
+            ->save();
+
         if (!$api->getError()) {
             $api = $api->setAnalyticsData($this->getRequest()->getPost('analyticsdata'))
                 ->checkout($session->getQuote());
@@ -45,6 +66,8 @@ protected function _getApi ()
             if ($api->getError()) {
                 Mage::getSingleton('checkout/session')->addError($api->getError());
             } else {
+                $session->replaceQuote($storeQuote);
+                Mage::getModel('checkout/cart')->init()->save();
                 if (Mage::getStoreConfigFlag('google/checkout/hide_cart_contents')) {
                     $session->setGoogleCheckoutQuoteId($session->getQuoteId());
                     $session->unsQuoteId();
diff --git a/app/code/core/Mage/GoogleCheckout/etc/config.xml b/app/code/core/Mage/GoogleCheckout/etc/config.xml
index d9eb043e23..31ed3e203f 100644
--- a/app/code/core/Mage/GoogleCheckout/etc/config.xml
+++ b/app/code/core/Mage/GoogleCheckout/etc/config.xml
@@ -13,6 +13,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category    Mage
  * @package    Mage_GoogleCheckout
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -151,6 +157,15 @@ Something like this is to be added to resolve bug #4890
                     
                 
             
+            
+                
+                    
+                        model
+                        googlecheckout/observer
+                        salesOrderShipmentSaveAfter
+                    
+                
+            
         
     
 
@@ -171,6 +186,7 @@ Something like this is to be added to resolve bug #4890
             
                 
                 
+                0
             
             
                 COMMERCIAL
@@ -179,6 +195,11 @@ Something like this is to be added to resolve bug #4890
                 10
                 10
             
+            
+                0
+                0
+                0
+            
         
     
     
diff --git a/app/code/core/Mage/GoogleCheckout/etc/system.xml b/app/code/core/Mage/GoogleCheckout/etc/system.xml
index f1b1aab1ca..5b3a382f57 100644
--- a/app/code/core/Mage/GoogleCheckout/etc/system.xml
+++ b/app/code/core/Mage/GoogleCheckout/etc/system.xml
@@ -13,6 +13,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_GoogleAnalytics
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -57,6 +63,16 @@
                             1
                             0
                         
+                        
+                            
+                            select
+                            adminhtml/system_config_source_yesno
+                            13
+                            1
+                            1
+                            0
+                            Required for live Google Checkout transactions.
+                        
                         
                             
                             select
@@ -119,7 +135,7 @@
                             1
                             0
                         
-                        
+                        
                             
                             If enabled, cart contents will be hidden after clicking on the Google Checkout button in the shopping cart, and restored if "Edit Cart" link was activated.
                             select
@@ -140,7 +156,7 @@
                     1
                     0
                     
-                        
+                        
                             
                             select
                             adminhtml/system_config_source_yesno
@@ -149,7 +165,7 @@
                             1
                             0
                         
-                        
+                        
                             
                             select
                             googlecheckout/adminhtml_shipping_merchant
@@ -170,7 +186,7 @@
                     1
                     0
                     
-                        
+                        
                             
                             select
                             adminhtml/system_config_source_yesno
@@ -179,7 +195,7 @@
                             1
                             0
                         
-                        
+                        
                             
                             multiselect
                             googlecheckout/source_shipping_carrier
@@ -188,7 +204,7 @@
                             1
                             0
                         
-                        
+                        
                             
                             select
                             googlecheckout/source_shipping_category
@@ -197,7 +213,7 @@
                             1
                             0
                         
-                        
+                        
                             
                             text
                             30
@@ -205,7 +221,7 @@
                             1
                             0
                         
-                        
+                        
                             
                             text
                             40
@@ -213,7 +229,7 @@
                             1
                             0
                         
-                        
+                        
                             
                             text
                             50
@@ -221,7 +237,7 @@
                             1
                             0
                         
-                        
+                        
                             
                             text
                             60
@@ -276,7 +292,7 @@
                     1
                     0
                     
-                        
+                        
                             
                             select
                             adminhtml/system_config_source_yesno
@@ -285,7 +301,7 @@
                             1
                             0
                         
-                        
+                        
                             
                             text
                             20
@@ -293,7 +309,7 @@
                             1
                             0
                         
-                        
+                        
                             
                             text
                             22
@@ -301,7 +317,29 @@
                             1
                             0
                         
-                        
+
+                        
+                            
+                            select
+                            24
+                            shipping-applicable-country
+                            adminhtml/system_config_source_shipping_allspecificcountries
+                            1
+                            1
+                            0
+                        
+                        
+                            
+                            multiselect
+                            26
+                            adminhtml/system_config_source_country
+                            1
+                            1
+                            0
+                        
+
+
+                        
                             
                             text
                             30
@@ -309,7 +347,7 @@
                             1
                             0
                         
-                        
+                        
                             
                             text
                             32
@@ -317,7 +355,29 @@
                             1
                             0
                         
-                        
+
+                        
+                            
+                            select
+                            34
+                            shipping-applicable-country-2
+                            adminhtml/system_config_source_shipping_allspecificcountries
+                            1
+                            1
+                            0
+                        
+                        
+                            
+                            multiselect
+                            36
+                            adminhtml/system_config_source_country
+                            1
+                            1
+                            0
+                        
+
+
+                        
                             
                             text
                             40
@@ -325,7 +385,7 @@
                             1
                             0
                         
-                        
+                        
                             
                             text
                             42
@@ -333,6 +393,25 @@
                             1
                             0
                         
+                        
+                            
+                            select
+                            44
+                            shipping-applicable-country-3
+                            adminhtml/system_config_source_shipping_allspecificcountries
+                            1
+                            1
+                            0
+                        
+                        
+                            
+                            multiselect
+                            46
+                            adminhtml/system_config_source_country
+                            1
+                            1
+                            0
+                        
                     
                 
             
diff --git a/app/code/core/Mage/GoogleCheckout/sql/googlecheckout_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/GoogleCheckout/sql/googlecheckout_setup/mysql4-install-0.7.0.php
index ca872739c8..413c72585e 100644
--- a/app/code/core/Mage/GoogleCheckout/sql/googlecheckout_setup/mysql4-install-0.7.0.php
+++ b/app/code/core/Mage/GoogleCheckout/sql/googlecheckout_setup/mysql4-install-0.7.0.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_GoogleCheckout
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Install/Block/Abstract.php b/app/code/core/Mage/Install/Block/Abstract.php
index 5210035b6c..8e6fc1d14f 100644
--- a/app/code/core/Mage/Install/Block/Abstract.php
+++ b/app/code/core/Mage/Install/Block/Abstract.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Install
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Install/Block/Admin.php b/app/code/core/Mage/Install/Block/Admin.php
index 3602796c42..92f20a4941 100644
--- a/app/code/core/Mage/Install/Block/Admin.php
+++ b/app/code/core/Mage/Install/Block/Admin.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Install
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Install/Block/Begin.php b/app/code/core/Mage/Install/Block/Begin.php
index 915915cc0a..83f6734935 100644
--- a/app/code/core/Mage/Install/Block/Begin.php
+++ b/app/code/core/Mage/Install/Block/Begin.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Install
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Install/Block/Config.php b/app/code/core/Mage/Install/Block/Config.php
index 3b1dd3f00f..d58a7cf1ed 100644
--- a/app/code/core/Mage/Install/Block/Config.php
+++ b/app/code/core/Mage/Install/Block/Config.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Install
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Install/Block/Download.php b/app/code/core/Mage/Install/Block/Download.php
index 23225a5e51..2d330e2b75 100644
--- a/app/code/core/Mage/Install/Block/Download.php
+++ b/app/code/core/Mage/Install/Block/Download.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Install
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Install/Block/End.php b/app/code/core/Mage/Install/Block/End.php
index 393771e5d6..cae0299738 100644
--- a/app/code/core/Mage/Install/Block/End.php
+++ b/app/code/core/Mage/Install/Block/End.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Install
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Install/Block/Locale.php b/app/code/core/Mage/Install/Block/Locale.php
index 1ff5bbb6c8..304eed4af3 100644
--- a/app/code/core/Mage/Install/Block/Locale.php
+++ b/app/code/core/Mage/Install/Block/Locale.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Install
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Install/Block/State.php b/app/code/core/Mage/Install/Block/State.php
index c8f42d8af8..aa482baf16 100644
--- a/app/code/core/Mage/Install/Block/State.php
+++ b/app/code/core/Mage/Install/Block/State.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Install
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Install/Controller/Action.php b/app/code/core/Mage/Install/Controller/Action.php
index 4b9cdfbdf1..91fa5960a8 100644
--- a/app/code/core/Mage/Install/Controller/Action.php
+++ b/app/code/core/Mage/Install/Controller/Action.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Adminhtml
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Install/Helper/Data.php b/app/code/core/Mage/Install/Helper/Data.php
index ab2504e4de..b69031f950 100644
--- a/app/code/core/Mage/Install/Helper/Data.php
+++ b/app/code/core/Mage/Install/Helper/Data.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Install
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Install/Model/Config.php b/app/code/core/Mage/Install/Model/Config.php
index e59669e17f..362ad5b6b4 100644
--- a/app/code/core/Mage/Install/Model/Config.php
+++ b/app/code/core/Mage/Install/Model/Config.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Install
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Install/Model/Installer.php b/app/code/core/Mage/Install/Model/Installer.php
index e5bf10b2d8..680e98ad6b 100644
--- a/app/code/core/Mage/Install/Model/Installer.php
+++ b/app/code/core/Mage/Install/Model/Installer.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Install
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Install/Model/Installer/Abstract.php b/app/code/core/Mage/Install/Model/Installer/Abstract.php
index 5212427758..8ccbda00e1 100644
--- a/app/code/core/Mage/Install/Model/Installer/Abstract.php
+++ b/app/code/core/Mage/Install/Model/Installer/Abstract.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Install
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Install/Model/Installer/Config.php b/app/code/core/Mage/Install/Model/Installer/Config.php
index 2519996015..df7dc4860b 100644
--- a/app/code/core/Mage/Install/Model/Installer/Config.php
+++ b/app/code/core/Mage/Install/Model/Installer/Config.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Install
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Install/Model/Installer/Console.php b/app/code/core/Mage/Install/Model/Installer/Console.php
index d1d10f0f04..685a19ad61 100644
--- a/app/code/core/Mage/Install/Model/Installer/Console.php
+++ b/app/code/core/Mage/Install/Model/Installer/Console.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Install
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Install/Model/Installer/Data.php b/app/code/core/Mage/Install/Model/Installer/Data.php
index b1f2a84595..e7b324af1e 100644
--- a/app/code/core/Mage/Install/Model/Installer/Data.php
+++ b/app/code/core/Mage/Install/Model/Installer/Data.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Install
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Install/Model/Installer/Db.php b/app/code/core/Mage/Install/Model/Installer/Db.php
index 03688eef22..d0dfd56b01 100644
--- a/app/code/core/Mage/Install/Model/Installer/Db.php
+++ b/app/code/core/Mage/Install/Model/Installer/Db.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Install
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Install/Model/Installer/Env.php b/app/code/core/Mage/Install/Model/Installer/Env.php
index a13e5b02ca..fa3015cc3f 100644
--- a/app/code/core/Mage/Install/Model/Installer/Env.php
+++ b/app/code/core/Mage/Install/Model/Installer/Env.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Install
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Install/Model/Installer/Filesystem.php b/app/code/core/Mage/Install/Model/Installer/Filesystem.php
index 7e5bfab622..aedb74bae3 100644
--- a/app/code/core/Mage/Install/Model/Installer/Filesystem.php
+++ b/app/code/core/Mage/Install/Model/Installer/Filesystem.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Install
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Install/Model/Installer/Pear.php b/app/code/core/Mage/Install/Model/Installer/Pear.php
index ef576b0e7f..a089489041 100644
--- a/app/code/core/Mage/Install/Model/Installer/Pear.php
+++ b/app/code/core/Mage/Install/Model/Installer/Pear.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Install
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Install/Model/Observer.php b/app/code/core/Mage/Install/Model/Observer.php
index b29321d4f0..438e1ed8f6 100644
--- a/app/code/core/Mage/Install/Model/Observer.php
+++ b/app/code/core/Mage/Install/Model/Observer.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Install
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Install/Model/Session.php b/app/code/core/Mage/Install/Model/Session.php
index b96adc0abe..00f131bd1e 100644
--- a/app/code/core/Mage/Install/Model/Session.php
+++ b/app/code/core/Mage/Install/Model/Session.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Install
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Install/Model/Wizard.php b/app/code/core/Mage/Install/Model/Wizard.php
index c9bd8936e1..cc3786ffea 100644
--- a/app/code/core/Mage/Install/Model/Wizard.php
+++ b/app/code/core/Mage/Install/Model/Wizard.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Install
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Install/controllers/IndexController.php b/app/code/core/Mage/Install/controllers/IndexController.php
index d63510446c..31dd80d4eb 100644
--- a/app/code/core/Mage/Install/controllers/IndexController.php
+++ b/app/code/core/Mage/Install/controllers/IndexController.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Install
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Install/controllers/WizardController.php b/app/code/core/Mage/Install/controllers/WizardController.php
index 5ef86e8992..b191e6fde1 100644
--- a/app/code/core/Mage/Install/controllers/WizardController.php
+++ b/app/code/core/Mage/Install/controllers/WizardController.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Install
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Install/etc/config.xml b/app/code/core/Mage/Install/etc/config.xml
index ca68bdde7c..de5bb79d10 100644
--- a/app/code/core/Mage/Install/etc/config.xml
+++ b/app/code/core/Mage/Install/etc/config.xml
@@ -13,6 +13,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Install
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Install/etc/install.xml b/app/code/core/Mage/Install/etc/install.xml
index 99888fa9ae..bf5b5c1a48 100644
--- a/app/code/core/Mage/Install/etc/install.xml
+++ b/app/code/core/Mage/Install/etc/install.xml
@@ -13,6 +13,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Install
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Log/Helper/Data.php b/app/code/core/Mage/Log/Helper/Data.php
index 70320b6c8a..c12fb105e4 100644
--- a/app/code/core/Mage/Log/Helper/Data.php
+++ b/app/code/core/Mage/Log/Helper/Data.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Log
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Log/Model/Aggregation.php b/app/code/core/Mage/Log/Model/Aggregation.php
index f89bf58efb..114debc6da 100644
--- a/app/code/core/Mage/Log/Model/Aggregation.php
+++ b/app/code/core/Mage/Log/Model/Aggregation.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Log
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Log/Model/Customer.php b/app/code/core/Mage/Log/Model/Customer.php
index 457aeb1464..27abcf1ad6 100644
--- a/app/code/core/Mage/Log/Model/Customer.php
+++ b/app/code/core/Mage/Log/Model/Customer.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Log
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Log/Model/Mysql4/Aggregation.php b/app/code/core/Mage/Log/Model/Mysql4/Aggregation.php
index 838a6f5a37..e7ff230791 100644
--- a/app/code/core/Mage/Log/Model/Mysql4/Aggregation.php
+++ b/app/code/core/Mage/Log/Model/Mysql4/Aggregation.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Log
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Log/Model/Mysql4/Customer.php b/app/code/core/Mage/Log/Model/Mysql4/Customer.php
index ffe71ec813..61c7402e0d 100644
--- a/app/code/core/Mage/Log/Model/Mysql4/Customer.php
+++ b/app/code/core/Mage/Log/Model/Mysql4/Customer.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Log
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Log/Model/Mysql4/Visitor.php b/app/code/core/Mage/Log/Model/Mysql4/Visitor.php
index 0f0f91d38a..1883664f66 100644
--- a/app/code/core/Mage/Log/Model/Mysql4/Visitor.php
+++ b/app/code/core/Mage/Log/Model/Mysql4/Visitor.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Log
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Log/Model/Mysql4/Visitor/Aggregator.php b/app/code/core/Mage/Log/Model/Mysql4/Visitor/Aggregator.php
index 9e11ac6c1a..607dc0395c 100644
--- a/app/code/core/Mage/Log/Model/Mysql4/Visitor/Aggregator.php
+++ b/app/code/core/Mage/Log/Model/Mysql4/Visitor/Aggregator.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Log
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Log/Model/Mysql4/Visitor/Collection.php b/app/code/core/Mage/Log/Model/Mysql4/Visitor/Collection.php
index 14d0d5443d..eb0c460849 100644
--- a/app/code/core/Mage/Log/Model/Mysql4/Visitor/Collection.php
+++ b/app/code/core/Mage/Log/Model/Mysql4/Visitor/Collection.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Log
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Log/Model/Visitor.php b/app/code/core/Mage/Log/Model/Visitor.php
index 61a374ff92..5d8527f3b9 100644
--- a/app/code/core/Mage/Log/Model/Visitor.php
+++ b/app/code/core/Mage/Log/Model/Visitor.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Log
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Log/Model/Visitor/Aggregator.php b/app/code/core/Mage/Log/Model/Visitor/Aggregator.php
index 9f015ab897..c3208127a0 100644
--- a/app/code/core/Mage/Log/Model/Visitor/Aggregator.php
+++ b/app/code/core/Mage/Log/Model/Visitor/Aggregator.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Log
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Log/etc/config.xml b/app/code/core/Mage/Log/etc/config.xml
index 84a0846c34..995f7878cc 100644
--- a/app/code/core/Mage/Log/etc/config.xml
+++ b/app/code/core/Mage/Log/etc/config.xml
@@ -13,6 +13,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Log
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Log/sql/log_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/Log/sql/log_setup/mysql4-install-0.7.0.php
index e9d5778475..97ffbaf732 100644
--- a/app/code/core/Mage/Log/sql/log_setup/mysql4-install-0.7.0.php
+++ b/app/code/core/Mage/Log/sql/log_setup/mysql4-install-0.7.0.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Log
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Log/sql/log_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/Log/sql/log_setup/mysql4-upgrade-0.7.0-0.7.1.php
index 1aeecec586..543651fb04 100644
--- a/app/code/core/Mage/Log/sql/log_setup/mysql4-upgrade-0.7.0-0.7.1.php
+++ b/app/code/core/Mage/Log/sql/log_setup/mysql4-upgrade-0.7.0-0.7.1.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Log
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Log/sql/log_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/Log/sql/log_setup/mysql4-upgrade-0.7.1-0.7.2.php
index e5d37ff312..5185da47ff 100644
--- a/app/code/core/Mage/Log/sql/log_setup/mysql4-upgrade-0.7.1-0.7.2.php
+++ b/app/code/core/Mage/Log/sql/log_setup/mysql4-upgrade-0.7.1-0.7.2.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Log
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Media/Helper/Data.php b/app/code/core/Mage/Media/Helper/Data.php
index 9ab42ec68b..05a609bbd7 100644
--- a/app/code/core/Mage/Media/Helper/Data.php
+++ b/app/code/core/Mage/Media/Helper/Data.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Media
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Media/Model/File/Image.php b/app/code/core/Mage/Media/Model/File/Image.php
index c64cb44100..2f33e53c8a 100644
--- a/app/code/core/Mage/Media/Model/File/Image.php
+++ b/app/code/core/Mage/Media/Model/File/Image.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Media
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Media/Model/Image.php b/app/code/core/Mage/Media/Model/Image.php
index eaee89a812..6ac141278e 100644
--- a/app/code/core/Mage/Media/Model/Image.php
+++ b/app/code/core/Mage/Media/Model/Image.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Media
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Media/Model/Image/Config/Interface.php b/app/code/core/Mage/Media/Model/Image/Config/Interface.php
index cea265b311..c167d02b78 100644
--- a/app/code/core/Mage/Media/Model/Image/Config/Interface.php
+++ b/app/code/core/Mage/Media/Model/Image/Config/Interface.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Media
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Media/etc/config.xml b/app/code/core/Mage/Media/etc/config.xml
index 8fc497d27f..4b12b8ce5d 100644
--- a/app/code/core/Mage/Media/etc/config.xml
+++ b/app/code/core/Mage/Media/etc/config.xml
@@ -13,6 +13,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_GiftMessage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Newsletter/Block/Subscribe.php b/app/code/core/Mage/Newsletter/Block/Subscribe.php
index 987892f25e..5f572f58f4 100644
--- a/app/code/core/Mage/Newsletter/Block/Subscribe.php
+++ b/app/code/core/Mage/Newsletter/Block/Subscribe.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Newsletter
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Newsletter/Helper/Data.php b/app/code/core/Mage/Newsletter/Helper/Data.php
index 5a97b5c17a..68e63518f3 100644
--- a/app/code/core/Mage/Newsletter/Helper/Data.php
+++ b/app/code/core/Mage/Newsletter/Helper/Data.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Newsletter
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Newsletter/Model/Message.php b/app/code/core/Mage/Newsletter/Model/Message.php
index 6251fc84f0..4594903101 100644
--- a/app/code/core/Mage/Newsletter/Model/Message.php
+++ b/app/code/core/Mage/Newsletter/Model/Message.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Newsletter
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Newsletter/Model/Mysql4/Problem.php b/app/code/core/Mage/Newsletter/Model/Mysql4/Problem.php
index c1ade9ccc5..704e736f00 100644
--- a/app/code/core/Mage/Newsletter/Model/Mysql4/Problem.php
+++ b/app/code/core/Mage/Newsletter/Model/Mysql4/Problem.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Newsletter
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Newsletter/Model/Mysql4/Problem/Collection.php b/app/code/core/Mage/Newsletter/Model/Mysql4/Problem/Collection.php
index 4545a72340..d87d1072eb 100644
--- a/app/code/core/Mage/Newsletter/Model/Mysql4/Problem/Collection.php
+++ b/app/code/core/Mage/Newsletter/Model/Mysql4/Problem/Collection.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Newsletter
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Newsletter/Model/Mysql4/Queue.php b/app/code/core/Mage/Newsletter/Model/Mysql4/Queue.php
index aaee1dd4c9..a0583ffbaf 100644
--- a/app/code/core/Mage/Newsletter/Model/Mysql4/Queue.php
+++ b/app/code/core/Mage/Newsletter/Model/Mysql4/Queue.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Newsletter
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Newsletter/Model/Mysql4/Queue/Collection.php b/app/code/core/Mage/Newsletter/Model/Mysql4/Queue/Collection.php
index 027c99d64d..bc8701d8eb 100644
--- a/app/code/core/Mage/Newsletter/Model/Mysql4/Queue/Collection.php
+++ b/app/code/core/Mage/Newsletter/Model/Mysql4/Queue/Collection.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Newsletter
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Newsletter/Model/Mysql4/Subscriber.php b/app/code/core/Mage/Newsletter/Model/Mysql4/Subscriber.php
index 3926fb12cb..44e028232e 100644
--- a/app/code/core/Mage/Newsletter/Model/Mysql4/Subscriber.php
+++ b/app/code/core/Mage/Newsletter/Model/Mysql4/Subscriber.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Newsletter
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Newsletter/Model/Mysql4/Subscriber/Collection.php b/app/code/core/Mage/Newsletter/Model/Mysql4/Subscriber/Collection.php
index b3b827c0dd..c6e46edcd9 100644
--- a/app/code/core/Mage/Newsletter/Model/Mysql4/Subscriber/Collection.php
+++ b/app/code/core/Mage/Newsletter/Model/Mysql4/Subscriber/Collection.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Newsletter
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Newsletter/Model/Mysql4/Template.php b/app/code/core/Mage/Newsletter/Model/Mysql4/Template.php
index e90c16e85a..d2a9893f3b 100644
--- a/app/code/core/Mage/Newsletter/Model/Mysql4/Template.php
+++ b/app/code/core/Mage/Newsletter/Model/Mysql4/Template.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Newsletter
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Newsletter/Model/Mysql4/Template/Collection.php b/app/code/core/Mage/Newsletter/Model/Mysql4/Template/Collection.php
index bdf420e8f1..b1e2c3190e 100644
--- a/app/code/core/Mage/Newsletter/Model/Mysql4/Template/Collection.php
+++ b/app/code/core/Mage/Newsletter/Model/Mysql4/Template/Collection.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Newsletter
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Newsletter/Model/Observer.php b/app/code/core/Mage/Newsletter/Model/Observer.php
index 7b6de7f5a3..b6ecd9b913 100644
--- a/app/code/core/Mage/Newsletter/Model/Observer.php
+++ b/app/code/core/Mage/Newsletter/Model/Observer.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Newsletter
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Newsletter/Model/Problem.php b/app/code/core/Mage/Newsletter/Model/Problem.php
index a48a545974..5a1437bdf7 100644
--- a/app/code/core/Mage/Newsletter/Model/Problem.php
+++ b/app/code/core/Mage/Newsletter/Model/Problem.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Newsletter
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Newsletter/Model/Queue.php b/app/code/core/Mage/Newsletter/Model/Queue.php
index c5b9093853..ded71f03fa 100644
--- a/app/code/core/Mage/Newsletter/Model/Queue.php
+++ b/app/code/core/Mage/Newsletter/Model/Queue.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Newsletter
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Newsletter/Model/Session.php b/app/code/core/Mage/Newsletter/Model/Session.php
index bb966fadc4..6f7ac54fe3 100644
--- a/app/code/core/Mage/Newsletter/Model/Session.php
+++ b/app/code/core/Mage/Newsletter/Model/Session.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Newsletter
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Newsletter/Model/Subscriber.php b/app/code/core/Mage/Newsletter/Model/Subscriber.php
index 4eeb4cdcee..005af35ada 100644
--- a/app/code/core/Mage/Newsletter/Model/Subscriber.php
+++ b/app/code/core/Mage/Newsletter/Model/Subscriber.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Newsletter
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -77,11 +83,11 @@ public function getCode()
      * @return string
      */
     public function getConfirmationLink() {
-    	return Mage::helper('newsletter')->getConfirmationUrl($this);
+        return Mage::helper('newsletter')->getConfirmationUrl($this);
     }
 
     public function getUnsubscriptionLink() {
-    	return Mage::helper('newsletter')->getUnsubscribeUrl($this);
+        return Mage::helper('newsletter')->getUnsubscribeUrl($this);
     }
 
 
@@ -155,8 +161,8 @@ public function setEmail($value)
      */
     public function setIsStatusChanged($value)
     {
-    	$this->_isStatusChanged = (boolean) $value;
-   		return $this;
+        $this->_isStatusChanged = (boolean) $value;
+           return $this;
     }
 
     /**
@@ -166,7 +172,7 @@ public function setIsStatusChanged($value)
      */
     public function getIsStatusChanged()
     {
-    	return $this->_isStatusChanged;
+        return $this->_isStatusChanged;
     }
 
     /**
@@ -176,11 +182,11 @@ public function getIsStatusChanged()
      */
     public function isSubscribed()
     {
-    	if($this->getId() && $this->getStatus()==self::STATUS_SUBSCRIBED) {
-    		return true;
-    	}
+        if($this->getId() && $this->getStatus()==self::STATUS_SUBSCRIBED) {
+            return true;
+        }
 
-    	return false;
+        return false;
     }
 
     /**
@@ -270,38 +276,42 @@ public function randomSequence($length=32)
 
     public function subscribe($email)
     {
-    	$this->loadByEmail($email);
-    	$customer = Mage::getModel('customer/customer')->loadByEmail($email);
-    	$isNewSubscriber = false;
-
-    	$customerSession = Mage::getSingleton('customer/session');
-
-    	if(!$this->getId()) {
-    	    $this->setSubscriberConfirmCode($this->randomSequence());
-    	}
-
-    	if(($this->getCustomerId() && !$customerSession->isLoggedIn())
-    	   || ($this->getCustomerId()
-    	       && $customerSession->getCustomerId() != $this->getCustomerId()
-    	       )) {
-    	    return $this->getSubscriberStatus();
-    	}
-
-    	if (!$this->getId() || $this->getStatus()==self::STATUS_UNSUBSCRIBED || $this->getStatus()==self::STATUS_NOT_ACTIVE) {
-    		if (Mage::getStoreConfig(self::XML_PATH_CONFIRMATION_FLAG) == 1) {
-    		    $this->setStatus(self::STATUS_NOT_ACTIVE);
-    		} else {
-    			$this->setStatus(self::STATUS_SUBSCRIBED);
-    		}
-    		$this->setSubscriberEmail($email);
-    	}
+        $this->loadByEmail($email);
+        $customer = Mage::getModel('customer/customer')
+           ->setWebsiteId(Mage::app()->getStore()->getWebsiteId())
+           ->loadByEmail($email);
+        $isNewSubscriber = false;
+
+        $customerSession = Mage::getSingleton('customer/session');
+
+        if(!$this->getId()) {
+            $this->setSubscriberConfirmCode($this->randomSequence());
+        }
+
+        if(($this->getCustomerId() && !$customerSession->isLoggedIn())
+           || ($this->getCustomerId()
+               && $customerSession->getCustomerId() != $this->getCustomerId()
+               )) {
+            return $this->getSubscriberStatus();
+        }
+
+        if (!$this->getId() || $this->getStatus()==self::STATUS_UNSUBSCRIBED || $this->getStatus()==self::STATUS_NOT_ACTIVE) {
+            if (Mage::getStoreConfig(self::XML_PATH_CONFIRMATION_FLAG) == 1) {
+                $this->setStatus(self::STATUS_NOT_ACTIVE);
+            } else {
+                $this->setStatus(self::STATUS_SUBSCRIBED);
+            }
+            $this->setSubscriberEmail($email);
+        }
 
         if ($customerSession->isLoggedIn()) {
             $this->setStoreId($customerSession->getCustomer()->getStoreId());
             $this->setStatus(self::STATUS_SUBSCRIBED);
             $this->setCustomerId($customerSession->getCustomerId());
         } else if ($customer->getId()) {
-            return $this->getStatus();
+            $this->setStoreId($customer->getStoreId());
+            $this->setSubscriberStatus(self::STATUS_SUBSCRIBED);
+            $this->setCustomerId($customer->getId());
         } else {
             $this->setStoreId(Mage::app()->getStore()->getId());
             $this->setCustomerId(0);
@@ -311,29 +321,29 @@ public function subscribe($email)
         $this->setIsStatusChanged(true);
 
         try {
-        	$this->save();
-	        if (Mage::getStoreConfig(self::XML_PATH_CONFIRMATION_FLAG) == 1
-	           && $this->getSubscriberStatus()==self::STATUS_NOT_ACTIVE) {
-	       		$this->sendConfirmationRequestEmail();
-	        } else {
-	        	$this->sendConfirmationSuccessEmail();
-	        }
-
-        	return $this->getStatus();
+            $this->save();
+            if (Mage::getStoreConfig(self::XML_PATH_CONFIRMATION_FLAG) == 1
+               && $this->getSubscriberStatus()==self::STATUS_NOT_ACTIVE) {
+                   $this->sendConfirmationRequestEmail();
+            } else {
+                $this->sendConfirmationSuccessEmail();
+            }
+
+            return $this->getStatus();
         } catch (Exception $e) {
-        	throw new Exception($e->getMessage());
+            throw new Exception($e->getMessage());
         }
     }
 
     public function unsubscribe()
     {
-	    if ($this->hasCheckCode() && $this->getCode() != $this->getCheckCode()) {
-	        Mage::throwException(Mage::helper('newsletter')->__('Invalid subscription confirmation code'));
-	    }
+        if ($this->hasCheckCode() && $this->getCode() != $this->getCheckCode()) {
+            Mage::throwException(Mage::helper('newsletter')->__('Invalid subscription confirmation code'));
+        }
 
-		$this->setSubscriberStatus(self::STATUS_UNSUBSCRIBED)->save();
-		$this->sendUnsubscriptionEmail();
-		return $this;
+        $this->setSubscriberStatus(self::STATUS_UNSUBSCRIBED)->save();
+        $this->sendUnsubscriptionEmail();
+        return $this;
     }
 
     /**
@@ -353,8 +363,8 @@ public function subscribeCustomer($customer)
         }
 
         if(!$this->getId()) {
-    	    $this->setSubscriberConfirmCode($this->randomSequence());
-    	}
+            $this->setSubscriberConfirmCode($this->randomSequence());
+        }
 
         if($customer->hasIsSubscribed()) {
             $status = $customer->getIsSubscribed() ? self::STATUS_SUBSCRIBED : self::STATUS_UNSUBSCRIBED;
@@ -380,10 +390,13 @@ public function subscribeCustomer($customer)
         }
 
         $this->save();
-        if ($this->getIsStatusChanged() && $status == self::STATUS_UNSUBSCRIBED) {
-            $this->sendUnsubscriptionEmail();
-        } elseif ($this->getIsStatusChanged() && $status == self::STATUS_SUBSCRIBED) {
-            $this->sendConfirmationSuccessEmail();
+        $sendSubscription = $customer->getData('sendSubscription');
+        if (is_null($sendSubscription) xor $sendSubscription) {
+            if ($this->getIsStatusChanged() && $status == self::STATUS_UNSUBSCRIBED) {
+                $this->sendUnsubscriptionEmail();
+            } elseif ($this->getIsStatusChanged() && $status == self::STATUS_SUBSCRIBED) {
+                $this->sendConfirmationSuccessEmail();
+            }
         }
         return $this;
     }
@@ -396,14 +409,14 @@ public function subscribeCustomer($customer)
      */
     public function confirm($code)
     {
-    	if($this->getCode()==$code) {
-    		$this->setStatus(self::STATUS_SUBSCRIBED)
-    			->setIsStatusChanged(true)
-    			->save();
-    		return true;
-    	}
-
-    	return false;
+        if($this->getCode()==$code) {
+            $this->setStatus(self::STATUS_SUBSCRIBED)
+                ->setIsStatusChanged(true)
+                ->save();
+            return true;
+        }
+
+        return false;
     }
 
     /**
@@ -414,8 +427,8 @@ public function confirm($code)
      */
     public function received(Mage_Newsletter_Model_Queue $queue)
     {
-    	$this->getResource()->received($this,$queue);
-    	return $this;
+        $this->getResource()->received($this,$queue);
+        return $this;
     }
 
     public function sendConfirmationRequestEmail()
@@ -428,18 +441,18 @@ public function sendConfirmationRequestEmail()
         /* @var $translate Mage_Core_Model_Translate */
         $translate->setTranslateInline(false);
 
-    	Mage::getModel('core/email_template')
-    		->sendTransactional(
-    		    Mage::getStoreConfig(self::XML_PATH_CONFIRM_EMAIL_TEMPLATE),
-    		    Mage::getStoreConfig(self::XML_PATH_CONFIRM_EMAIL_IDENTITY),
-    		    $this->getEmail(),
-    		    $this->getName(),
-    		    array('subscriber'=>$this)
-		    );
+        Mage::getModel('core/email_template')
+            ->sendTransactional(
+                Mage::getStoreConfig(self::XML_PATH_CONFIRM_EMAIL_TEMPLATE),
+                Mage::getStoreConfig(self::XML_PATH_CONFIRM_EMAIL_IDENTITY),
+                $this->getEmail(),
+                $this->getName(),
+                array('subscriber'=>$this)
+            );
 
-	    $translate->setTranslateInline(true);
+        $translate->setTranslateInline(true);
 
-    	return $this;
+        return $this;
     }
 
     public function sendConfirmationSuccessEmail()
@@ -452,18 +465,18 @@ public function sendConfirmationSuccessEmail()
         /* @var $translate Mage_Core_Model_Translate */
         $translate->setTranslateInline(false);
 
-    	Mage::getModel('core/email_template')
-    		->sendTransactional(
-    		    Mage::getStoreConfig(self::XML_PATH_SUCCESS_EMAIL_TEMPLATE),
-    		    Mage::getStoreConfig(self::XML_PATH_SUCCESS_EMAIL_IDENTITY),
-    		    $this->getEmail(),
-    		    $this->getName(),
-    		    array('subscriber'=>$this)
-		    );
+        Mage::getModel('core/email_template')
+            ->sendTransactional(
+                Mage::getStoreConfig(self::XML_PATH_SUCCESS_EMAIL_TEMPLATE),
+                Mage::getStoreConfig(self::XML_PATH_SUCCESS_EMAIL_IDENTITY),
+                $this->getEmail(),
+                $this->getName(),
+                array('subscriber'=>$this)
+            );
 
-	    $translate->setTranslateInline(true);
+        $translate->setTranslateInline(true);
 
-    	return $this;
+        return $this;
     }
 
     public function sendUnsubscriptionEmail()
@@ -477,16 +490,16 @@ public function sendUnsubscriptionEmail()
         $translate->setTranslateInline(false);
 
         Mage::getModel('core/email_template')
-    		->sendTransactional(
-    		    Mage::getStoreConfig(self::XML_PATH_UNSUBSCRIBE_EMAIL_TEMPLATE),
-    		    Mage::getStoreConfig(self::XML_PATH_UNSUBSCRIBE_EMAIL_IDENTITY),
-    		    $this->getEmail(),
-    		    $this->getName(),
-    		    array('subscriber'=>$this)
-		    );
+            ->sendTransactional(
+                Mage::getStoreConfig(self::XML_PATH_UNSUBSCRIBE_EMAIL_TEMPLATE),
+                Mage::getStoreConfig(self::XML_PATH_UNSUBSCRIBE_EMAIL_IDENTITY),
+                $this->getEmail(),
+                $this->getName(),
+                array('subscriber'=>$this)
+            );
 
-	    $translate->setTranslateInline(true);
+        $translate->setTranslateInline(true);
 
-    	return $this;
+        return $this;
     }
 }
\ No newline at end of file
diff --git a/app/code/core/Mage/Newsletter/Model/Template.php b/app/code/core/Mage/Newsletter/Model/Template.php
index 1952d8a4fe..e20498f884 100644
--- a/app/code/core/Mage/Newsletter/Model/Template.php
+++ b/app/code/core/Mage/Newsletter/Model/Template.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Newsletter
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Newsletter/controllers/ManageController.php b/app/code/core/Mage/Newsletter/controllers/ManageController.php
index 066a8e5073..55395cc781 100644
--- a/app/code/core/Mage/Newsletter/controllers/ManageController.php
+++ b/app/code/core/Mage/Newsletter/controllers/ManageController.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Newsletter
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -46,10 +52,11 @@ public function indexAction()
      	    $this->loadLayout();
             $this->_initLayoutMessages('customer/session');
             $this->_initLayoutMessages('catalog/session');
-        
+
         if ($block = $this->getLayout()->getBlock('customer_newsletter')) {
             $block->setRefererUrl($this->_getRefererUrl());
         }
+        $this->getLayout()->getBlock('head')->setTitle($this->__('Newsletter Subscription'));
         $this->renderLayout();
     }
 
diff --git a/app/code/core/Mage/Newsletter/controllers/SubscriberController.php b/app/code/core/Mage/Newsletter/controllers/SubscriberController.php
index b771f87372..8a9c3c796c 100644
--- a/app/code/core/Mage/Newsletter/controllers/SubscriberController.php
+++ b/app/code/core/Mage/Newsletter/controllers/SubscriberController.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Newsletter
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Newsletter/etc/config.xml b/app/code/core/Mage/Newsletter/etc/config.xml
index dfe857914a..5d2c50d01a 100644
--- a/app/code/core/Mage/Newsletter/etc/config.xml
+++ b/app/code/core/Mage/Newsletter/etc/config.xml
@@ -13,6 +13,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Newsletter
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -235,7 +241,7 @@
         
           
               
-                  
+                  
                       newsletter.xml
                   
               
@@ -259,7 +265,7 @@
     
         
             
-                */5 * * * *
+                * * * * *
                 newsletter/observer::scheduledSend
             
         
diff --git a/app/code/core/Mage/Newsletter/etc/system.xml b/app/code/core/Mage/Newsletter/etc/system.xml
index 998eca56fc..9847545c04 100644
--- a/app/code/core/Mage/Newsletter/etc/system.xml
+++ b/app/code/core/Mage/Newsletter/etc/system.xml
@@ -13,6 +13,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Newsletter
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Newsletter/sql/newsletter_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/Newsletter/sql/newsletter_setup/mysql4-install-0.7.0.php
index 4648e1e83b..746c8b1043 100644
--- a/app/code/core/Mage/Newsletter/sql/newsletter_setup/mysql4-install-0.7.0.php
+++ b/app/code/core/Mage/Newsletter/sql/newsletter_setup/mysql4-install-0.7.0.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Newsletter
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Newsletter/sql/newsletter_setup/mysql4-install-0.8.0.php b/app/code/core/Mage/Newsletter/sql/newsletter_setup/mysql4-install-0.8.0.php
index 15270a02bc..0c6af94cc6 100644
--- a/app/code/core/Mage/Newsletter/sql/newsletter_setup/mysql4-install-0.8.0.php
+++ b/app/code/core/Mage/Newsletter/sql/newsletter_setup/mysql4-install-0.8.0.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Newsletter
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Newsletter/sql/newsletter_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/Newsletter/sql/newsletter_setup/mysql4-upgrade-0.7.0-0.7.1.php
index fa0b7b05c4..e1d93fb92e 100644
--- a/app/code/core/Mage/Newsletter/sql/newsletter_setup/mysql4-upgrade-0.7.0-0.7.1.php
+++ b/app/code/core/Mage/Newsletter/sql/newsletter_setup/mysql4-upgrade-0.7.0-0.7.1.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Newsletter
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Page/Block/Html.php b/app/code/core/Mage/Page/Block/Html.php
index 1efa1f356f..d2ca478410 100644
--- a/app/code/core/Mage/Page/Block/Html.php
+++ b/app/code/core/Mage/Page/Block/Html.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Page
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -68,10 +74,40 @@ public function getCurrentUrl()
      */
     public function getPrintLogoUrl ()
     {
-        $logo = Mage::getStoreConfig('sales/identity/logo');
-        return $logo
-            ? Mage::getStoreConfig('web/unsecure/base_media_url') . 'sales/store/logo/' . $logo
-            : '';
+        // load html logo
+        $logo = Mage::getStoreConfig('sales/identity/logo_html');
+        if (!empty($logo)) {
+            $logo = 'sales/store/logo_html/' . $logo;
+        }
+
+        // load default logo
+        if (empty($logo)) {
+            $logo = Mage::getStoreConfig('sales/identity/logo');
+            if (!empty($logo)) {
+                // prevent tiff format displaying in html
+                if (strtolower(substr($logo, -5)) === '.tiff' || strtolower(substr($logo, -4)) === '.tif') {
+                    $logo = '';
+                }
+                else {
+                    $logo = 'sales/store/logo/' . $logo;
+                }
+            }
+        }
+
+        // buld url
+        if (!empty($logo)) {
+            $logo = Mage::getStoreConfig('web/unsecure/base_media_url') . $logo;
+        }
+        else {
+            $logo = '';
+        }
+
+        return $logo;
+    }
+
+    public function getPrintLogoText()
+    {
+        return Mage::getStoreConfig('sales/identity/address');
     }
 
     public function setHeaderTitle($title)
@@ -116,6 +152,8 @@ public function getBodyClass()
         return $this->_getData('body_class');
     }
 
-
-
+    public function getAbsoluteFooter()
+    {
+        return Mage::getStoreConfig('design/footer/absolute_footer');
+    }
 }
diff --git a/app/code/core/Mage/Page/Block/Html/Breadcrumbs.php b/app/code/core/Mage/Page/Block/Html/Breadcrumbs.php
index 8cc26834d3..4e987179fd 100644
--- a/app/code/core/Mage/Page/Block/Html/Breadcrumbs.php
+++ b/app/code/core/Mage/Page/Block/Html/Breadcrumbs.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Page
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Page/Block/Html/Footer.php b/app/code/core/Mage/Page/Block/Html/Footer.php
index be1f603099..cad2e6f340 100644
--- a/app/code/core/Mage/Page/Block/Html/Footer.php
+++ b/app/code/core/Mage/Page/Block/Html/Footer.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Page
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/code/core/Mage/Page/Block/Html/Head.php b/app/code/core/Mage/Page/Block/Html/Head.php
index c199123f79..76819d10c8 100644
--- a/app/code/core/Mage/Page/Block/Html/Head.php
+++ b/app/code/core/Mage/Page/Block/Html/Head.php
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Page
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -85,8 +91,8 @@ public function getCssJsHtml()
         $html = '';
 
         $script = '';
-        $stylesheet = '';
-        $alternate = '';
+        $stylesheet = '';
+        $alternate = '';
 
         foreach ($this->_data['items'] as $item) {
             if (!is_null($item['cond']) && !$this->getData($item['cond'])) {
@@ -124,8 +130,14 @@ public function getCssJsHtml()
                 $html .= '
+    
+    
+
 
\ No newline at end of file
diff --git a/app/design/adminhtml/default/default/layout/sales.xml b/app/design/adminhtml/default/default/layout/sales.xml
index c1688d8c3f..598bb9dce5 100644
--- a/app/design/adminhtml/default/default/layout/sales.xml
+++ b/app/design/adminhtml/default/default/layout/sales.xml
@@ -13,6 +13,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -51,6 +57,10 @@
         
     
 
+    
+        
+    
+
     
         
             
@@ -95,6 +105,7 @@
                 
                     
                     
+
                     
                         defaultadminhtml/sales_items_renderer_default
                         qtyadminhtml/sales_items_column_qty
diff --git a/app/design/adminhtml/default/default/template/api/roleinfo.phtml b/app/design/adminhtml/default/default/template/api/roleinfo.phtml
index 32ee45144c..fb8c311e58 100644
--- a/app/design/adminhtml/default/default/template/api/roleinfo.phtml
+++ b/app/design/adminhtml/default/default/template/api/roleinfo.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -33,6 +39,6 @@
 
 
    
 
    
-
\ No newline at end of file
diff --git a/app/design/adminhtml/default/default/template/api/roles.phtml b/app/design/adminhtml/default/default/template/api/roles.phtml
index ab5b3ea287..f298d712d3 100644
--- a/app/design/adminhtml/default/default/template/api/roles.phtml
+++ b/app/design/adminhtml/default/default/template/api/roles.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/api/rolesedit.phtml b/app/design/adminhtml/default/default/template/api/rolesedit.phtml
index 9c59c6336a..4e1b8a1e6b 100644
--- a/app/design/adminhtml/default/default/template/api/rolesedit.phtml
+++ b/app/design/adminhtml/default/default/template/api/rolesedit.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/api/rolesusers.phtml b/app/design/adminhtml/default/default/template/api/rolesusers.phtml
index a8a1cc067d..7e1e37bbd3 100644
--- a/app/design/adminhtml/default/default/template/api/rolesusers.phtml
+++ b/app/design/adminhtml/default/default/template/api/rolesusers.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/api/userinfo.phtml b/app/design/adminhtml/default/default/template/api/userinfo.phtml
index cec95b1e18..ab6e5d47b0 100644
--- a/app/design/adminhtml/default/default/template/api/userinfo.phtml
+++ b/app/design/adminhtml/default/default/template/api/userinfo.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -40,6 +46,6 @@
 
 
    
 
    
-
\ No newline at end of file
diff --git a/app/design/adminhtml/default/default/template/api/usernroles.phtml b/app/design/adminhtml/default/default/template/api/usernroles.phtml
index 1db733cd2f..86167d8731 100644
--- a/app/design/adminhtml/default/default/template/api/usernroles.phtml
+++ b/app/design/adminhtml/default/default/template/api/usernroles.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/api/userroles.phtml b/app/design/adminhtml/default/default/template/api/userroles.phtml
index 059c8a4ba4..19b186d5f6 100644
--- a/app/design/adminhtml/default/default/template/api/userroles.phtml
+++ b/app/design/adminhtml/default/default/template/api/userroles.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/api/users.phtml b/app/design/adminhtml/default/default/template/api/users.phtml
index e365862de8..c8255c6c8f 100644
--- a/app/design/adminhtml/default/default/template/api/users.phtml
+++ b/app/design/adminhtml/default/default/template/api/users.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/backup/left.phtml b/app/design/adminhtml/default/default/template/backup/left.phtml
index 3822893a85..b8182ec196 100644
--- a/app/design/adminhtml/default/default/template/backup/left.phtml
+++ b/app/design/adminhtml/default/default/template/backup/left.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/backup/list.phtml b/app/design/adminhtml/default/default/template/backup/list.phtml
index eb8e2e520e..9cae2d3220 100644
--- a/app/design/adminhtml/default/default/template/backup/list.phtml
+++ b/app/design/adminhtml/default/default/template/backup/list.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/bundle/product/edit/bundle.phtml b/app/design/adminhtml/default/default/template/bundle/product/edit/bundle.phtml
index 4be09d14b1..930a91f47f 100644
--- a/app/design/adminhtml/default/default/template/bundle/product/edit/bundle.phtml
+++ b/app/design/adminhtml/default/default/template/bundle/product/edit/bundle.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage_Bundle
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/bundle/product/edit/bundle/option.phtml b/app/design/adminhtml/default/default/template/bundle/product/edit/bundle/option.phtml
index 72a5a7850d..ee33057f88 100644
--- a/app/design/adminhtml/default/default/template/bundle/product/edit/bundle/option.phtml
+++ b/app/design/adminhtml/default/default/template/bundle/product/edit/bundle/option.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage_Bundle
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -71,6 +77,7 @@ function changeInputType(oldObject, oType) {
     if(oldObject.value) newObject.value = oldObject.value;
     if(oldObject.name) newObject.name = oldObject.name;
     if(oldObject.id) newObject.id = oldObject.id;
+    if(oldObject.onclick) newObject.onclick = oldObject.onclick;
     if(oldObject.className) newObject.className = oldObject.className;
     oldObject.parentNode.replaceChild(newObject,oldObject);
     return newObject;
@@ -100,10 +107,7 @@ Bundle.Option.prototype = {
 
         this.template = new Template(this.templateText, this.templateSyntax);
 
-        option = new Insertion.After(
-                this.top,
-                this.template.evaluate(data)
-            );
+        Element.insert(this.top, {'after':this.template.evaluate(data)});
 
         this.top = $(this.idLabel + '_' + data.index);
 
@@ -126,8 +130,8 @@ Bundle.Option.prototype = {
     remove : function(event){
         var element = $(Event.findElement(event, 'div')).parentNode;
         if(element){
-            Element.getElementsBySelector(element, '.delete').each(function(elem){elem.value='1'});
-            Element.getElementsBySelector(element, ['input', 'select']).each(function(elem){elem.hide(); elem.className = '';});
+            Element.select(element, '.delete').each(function(elem){elem.value='1'});
+            Element.select(element, ['input', 'select']).each(function(elem){elem.hide(); elem.className = '';});
             Element.hide(element);
         }
     },
diff --git a/app/design/adminhtml/default/default/template/bundle/product/edit/bundle/option/search.phtml b/app/design/adminhtml/default/default/template/bundle/product/edit/bundle/option/search.phtml
index df7ce26702..0dd42c2a24 100644
--- a/app/design/adminhtml/default/default/template/bundle/product/edit/bundle/option/search.phtml
+++ b/app/design/adminhtml/default/default/template/bundle/product/edit/bundle/option/search.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage_Bundle
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/bundle/product/edit/bundle/option/selection.phtml b/app/design/adminhtml/default/default/template/bundle/product/edit/bundle/option/selection.phtml
index 9b5c00a4e5..d3160d87ce 100644
--- a/app/design/adminhtml/default/default/template/bundle/product/edit/bundle/option/selection.phtml
+++ b/app/design/adminhtml/default/default/template/bundle/product/edit/bundle/option/selection.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage_Bundle
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -64,7 +70,7 @@ Bundle.Selection.prototype = {
     templateRow : '',
     itemsCount : 0,
     row : null,
-    gridSelection : $H({}),
+    gridSelection : new Hash(),
 
     initialize : function() {
         this.templateBox = '
    ' + bundleTemplateBox + '
    ';
@@ -83,7 +89,7 @@ Bundle.Selection.prototype = {
             products.push(inputs[i].value);
         }
 
-        this.gridSelection[parts[2]] = $H({});
+        this.gridSelection.set(parts[2], $H({}));
 
         new Ajax.Updater(bOption.idLabel + '_search_' + parts[2], 'getSelectionSearchUrl() ?>', {
             method: 'post',
@@ -128,10 +134,7 @@ Bundle.Selection.prototype = {
         this.template = new Template(this.templateRow, this.templateSyntax);
         var tbody = $$('#' + this.idLabel + '_box_' + parentIndex + ' tbody');
 
-        new Insertion.Bottom(
-            tbody[0],
-            this.template.evaluate(data)
-        );
+        Element.insert(tbody[0], {'bottom':this.template.evaluate(data)});
 
         if (data.selection_price_type) {
             $A($(this.idLabel + '_'+data.index+'_price_type').options).each(function(option){
@@ -174,18 +177,15 @@ Bundle.Selection.prototype = {
         var div = $(bOption.idLabel + '_' + parentIndex)
         this.template = new Template(this.templateBox, this.templateSyntax);
         var data = {'parentIndex' : parentIndex};
-        new Insertion.Bottom(
-            div,
-            this.template.evaluate(data)
-        );
+        Element.insert(div, {'bottom':this.template.evaluate(data)});
     },
 
     remove : function(event) {
         var element = Event.findElement(event, 'tr');
         var container = Event.findElement(event, 'div');
         if (element) {
-            Element.getElementsBySelector(element, '.delete').each(function(elem){elem.value='1'});
-            Element.getElementsBySelector(element, ['input', 'select']).each(function(elem){elem.hide()});
+            Element.select(element, '.delete').each(function(elem){elem.value='1'});
+            Element.select(element, ['input', 'select']).each(function(elem){elem.hide()});
             Element.removeClassName(element, 'selection');
             Element.hide(element);
 
@@ -221,13 +221,14 @@ Bundle.Selection.prototype = {
         $(bOption.idLabel + '_search_' + parts[2]).innerHTML = '';
         $(bOption.idLabel + '_' + parts[2] + '_add_button').show();
 
-        this.gridSelection[parts[2]].each(
+        this.gridSelection.get(parts[2]).each(
             function(pair) {
+                var qty = pair.value.get('qty');
                 var data = {
-                    'name' : pair.value.name,
+                    'name' : pair.value.get('name'),
                     'selection_price_value' : 0,
-                    'selection_qty' : pair.value.qty == '' ? 1 : pair.value.qty,
-                    'sku' : pair.value.sku,
+                    'selection_qty' : (qty == '' ? 1 : qty),
+                    'sku' : pair.value.get('sku'),
                     'position' : 0,
                     'product_id' : pair.key,
                     'option_id' : $(bOption.idLabel + '_id_' + parts[2]).value
@@ -247,17 +248,20 @@ Bundle.Selection.prototype = {
         }
     },
 
-    productGridCheckboxCheck : function(grid, element) {
+    productGridCheckboxCheck : function(grid, element, checked) {
         var id = element.up('table').id.split('_')[4];
         if (element.value > 0) {
             if (element.checked) {
                 var tr = element.parentNode.parentNode;
-                this.gridSelection[id][element.value] = $H({});
-                this.gridSelection[id][element.value]['name'] = tr.getElementsByClassName('name')[0].innerHTML;
-                this.gridSelection[id][element.value]['qty'] = tr.getElementsByClassName('qty')[0].value;
-                this.gridSelection[id][element.value]['sku'] = tr.getElementsByClassName('sku')[0].innerHTML;
+                if (!this.gridSelection.get(id)) {
+                    this.gridSelection.set(id, new Hash());
+                }
+                this.gridSelection.get(id).set(element.value, $H({}));
+                this.gridSelection.get(id).get(element.value).set('name', tr.select('td.name')[0].innerHTML);
+                this.gridSelection.get(id).get(element.value).set('qty', tr.select('input.qty')[0].value);
+                this.gridSelection.get(id).get(element.value).set('sku', tr.select('td.sku')[0].innerHTML);
             } else {
-                this.gridSelection[id].remove(element.value);
+                this.gridSelection.get(id).unset(element.value);
             }
         }
     },
@@ -266,7 +270,7 @@ Bundle.Selection.prototype = {
         var trElement = Event.findElement(event, 'tr');
         var isInput = Event.element(event).tagName == 'INPUT';
         if (trElement) {
-            var checkbox = Element.getElementsBySelector(trElement, 'input');
+            var checkbox = Element.select(trElement, 'input');
             if (checkbox[0]) {
                 var checked = isInput ? checkbox[0].checked : !checkbox[0].checked;
                 grid.setCheckboxChecked(checkbox[0], checked);
@@ -280,7 +284,7 @@ Bundle.Selection.prototype = {
             return;
         }
         var id = element.up('table').id.split('_')[4];
-        this.gridSelection[id][element.checkbox.value]['qty'] = element.value;
+        this.gridSelection.get(id).get(element.checkbox.value).set('qty', element.value);
     }
 }
 
diff --git a/app/design/adminhtml/default/default/template/bundle/sales/creditmemo/create/items/renderer.phtml b/app/design/adminhtml/default/default/template/bundle/sales/creditmemo/create/items/renderer.phtml
index a3923407e1..1e84a90e2b 100644
--- a/app/design/adminhtml/default/default/template/bundle/sales/creditmemo/create/items/renderer.phtml
+++ b/app/design/adminhtml/default/default/template/bundle/sales/creditmemo/create/items/renderer.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage_Bundle
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/bundle/sales/creditmemo/view/items/renderer.phtml b/app/design/adminhtml/default/default/template/bundle/sales/creditmemo/view/items/renderer.phtml
index 3b65df1f16..19cd79507d 100644
--- a/app/design/adminhtml/default/default/template/bundle/sales/creditmemo/view/items/renderer.phtml
+++ b/app/design/adminhtml/default/default/template/bundle/sales/creditmemo/view/items/renderer.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage_Bundle
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/bundle/sales/invoice/create/items/renderer.phtml b/app/design/adminhtml/default/default/template/bundle/sales/invoice/create/items/renderer.phtml
index 1541c36e2b..66c3384eac 100644
--- a/app/design/adminhtml/default/default/template/bundle/sales/invoice/create/items/renderer.phtml
+++ b/app/design/adminhtml/default/default/template/bundle/sales/invoice/create/items/renderer.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage_Bundle
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/bundle/sales/invoice/view/items/renderer.phtml b/app/design/adminhtml/default/default/template/bundle/sales/invoice/view/items/renderer.phtml
index 921ad8cf42..ac5c7089b3 100644
--- a/app/design/adminhtml/default/default/template/bundle/sales/invoice/view/items/renderer.phtml
+++ b/app/design/adminhtml/default/default/template/bundle/sales/invoice/view/items/renderer.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage_Bundle
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/bundle/sales/order/view/items/renderer.phtml b/app/design/adminhtml/default/default/template/bundle/sales/order/view/items/renderer.phtml
index 27eec26002..81d20ccec0 100644
--- a/app/design/adminhtml/default/default/template/bundle/sales/order/view/items/renderer.phtml
+++ b/app/design/adminhtml/default/default/template/bundle/sales/order/view/items/renderer.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage_Bundle
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -208,7 +214,17 @@
                 
    
                 getOrderOptions() as $option): ?>
                     
    :
    
-                    
    htmlEscape($option['value']); ?>
    
+                    
    
+                        htmlEscape(Mage::helper('core/string')->truncate($option['value'], 55, '', $_remainder));?>
+                        
+                            ... htmlEscape($_remainder) ?>
+                            
+                        
+                    
    
                 
                 
    
             
diff --git a/app/design/adminhtml/default/default/template/bundle/sales/shipment/create/items/renderer.phtml b/app/design/adminhtml/default/default/template/bundle/sales/shipment/create/items/renderer.phtml
index b6993793b6..5d4b5221af 100644
--- a/app/design/adminhtml/default/default/template/bundle/sales/shipment/create/items/renderer.phtml
+++ b/app/design/adminhtml/default/default/template/bundle/sales/shipment/create/items/renderer.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage_Bundle
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/bundle/sales/shipment/view/items/renderer.phtml b/app/design/adminhtml/default/default/template/bundle/sales/shipment/view/items/renderer.phtml
index 8c81269534..1f64682bb2 100644
--- a/app/design/adminhtml/default/default/template/bundle/sales/shipment/view/items/renderer.phtml
+++ b/app/design/adminhtml/default/default/template/bundle/sales/shipment/view/items/renderer.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage_Bundle
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/catalog/category/checkboxes/tree.phtml b/app/design/adminhtml/default/default/template/catalog/category/checkboxes/tree.phtml
new file mode 100644
index 0000000000..14e5f66328
--- /dev/null
+++ b/app/design/adminhtml/default/default/template/catalog/category/checkboxes/tree.phtml
@@ -0,0 +1,199 @@
+
+
+
+
    
+
+
diff --git a/app/design/adminhtml/default/default/template/catalog/category/edit.phtml b/app/design/adminhtml/default/default/template/catalog/category/edit.phtml
index 7c6c0cd404..bc189caf71 100644
--- a/app/design/adminhtml/default/default/template/catalog/category/edit.phtml
+++ b/app/design/adminhtml/default/default/template/catalog/category/edit.phtml
@@ -12,102 +12,129 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
  * @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 ?>
+
 
-
    
-
-    
-        
-        
-    
-
    getHeader() ?>
    		
-            getResetButtonHtml() ?>
-            getCategoryId()): ?>
-                    getDeleteButtonHtml() ?>
-            
-            getSaveButtonHtml() ?>
-        
    
+
    
+    getChildHtml('form') ?>
 
    
-hasStoreRootCategory()): ?>
-    getTabsHtml() ?>
-    
    
-    
-    
    
-    
    
+
 
-
-
    
-    __('Set root category for this store in the configuration', $this->getStoreConfigurationUrl()) ?>
-
    
-
+    function displayLoadingMask()
+    {
+       var loaderArea = $$('#html-body .wrapper')[0]; // Blocks all page
+        Position.clone($(loaderArea), $('loading-mask'), {offsetLeft:-2});
+        toggleSelectsUnderBlock($('loading-mask'), false);
+        Element.show('loading-mask');
+    }
+//]]>
+
\ No newline at end of file
diff --git a/app/design/adminhtml/default/default/template/catalog/category/edit/form.phtml b/app/design/adminhtml/default/default/template/catalog/category/edit/form.phtml
new file mode 100644
index 0000000000..c6789b7a28
--- /dev/null
+++ b/app/design/adminhtml/default/default/template/catalog/category/edit/form.phtml
@@ -0,0 +1,199 @@
+
+
+
    
+
+    
+        
+        
+    
+
    getHeader() ?>
    		
+            getResetButtonHtml() ?>
+            getCategoryId()): ?>
+                    getDeleteButtonHtml() ?>
+            
+            getSaveButtonHtml() ?>
+        
    
+
    
+hasStoreRootCategory()): ?>
+    getTabsHtml() ?>
+
+
    
+    __('Set root category for this store in the configuration', $this->getStoreConfigurationUrl()) ?>
+
    
+
+
+
    
+
    
+    
+    
+
    
+
    
+
    
+
\ No newline at end of file
diff --git a/app/design/adminhtml/default/default/template/catalog/category/tree.phtml b/app/design/adminhtml/default/default/template/catalog/category/tree.phtml
index 96634e6d8c..8f665a2488 100644
--- a/app/design/adminhtml/default/default/template/catalog/category/tree.phtml
+++ b/app/design/adminhtml/default/default/template/catalog/category/tree.phtml
@@ -12,85 +12,368 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
  * @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 ?>
-
    
-    
-        
-            
-            
-        
-    
    __('Categories') ?>
    		getRoot()): ?>getAddButtonHtml() ?>
    
-
    
-getStoreSwitcherHtml() ?>
-getRoot()): ?>
-
    
-
    
+
    
+    
    
+        
    __('Categories') ?>
    
+        getRoot()): ?>
+            getAddRootButtonHtml() ?>
    
+            getAddSubButtonHtml() ?>
+        
+    
    
+    getStoreSwitcherHtml() ?>
+    
    
+        getRoot()): ?>
+            getCollapseButtonHtml() ?>
+            getExpandButtonHtml() ?>
+            __('Collapse All'); ?> | __('Expand All'); ?>
+        
+    
    
+    getRoot()): ?>
+    
    
+        
    
+    
    
 
    
 
 
\ No newline at end of file
diff --git a/app/design/adminhtml/default/default/template/catalog/form/renderer/fieldset/element.phtml b/app/design/adminhtml/default/default/template/catalog/form/renderer/fieldset/element.phtml
index d050a4a21c..b0d49509ca 100644
--- a/app/design/adminhtml/default/default/template/catalog/form/renderer/fieldset/element.phtml
+++ b/app/design/adminhtml/default/default/template/catalog/form/renderer/fieldset/element.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Adminhtml
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -21,7 +27,6 @@
 getElement() ?>
 checkFieldDisable() ?>
 
-
 getType()=='hidden'): ?>
 
     getElementHtml()) ?>
@@ -33,10 +38,10 @@
     getScopeLabel() ?>
     canDisplayUseDefault()): ?>
     
-        usedDefault()): ?> checked onclick="toggleValueElements(this, this.parentNode.parentNode)" value="getAttributeCode() ?>"/>
+        usedDefault()): ?> checked="checked" onclick="toggleValueElements(this, this.parentNode.parentNode)" value="getAttributeCode() ?>"/>
         
     
     
-    getNote()): ?> class="note">getNote() ?>
+    getNote()): ?> class="note">getNote()?$_element->getNote():' ' ?>
 
 
\ No newline at end of file
diff --git a/app/design/adminhtml/default/default/template/catalog/product.phtml b/app/design/adminhtml/default/default/template/catalog/product.phtml
index dd17a5fe27..78d9238bb4 100644
--- a/app/design/adminhtml/default/default/template/catalog/product.phtml
+++ b/app/design/adminhtml/default/default/template/catalog/product.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/catalog/product/attribute/js.phtml b/app/design/adminhtml/default/default/template/catalog/product/attribute/js.phtml
index 79225c9d01..530d2a7954 100644
--- a/app/design/adminhtml/default/default/template/catalog/product/attribute/js.phtml
+++ b/app/design/adminhtml/default/default/template/catalog/product/attribute/js.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/catalog/product/attribute/new/created.phtml b/app/design/adminhtml/default/default/template/catalog/product/attribute/new/created.phtml
index 8fc3eb16ea..82dfae0c9f 100644
--- a/app/design/adminhtml/default/default/template/catalog/product/attribute/new/created.phtml
+++ b/app/design/adminhtml/default/default/template/catalog/product/attribute/new/created.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/catalog/product/attribute/options.phtml b/app/design/adminhtml/default/default/template/catalog/product/attribute/options.phtml
index a519c0d904..d259bc641a 100644
--- a/app/design/adminhtml/default/default/template/catalog/product/attribute/options.phtml
+++ b/app/design/adminhtml/default/default/template/catalog/product/attribute/options.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -88,22 +94,23 @@
 		            
 	        
 		
    
-		
+		
     
    
 
 
\ No newline at end of file
diff --git a/app/design/adminhtml/default/default/template/catalog/product/attribute/set/main.phtml b/app/design/adminhtml/default/default/template/catalog/product/attribute/set/main.phtml
index 9a931198bc..a2eef70054 100644
--- a/app/design/adminhtml/default/default/template/catalog/product/attribute/set/main.phtml
+++ b/app/design/adminhtml/default/default/template/catalog/product/attribute/set/main.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -62,7 +68,8 @@
                 
             
             
    
-            
         
     
diff --git a/app/design/adminhtml/default/default/template/catalog/product/attribute/set/main/tree/attribute.phtml b/app/design/adminhtml/default/default/template/catalog/product/attribute/set/main/tree/attribute.phtml
index 91d80312d3..d8e35b38a6 100644
--- a/app/design/adminhtml/default/default/template/catalog/product/attribute/set/main/tree/attribute.phtml
+++ b/app/design/adminhtml/default/default/template/catalog/product/attribute/set/main/tree/attribute.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/catalog/product/attribute/set/main/tree/group.phtml b/app/design/adminhtml/default/default/template/catalog/product/attribute/set/main/tree/group.phtml
index fec8fa920e..e1cb5ad2e4 100644
--- a/app/design/adminhtml/default/default/template/catalog/product/attribute/set/main/tree/group.phtml
+++ b/app/design/adminhtml/default/default/template/catalog/product/attribute/set/main/tree/group.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/catalog/product/attribute/set/toolbar/add.phtml b/app/design/adminhtml/default/default/template/catalog/product/attribute/set/toolbar/add.phtml
index 106e3b11d1..63a8718dd3 100644
--- a/app/design/adminhtml/default/default/template/catalog/product/attribute/set/toolbar/add.phtml
+++ b/app/design/adminhtml/default/default/template/catalog/product/attribute/set/toolbar/add.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -30,6 +36,6 @@
     
 
 getFormHtml() ?>
-
\ No newline at end of file
diff --git a/app/design/adminhtml/default/default/template/catalog/product/attribute/set/toolbar/main.phtml b/app/design/adminhtml/default/default/template/catalog/product/attribute/set/toolbar/main.phtml
index 9d4c8ba6f1..17327715e0 100644
--- a/app/design/adminhtml/default/default/template/catalog/product/attribute/set/toolbar/main.phtml
+++ b/app/design/adminhtml/default/default/template/catalog/product/attribute/set/toolbar/main.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/catalog/product/created.phtml b/app/design/adminhtml/default/default/template/catalog/product/created.phtml
index a4e64ba682..abcb1e4729 100644
--- a/app/design/adminhtml/default/default/template/catalog/product/created.phtml
+++ b/app/design/adminhtml/default/default/template/catalog/product/created.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/catalog/product/edit.phtml b/app/design/adminhtml/default/default/template/catalog/product/edit.phtml
index 83f7622592..d8a134ba38 100644
--- a/app/design/adminhtml/default/default/template/catalog/product/edit.phtml
+++ b/app/design/adminhtml/default/default/template/catalog/product/edit.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -45,8 +51,8 @@
 
    
 
    
 
    
-
diff --git a/app/design/adminhtml/default/default/template/catalog/product/edit/action/attribute.phtml b/app/design/adminhtml/default/default/template/catalog/product/edit/action/attribute.phtml
index f6c6f5ff34..637678208a 100644
--- a/app/design/adminhtml/default/default/template/catalog/product/edit/action/attribute.phtml
+++ b/app/design/adminhtml/default/default/template/catalog/product/edit/action/attribute.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/catalog/product/edit/action/inventory.phtml b/app/design/adminhtml/default/default/template/catalog/product/edit/action/inventory.phtml
index a604316693..ec1a9a88ee 100644
--- a/app/design/adminhtml/default/default/template/catalog/product/edit/action/inventory.phtml
+++ b/app/design/adminhtml/default/default/template/catalog/product/edit/action/inventory.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Adminhtml
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -19,6 +25,7 @@
  */
 ?>
 
 
 
    
@@ -49,7 +57,7 @@ function toggleValueElementsWithCheckbox(checkbox) {
                         
                         
                     
-                    
+                    
                     
                     
                     
@@ -59,8 +67,8 @@ function toggleValueElementsWithCheckbox(checkbox) {
             
                 
                 
-                    
-                    
+                    
+                    
                     
                 
                 __('[GLOBAL]') ?>
@@ -68,9 +76,9 @@ function toggleValueElementsWithCheckbox(checkbox) {
             
                 
                 
-                    
+                    
                     
-                    
+                    
                     
                 
                 __('[GLOBAL]') ?>
@@ -78,9 +86,9 @@ function toggleValueElementsWithCheckbox(checkbox) {
             
                 
                 
-                    
+                    
                     
-                    
+                    
                     
                 
                 __('[GLOBAL]') ?>
@@ -101,7 +109,7 @@ function toggleValueElementsWithCheckbox(checkbox) {
                         
                         
                     
-                    
+                    
                     
                 
                 __('[GLOBAL]') ?>
@@ -116,7 +124,7 @@ function toggleValueElementsWithCheckbox(checkbox) {
                     
                     
                     
-                    
+                    
                     
                 
                 __('[GLOBAL]') ?>
diff --git a/app/design/adminhtml/default/default/template/catalog/product/edit/action/websites.phtml b/app/design/adminhtml/default/default/template/catalog/product/edit/action/websites.phtml
index 57140911ab..ebdf45c128 100644
--- a/app/design/adminhtml/default/default/template/catalog/product/edit/action/websites.phtml
+++ b/app/design/adminhtml/default/default/template/catalog/product/edit/action/websites.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -26,7 +32,7 @@
     getWebsiteCollection() as $_website): ?>
     
    
         
    
-            
+            
             
         
    
         
    
@@ -37,7 +43,7 @@
             getStoreCollection($_group) as $_store): ?>
                 
                     getName() ?>
-                    
+                     
                 
             
             
@@ -46,6 +52,7 @@
         
    
     
    
     
+    
 
    
 
 
    
@@ -63,8 +70,8 @@
     getWebsiteCollection() as $_website): ?>
     
    
         
    
-            
-            
+            
+            
         
    
         
    
         getGroupCollection($_website) as $_group): ?>
@@ -74,7 +81,7 @@
             getStoreCollection($_group) as $_store): ?>
                 
                     getName() ?>
-                    
+                     
                 
             
             
@@ -83,8 +90,10 @@
         
    
     
    
     
+    
 
    
 
\ No newline at end of file
diff --git a/app/design/adminhtml/default/default/template/catalog/product/edit/categories.phtml b/app/design/adminhtml/default/default/template/catalog/product/edit/categories.phtml
index 1ff1e06fcf..d8c192d69b 100644
--- a/app/design/adminhtml/default/default/template/catalog/product/edit/categories.phtml
+++ b/app/design/adminhtml/default/default/template/catalog/product/edit/categories.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -99,9 +105,10 @@ function bildCategoryTree(parent, config){
         for (var i = 0; i < config.length; i++){
             config[i].uiProvider = Ext.tree.CheckboxNodeUI;
             var node;
-            if (config[i].children && !config[i].children.length) {
-                delete(config[i].children);
-                node = new Ext.tree.AsyncTreeNode(config[i]);
+            var _node = Object.clone(config[i]);
+            if (_node.children && !_node.children.length) {
+                delete(_node.children);
+                node = new Ext.tree.AsyncTreeNode(_node);
 
             } else {
                 node = new Ext.tree.TreeNode(config[i]);
diff --git a/app/design/adminhtml/default/default/template/catalog/product/edit/options.phtml b/app/design/adminhtml/default/default/template/catalog/product/edit/options.phtml
index f3cccac16c..ed598a3eec 100644
--- a/app/design/adminhtml/default/default/template/catalog/product/edit/options.phtml
+++ b/app/design/adminhtml/default/default/template/catalog/product/edit/options.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/catalog/product/edit/options/option.phtml b/app/design/adminhtml/default/default/template/catalog/product/edit/options/option.phtml
index e37cebd99a..b079d9f30b 100644
--- a/app/design/adminhtml/default/default/template/catalog/product/edit/options/option.phtml
+++ b/app/design/adminhtml/default/default/template/catalog/product/edit/options/option.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -50,23 +56,20 @@ var productOption = {
     div : $('product_options_container_top'),
     templateSyntax : /(^|.|\r|\n)({{(\w+)}})/,
     templateText : firstStepTemplate,
-    itemCount : getItemCount() ?>,
+    itemCount : 1,
     add : function(data) {
         this.template = new Template(this.templateText, this.templateSyntax);
 
         if(!data.id){
             data = {};
-            data.id  = ++this.itemCount;
+            data.id  = this.itemCount;
             data.type = '';
             data.option_id = 0;
         } else {
             this.itemCount = data.item_count;
         }
 
-        new Insertion.After(
-            this.div,
-            this.template.evaluate(data)
-        );
+        Element.insert(this.div, {'after':this.template.evaluate(data)});
 
         //set selected type
         if (data.type) {
@@ -155,10 +158,11 @@ var productOptionType = {
             if ($(element.readAttribute('id')+'_'+previousGroupElm.getValue())) {
                 formElm = $(element.readAttribute('id')+'_'+previousGroupElm.getValue()).descendants();
                 formElm.each(function(elm){
-                    if (elm.match('input') || elm.match('select')) {
+                    if (elm.tagName == 'input' || elm.tagName == 'select') {
                         elm.name = '__delete__'+elm.readAttribute('name');
                     }
                 });
+
                 $(element.readAttribute('id')+'_'+previousGroupElm.getValue()).addClassName('no-display');
                 $(element.readAttribute('id')+'_'+previousGroupElm.getValue()).addClassName('ignore-validate');
                 $(element.readAttribute('id')+'_'+previousGroupElm.getValue()).hide();
@@ -187,10 +191,7 @@ var productOptionType = {
                     data.option_id = $(element.readAttribute('id').sub('_type', '_id')).getValue();
                 }
 
-                new Insertion.After(
-                    element.readAttribute('id').sub('_type', ''),
-                    this.secondTemplate.evaluate(data)
-                );
+                Element.insert(element.readAttribute('id').sub('_type', ''), {'after':this.secondTemplate.evaluate(data)});
 
                 switch(element.getValue()){
                     case 'drop_down':
@@ -236,10 +237,7 @@ var productOptionType = {
 
         this.secondTemplate = new Template(template, this.templateSyntax);
 
-        new Insertion.After(
-            $('getFieldId() ?>_'+data.option_id),
-            this.secondTemplate.evaluate(data)
-        );
+        Element.insert($('getFieldId() ?>_'+data.option_id), {'after':this.secondTemplate.evaluate(data)});
 
         if (data.checkboxScopePrice) {
             //set disabled
diff --git a/app/design/adminhtml/default/default/template/catalog/product/edit/options/type/date.phtml b/app/design/adminhtml/default/default/template/catalog/product/edit/options/type/date.phtml
index 015f4ae898..90f3b596cf 100644
--- a/app/design/adminhtml/default/default/template/catalog/product/edit/options/type/date.phtml
+++ b/app/design/adminhtml/default/default/template/catalog/product/edit/options/type/date.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/catalog/product/edit/options/type/file.phtml b/app/design/adminhtml/default/default/template/catalog/product/edit/options/type/file.phtml
index ecbd0d0a5f..203859423d 100644
--- a/app/design/adminhtml/default/default/template/catalog/product/edit/options/type/file.phtml
+++ b/app/design/adminhtml/default/default/template/catalog/product/edit/options/type/file.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/catalog/product/edit/options/type/select.phtml b/app/design/adminhtml/default/default/template/catalog/product/edit/options/type/select.phtml
index 1e3b48e194..5916265c39 100644
--- a/app/design/adminhtml/default/default/template/catalog/product/edit/options/type/select.phtml
+++ b/app/design/adminhtml/default/default/template/catalog/product/edit/options/type/select.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -76,19 +82,7 @@ selectOptionType = {
 
         data.id  = optionId;
 
-        afterElm = this.div+'_'+data.id;
-        lastSelectId = this.itemCount-1;
-        if ($('product_option_'+data.id+'_select_'+lastSelectId)) {
-            afterElm = 'product_option_'+data.id+'_select_'+lastSelectId;
-        }
-//		new Insertion.After(
-//			$(afterElm),
-//			this.template.evaluate(data)
-//		);
-		new Insertion.Bottom(
-			$(this.div+'_'+data.id),
-			this.template.evaluate(data)
-		);
+		Element.insert($(this.div+'_'+data.id), {'bottom':this.template.evaluate(data)});
 
 		if (data.checkboxScopeTitle) {
             //set disabled
diff --git a/app/design/adminhtml/default/default/template/catalog/product/edit/options/type/text.phtml b/app/design/adminhtml/default/default/template/catalog/product/edit/options/type/text.phtml
index 13093652f7..7c62111ef6 100644
--- a/app/design/adminhtml/default/default/template/catalog/product/edit/options/type/text.phtml
+++ b/app/design/adminhtml/default/default/template/catalog/product/edit/options/type/text.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/catalog/product/edit/price/tier.phtml b/app/design/adminhtml/default/default/template/catalog/product/edit/price/tier.phtml
index 9fefeb6dae..0b4e078719 100644
--- a/app/design/adminhtml/default/default/template/catalog/product/edit/price/tier.phtml
+++ b/app/design/adminhtml/default/default/template/catalog/product/edit/price/tier.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -57,22 +63,22 @@
                 
                 
                 
-                     __('and above')?>
+                     __('and above')?>
                 
                 
-                    
+                    
                 
-                
+                
             
         
-        
-        
         
             
                 style="display:none">
                 getAddButtonHtml() ?>
             
         
+        
+        
     
 
 
\ No newline at end of file
diff --git a/app/design/adminhtml/default/default/template/catalog/product/helper/gallery.phtml b/app/design/adminhtml/default/default/template/catalog/product/helper/gallery.phtml
index cfdb40fc6a..e4aefb7c05 100644
--- a/app/design/adminhtml/default/default/template/catalog/product/helper/gallery.phtml
+++ b/app/design/adminhtml/default/default/template/catalog/product/helper/gallery.phtml
@@ -1,116 +1,124 @@
-
-
-
-
    
-
      
-    
    • 
-        
        
-            
      • 
-            __('Image type and information need to be specified for each store view.'); ?>
-            
        • 
-        
      
-    
      • 
-
    
-
    
-
-    -    -    -    getImageTypes() as $typeId=>$type): ?>
-    -    
-    -    -    
-        
-            
-            
-            
-            getImageTypes() as $typeId=>$type): ?>
-            
-            
-            
-            
-        
-    
-    
-        
-                
-                
-                
-                getImageTypes() as $typeId=>$type): ?>
-                
-                
-                
-                
-        
-        hasUseDefault()): ?>
-        
-                
-                
-                
-                getMediaAttributes() as $_attribute): ?>
-                
-                
-                
-                
-        
-    
-        
-                
-                
-                
-                getImageTypes() as $typeId=>$type): ?>
-                
-                
-                
-                
-        
-    
-
-    
-        
-            
-        
-    
-
    






    __('Image') ?>__('Label') ?>__('Sort Order') ?>__('Exclude') ?>__('Remove') ?>
    __('Roll Over for preview') ?>
    __('Use Default Value') ?>  
-                getElement()->canDisplayUseDefault($_attribute)): ?>
-                getElement()->usedDefault($_attribute)): ?>checked value="getAttributeCode() ?>"/>
-                
-                  
    __('No image') ?>    
    
-            getUploaderHtml() ?>
-            
    
-
    
-
    
-
-
-
\ No newline at end of file
diff --git a/app/design/adminhtml/default/default/template/catalog/product/js.phtml b/app/design/adminhtml/default/default/template/catalog/product/js.phtml
index a0ec55de8e..93123d0265 100644
--- a/app/design/adminhtml/default/default/template/catalog/product/js.phtml
+++ b/app/design/adminhtml/default/default/template/catalog/product/js.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -19,6 +25,7 @@
  */
 ?>
 
\ No newline at end of file
diff --git a/app/design/adminhtml/default/default/template/catalog/product/tab/alert.phtml b/app/design/adminhtml/default/default/template/catalog/product/tab/alert.phtml
index 1807b7fb66..a9f9738e70 100644
--- a/app/design/adminhtml/default/default/template/catalog/product/tab/alert.phtml
+++ b/app/design/adminhtml/default/default/template/catalog/product/tab/alert.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/catalog/product/tab/inventory.phtml b/app/design/adminhtml/default/default/template/catalog/product/tab/inventory.phtml
index 5b0eb0b7aa..c4c3274fee 100644
--- a/app/design/adminhtml/default/default/template/catalog/product/tab/inventory.phtml
+++ b/app/design/adminhtml/default/default/template/catalog/product/tab/inventory.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Adminhtml
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -34,8 +40,8 @@
             
             
 
-            getFieldValue('use_config_manage_stock') || $this->IsNew()) ? 'checked' : '' ?>
-             onclick="toggleValueElements(this, this.parentNode);"/>
+            getFieldValue('use_config_manage_stock') || $this->IsNew()) ? 'checked="checked"' : '' ?>
+             onclick="toggleValueElements(this, this.parentNode);" class="checkbox" />
             
             
             __('[GLOBAL]') ?>
@@ -50,11 +56,11 @@
         
 
         
-            
+            
             
 
-            getFieldValue('use_config_min_qty') || $this->IsNew()) ? 'checked' : '' ?>
-             onclick="toggleValueElements(this, this.parentNode);"/>
+            getFieldValue('use_config_min_qty') || $this->IsNew()) ? 'checked="checked"' : '' ?>
+             onclick="toggleValueElements(this, this.parentNode);" />
             
             
             __('[GLOBAL]') ?>
@@ -64,8 +70,8 @@
             
             
 
-            getFieldValue('use_config_min_sale_qty') || $this->IsNew()) ? 'checked' : '' ?>
-             onclick="toggleValueElements(this, this.parentNode);"/>
+            getFieldValue('use_config_min_sale_qty') || $this->IsNew()) ? 'checked="checked"' : '' ?>
+             onclick="toggleValueElements(this, this.parentNode);" class="checkbox" />
             
             
             __('[GLOBAL]') ?>
@@ -73,10 +79,10 @@
 
         
             
-            
+            
 
-            getFieldValue('use_config_max_sale_qty') || $this->IsNew()) ? 'checked' : '' ?>
-             onclick="toggleValueElements(this, this.parentNode);"/>
+            getFieldValue('use_config_max_sale_qty') || $this->IsNew()) ? 'checked="checked"' : '' ?>
+             onclick="toggleValueElements(this, this.parentNode);" class="checkbox" />
             
             
             __('[GLOBAL]') ?>
@@ -101,8 +107,8 @@
             
             
 
-            getFieldValue('use_config_backorders') || $this->IsNew()) ? 'checked' : '' ?>
-             onclick="toggleValueElements(this, this.parentNode);"/>
+            getFieldValue('use_config_backorders') || $this->IsNew()) ? 'checked="checked"' : '' ?>
+             onclick="toggleValueElements(this, this.parentNode);" class="checkbox" />
             
             
             __('[GLOBAL]') ?>
@@ -111,8 +117,8 @@
             
             
 
-            getFieldValue('use_config_notify_stock_qty') || $this->IsNew()) ? 'checked' : '' ?>
-             onclick="toggleValueElements(this, this.parentNode);"/>
+            getFieldValue('use_config_notify_stock_qty') || $this->IsNew()) ? 'checked="checked"' : '' ?>
+             onclick="toggleValueElements(this, this.parentNode);" class="checkbox" />
             
             
             __('[GLOBAL]') ?>
@@ -128,34 +134,36 @@
             __('[GLOBAL]') ?>
         
         
-        
+    Event.observe($('inventory_manage_stock'), 'change', changeManageStockOption);
+    Event.observe($('inventory_use_config_manage_stock'), 'change', changeManageStockOption);
+    changeManageStockOption();
+    //]]>
+    
     
 
\ No newline at end of file
diff --git a/app/design/adminhtml/default/default/template/coming.phtml b/app/design/adminhtml/default/default/template/coming.phtml
index efe31a2b32..93cdfaad55 100644
--- a/app/design/adminhtml/default/default/template/coming.phtml
+++ b/app/design/adminhtml/default/default/template/coming.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/customer/group/list.phtml b/app/design/adminhtml/default/default/template/customer/group/list.phtml
index e65f20f6bb..50edc71b97 100644
--- a/app/design/adminhtml/default/default/template/customer/group/list.phtml
+++ b/app/design/adminhtml/default/default/template/customer/group/list.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -22,16 +28,13 @@
 
-		
    
 	
    
 		
    __('Customer Groups') ?>
    		
-	
+		
 	
    
 
    
 
-
    
-	getChildHtml('grid') ?>
-
    
+getChildHtml('grid') ?>
 
\ No newline at end of file
+//]]>
+
diff --git a/app/design/adminhtml/default/default/template/customer/online.phtml b/app/design/adminhtml/default/default/template/customer/online.phtml
index cfdb7bd0c6..a39daacc31 100644
--- a/app/design/adminhtml/default/default/template/customer/online.phtml
+++ b/app/design/adminhtml/default/default/template/customer/online.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/customer/tab/addresses.phtml b/app/design/adminhtml/default/default/template/customer/tab/addresses.phtml
index 121152944d..89e6bcd990 100644
--- a/app/design/adminhtml/default/default/template/customer/tab/addresses.phtml
+++ b/app/design/adminhtml/default/default/template/customer/tab/addresses.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -34,7 +40,7 @@
             
                 Remove address
             
-            
+            
                 Edit address
             
             
    
@@ -42,11 +48,11 @@
             
    
             
    
                 
-                    getId()==$customer->getDefaultBilling()): ?> checked="true"/>
+                    getId()==$customer->getDefaultBilling()): ?> checked="checked"/>
                      
                 
                 
-                    getId()==$customer->getDefaultShipping()): ?> checked="true"/>
+                    getId()==$customer->getDefaultShipping()): ?> checked="checked"/>
                      
                 
             
    
@@ -63,11 +69,11 @@
             
             
         
@@ -82,7 +88,7 @@
         
             Remove address
         
-        
+        
             Edit address
         
         
    __('New Customer Address') ?>
    
@@ -113,6 +119,7 @@
 
 
 
 
-
+
+
diff --git a/app/design/adminhtml/default/default/template/customer/tab/cart.phtml b/app/design/adminhtml/default/default/template/customer/tab/cart.phtml
index c8305eeb00..77844d16d4 100644
--- a/app/design/adminhtml/default/default/template/customer/tab/cart.phtml
+++ b/app/design/adminhtml/default/default/template/customer/tab/cart.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/customer/tab/newsletter.phtml b/app/design/adminhtml/default/default/template/customer/tab/newsletter.phtml
index 629627d2ef..4c38c1a6e3 100644
--- a/app/design/adminhtml/default/default/template/customer/tab/newsletter.phtml
+++ b/app/design/adminhtml/default/default/template/customer/tab/newsletter.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/customer/tab/view.phtml b/app/design/adminhtml/default/default/template/customer/tab/view.phtml
index 61639e7150..56ec3ad1d6 100644
--- a/app/design/adminhtml/default/default/template/customer/tab/view.phtml
+++ b/app/design/adminhtml/default/default/template/customer/tab/view.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -24,8 +30,8 @@
  */
 ?>
 
    
-	
    __('Personal Information') ?>
    
-	
    
+    
    __('Personal Information') ?>
    
+    
    
         
@@ -48,10 +54,11 @@
                 
    
             
    
                 __('Last Logged In:') ?>getGroupName() ?>
             
    
         
    
-		
    
-		__('Primary Billing Address') ?>
    
-		getBillingAddressHtml() ?>
-	
    
+        
    
+            __('Primary Billing Address') ?>
    
+            getBillingAddressHtml() ?>
+        
    
+    
    
 
    
 getSalesHtml(); ?>
 
    
diff --git a/app/design/adminhtml/default/default/template/customer/tab/view/sales.phtml b/app/design/adminhtml/default/default/template/customer/tab/view/sales.phtml
index 1b5ec302ab..5415bf3e9a 100644
--- a/app/design/adminhtml/default/default/template/customer/tab/view/sales.phtml
+++ b/app/design/adminhtml/default/default/template/customer/tab/view/sales.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -19,7 +25,7 @@
  */
 ?>
 
    
-	
    __('Sales Statistics') ?>
    
+    
    __('Sales Statistics') ?>
    
     
    
         
@@ -49,7 +55,7 @@
                         getStoreId() == 0): ?>
                         
-                >
+                >
                         
                     
@@ -71,23 +77,3 @@
         
    
             
    getStoreName() ?>
                         
    getWebsiteName() ?>
                             
    
     
    
 
    
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/design/adminhtml/default/default/template/customer/tab/wishlist.phtml b/app/design/adminhtml/default/default/template/customer/tab/wishlist.phtml
index 595a3a2411..ede41e4858 100644
--- a/app/design/adminhtml/default/default/template/customer/tab/wishlist.phtml
+++ b/app/design/adminhtml/default/default/template/customer/tab/wishlist.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/dashboard/graph.phtml b/app/design/adminhtml/default/default/template/dashboard/graph.phtml
index e5eac59721..4f178f5624 100644
--- a/app/design/adminhtml/default/default/template/dashboard/graph.phtml
+++ b/app/design/adminhtml/default/default/template/dashboard/graph.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/dashboard/grid.phtml b/app/design/adminhtml/default/default/template/dashboard/grid.phtml
index c8bbc56e98..8d02c9d1fd 100644
--- a/app/design/adminhtml/default/default/template/dashboard/grid.phtml
+++ b/app/design/adminhtml/default/default/template/dashboard/grid.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/dashboard/index.phtml b/app/design/adminhtml/default/default/template/dashboard/index.phtml
index 2e9ec8a40a..0a8dcd0f59 100644
--- a/app/design/adminhtml/default/default/template/dashboard/index.phtml
+++ b/app/design/adminhtml/default/default/template/dashboard/index.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/dashboard/salebar.phtml b/app/design/adminhtml/default/default/template/dashboard/salebar.phtml
index 3ebe84b009..bbd3a76f1b 100644
--- a/app/design/adminhtml/default/default/template/dashboard/salebar.phtml
+++ b/app/design/adminhtml/default/default/template/dashboard/salebar.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/dashboard/searches.phtml b/app/design/adminhtml/default/default/template/dashboard/searches.phtml
index bec91c3f2a..3a0659b71d 100644
--- a/app/design/adminhtml/default/default/template/dashboard/searches.phtml
+++ b/app/design/adminhtml/default/default/template/dashboard/searches.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/dashboard/store/switcher.phtml b/app/design/adminhtml/default/default/template/dashboard/store/switcher.phtml
index 1ef3ee66ac..84e2eb9766 100644
--- a/app/design/adminhtml/default/default/template/dashboard/store/switcher.phtml
+++ b/app/design/adminhtml/default/default/template/dashboard/store/switcher.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/dashboard/totalbar.phtml b/app/design/adminhtml/default/default/template/dashboard/totalbar.phtml
index 10ae721c53..84eeab62a5 100644
--- a/app/design/adminhtml/default/default/template/dashboard/totalbar.phtml
+++ b/app/design/adminhtml/default/default/template/dashboard/totalbar.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/email/order/items.phtml b/app/design/adminhtml/default/default/template/email/order/items.phtml
index b5deb5cb52..d233e2c475 100644
--- a/app/design/adminhtml/default/default/template/email/order/items.phtml
+++ b/app/design/adminhtml/default/default/template/email/order/items.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/example.phtml b/app/design/adminhtml/default/default/template/example.phtml
index d786b8d26f..84553ffd97 100644
--- a/app/design/adminhtml/default/default/template/example.phtml
+++ b/app/design/adminhtml/default/default/template/example.phtml
@@ -12,14 +12,19 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
  * @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 ?>
-
+
 
 		
 			<?php echo Mage::helper('adminhtml')->__('Magento Commerce - Administrative Panel') ?>
diff --git a/app/design/adminhtml/default/default/template/extensions/console/form.phtml b/app/design/adminhtml/default/default/template/extensions/console/form.phtml
index ee6cbdeb85..70d462b95b 100644
--- a/app/design/adminhtml/default/default/template/extensions/console/form.phtml
+++ b/app/design/adminhtml/default/default/template/extensions/console/form.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/extensions/custom/contents.phtml b/app/design/adminhtml/default/default/template/extensions/custom/contents.phtml
index 16d400408a..158f8aab8d 100644
--- a/app/design/adminhtml/default/default/template/extensions/custom/contents.phtml
+++ b/app/design/adminhtml/default/default/template/extensions/custom/contents.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -56,8 +62,8 @@
                         
                      
                         
                      
                         
@@ -81,9 +87,9 @@
             
             
             
-            	
-            		getAddRowButtonHtml('contents_container', 'contents_template', 'Add Contents Path') ?>
-            	
+                
+                    getAddRowButtonHtml('contents_container', 'contents_template', $this->__('Add Contents Path')) ?>
+                
             
         
     
diff --git a/app/design/adminhtml/default/default/template/extensions/custom/depends.phtml b/app/design/adminhtml/default/default/template/extensions/custom/depends.phtml
index 25e38eb580..49d0218639 100644
--- a/app/design/adminhtml/default/default/template/extensions/custom/depends.phtml
+++ b/app/design/adminhtml/default/default/template/extensions/custom/depends.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -81,9 +87,9 @@
             
             
             
-            	
-            		getAddRowButtonHtml('depends_packages_container', 'depends_packages_template', 'Add Package dependency') ?>
-            	
+                
+                    getAddRowButtonHtml('depends_packages_container', 'depends_packages_template', $this->__('Add Package dependency')) ?>
+                
             
         
     
@@ -143,9 +149,9 @@
             
             
             
-            	
-            		getAddRowButtonHtml('depends_subpackages_container', 'depends_subpackages_template', 'Add Subpackage dependency') ?>
-            	
+                
+                    getAddRowButtonHtml('depends_subpackages_container', 'depends_subpackages_template', $this->__('Add Subpackage dependency')) ?>
+                
             
         
     
@@ -206,9 +212,9 @@
             
             
             
-            	
-            		getAddRowButtonHtml('depends_extensions_container', 'depends_extensions_template', 'Add PHP Extension dependency') ?>
-            	
+                
+                    getAddRowButtonHtml('depends_extensions_container', 'depends_extensions_template', $this->__('Add PHP Extension dependency')) ?>
+                
             
         
     
diff --git a/app/design/adminhtml/default/default/template/extensions/custom/load.phtml b/app/design/adminhtml/default/default/template/extensions/custom/load.phtml
new file mode 100644
index 0000000000..9457071b03
--- /dev/null
+++ b/app/design/adminhtml/default/default/template/extensions/custom/load.phtml
@@ -0,0 +1,35 @@
+
+
+
      
+    
    • 
+        
        
+            
      • __("Please be careful as once you click on the row it will load package data form the selected file and all unsaved form data will be lost.") ?>
        • 
+        
      
+    
      • 
+
    
+getPackageGridHtml() ?>
\ No newline at end of file
diff --git a/app/design/adminhtml/default/default/template/extensions/custom/maintainers.phtml b/app/design/adminhtml/default/default/template/extensions/custom/maintainers.phtml
index 931368e851..ea9cea8657 100644
--- a/app/design/adminhtml/default/default/template/extensions/custom/maintainers.phtml
+++ b/app/design/adminhtml/default/default/template/extensions/custom/maintainers.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -73,9 +79,9 @@
             
             
             
-            	
-            		getAddRowButtonHtml('maintainers_container', 'maintainers_template', 'Add Maintainer') ?>
-            	
+                
+                    getAddRowButtonHtml('maintainers_container', 'maintainers_template', $this->__('Add Maintainer')) ?>
+                
             
         
     
diff --git a/app/design/adminhtml/default/default/template/extensions/custom/package.phtml b/app/design/adminhtml/default/default/template/extensions/custom/package.phtml
index 2cfa259abf..24c2367fc8 100644
--- a/app/design/adminhtml/default/default/template/extensions/custom/package.phtml
+++ b/app/design/adminhtml/default/default/template/extensions/custom/package.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -22,7 +28,7 @@
 
\ No newline at end of file
diff --git a/app/design/adminhtml/default/default/template/newsletter/queue/list.phtml b/app/design/adminhtml/default/default/template/newsletter/queue/list.phtml
index 5fe6880ebb..98350160a1 100644
--- a/app/design/adminhtml/default/default/template/newsletter/queue/list.phtml
+++ b/app/design/adminhtml/default/default/template/newsletter/queue/list.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/newsletter/subscriber/list.phtml b/app/design/adminhtml/default/default/template/newsletter/subscriber/list.phtml
index a68e1cd55a..4a0838528f 100644
--- a/app/design/adminhtml/default/default/template/newsletter/subscriber/list.phtml
+++ b/app/design/adminhtml/default/default/template/newsletter/subscriber/list.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/newsletter/template/edit.phtml b/app/design/adminhtml/default/default/template/newsletter/template/edit.phtml
index b3eeb463b8..c251412239 100644
--- a/app/design/adminhtml/default/default/template/newsletter/template/edit.phtml
+++ b/app/design/adminhtml/default/default/template/newsletter/template/edit.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -19,7 +25,7 @@
  */
 ?>
 
    
-   
    getHeaderText() ?>
    
+   
    getHeaderText() ?>
    
    
    
                 getBackButtonHtml(); ?>
                 getResetButtonHtml(); ?>
@@ -38,15 +44,20 @@
     
    
 
    
 
    
-
-
+
    
+    
+    
+
    
 getForm() ?>
 
    
 
    
-
-
+
    
+    
+    
+
    
 
    
-
diff --git a/app/design/adminhtml/default/default/template/newsletter/template/list.phtml b/app/design/adminhtml/default/default/template/newsletter/template/list.phtml
index e04dde1473..b0c526b5e2 100644
--- a/app/design/adminhtml/default/default/template/newsletter/template/list.phtml
+++ b/app/design/adminhtml/default/default/template/newsletter/template/list.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/newsletter/template/preview.phtml b/app/design/adminhtml/default/default/template/newsletter/template/preview.phtml
index 588974bef2..6085a57170 100644
--- a/app/design/adminhtml/default/default/template/newsletter/template/preview.phtml
+++ b/app/design/adminhtml/default/default/template/newsletter/template/preview.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/notification/toolbar.phtml b/app/design/adminhtml/default/default/template/notification/toolbar.phtml
index 8fe9f284a1..96c135ee12 100644
--- a/app/design/adminhtml/default/default/template/notification/toolbar.phtml
+++ b/app/design/adminhtml/default/default/template/notification/toolbar.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    design_default
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -20,38 +26,43 @@
 ?>
 isShow()): ?>
 
    
-	getCriticalCount()):
-			$sParts[] = ''.$this->getCriticalCount().' '.$this->__('critical').'';
-		endif;
+        if ($this->getCriticalCount()):
+            $sParts[] = ''.$this->getCriticalCount().' '.$this->__('critical').'';
+        endif;
 
-		if ($this->getMajorCount()):
+        if ($this->getMajorCount()):
             $sParts[] = ''.$this->getMajorCount().' '.$this->__('major');
-		endif;
+        endif;
 
-		if ($this->getMinorCount()):
-		    $sParts[] = ''.$this->getMinorCount().' '.$this->__('minor');
-		endif;
+        if ($this->getMinorCount()):
+            $sParts[] = ''.$this->getMinorCount().' '.$this->__('minor');
+        endif;
 
-		if ($this->getNoticeCount()):
-		    $sParts[] = ''.$this->getNoticeCount().' '.$this->__('notice');
-		endif;
+        if ($this->getNoticeCount()):
+            $sParts[] = ''.$this->getNoticeCount().' '.$this->__('notice');
+        endif;
 
-		$msgStats = '';
-		$c = count($sParts);
-		for ($i = 0; $i < $c; $i++) {
-		    $msgStats .= $sParts[$i] . ($i == $c-1 ? '' : ($i == $c-2 ? ' and ' : ', '));
-		}
+        $msgStats = '';
+        $c = count($sParts);
+        for ($i = 0; $i < $c; $i++) {
+            $msgStats .= $sParts[$i] . ($i == $c-1 ? '' : ($i == $c-2 ? $this->__(' and ') : ', '));
+        }
 
-	?>
+    ?>
+    __('You have %s unread message(s). Go to messages inbox.',
         $msgStats,
         $this->getNoticesInboxUrl()
     );?>
+    */?>
+    __('You have') . ' ' . $msgStats. ' ' .$this->__('unread message(s). Go to messages inbox.',
+        $this->getNoticesInboxUrl()
+    );?>
 __('You have %s, %s and %s unread messages. Go to messages inbox.',
+    __('You have %s, %s and %s unread messages. Go to messages inbox.',
         ''.$this->getCriticalCount().' '.$this->__('critical').'',
         ''.$this->getMajorCount().' '.$this->__('major'),
         ''.$this->getMinorCount().' '.$this->__('minor'),
diff --git a/app/design/adminhtml/default/default/template/notification/window.phtml b/app/design/adminhtml/default/default/template/notification/window.phtml
index c08ea92230..4bfab50a36 100644
--- a/app/design/adminhtml/default/default/template/notification/window.phtml
+++ b/app/design/adminhtml/default/default/template/notification/window.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    design_default
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/page.phtml b/app/design/adminhtml/default/default/template/page.phtml
index 2be617757b..4844ed5b3a 100644
--- a/app/design/adminhtml/default/default/template/page.phtml
+++ b/app/design/adminhtml/default/default/template/page.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/page/footer.phtml b/app/design/adminhtml/default/default/template/page/footer.phtml
index 4b92d88265..9fadd51683 100644
--- a/app/design/adminhtml/default/default/template/page/footer.phtml
+++ b/app/design/adminhtml/default/default/template/page/footer.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/page/header.phtml b/app/design/adminhtml/default/default/template/page/header.phtml
index 1ba617c1cf..f3739d7d28 100644
--- a/app/design/adminhtml/default/default/template/page/header.phtml
+++ b/app/design/adminhtml/default/default/template/page/header.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/page/js/translate.phtml b/app/design/adminhtml/default/default/template/page/js/translate.phtml
index 3942a4565b..3940082848 100644
--- a/app/design/adminhtml/default/default/template/page/js/translate.phtml
+++ b/app/design/adminhtml/default/default/template/page/js/translate.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Page
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/page/menu.phtml b/app/design/adminhtml/default/default/template/page/menu.phtml
index 15962acbf0..cc84162d28 100644
--- a/app/design/adminhtml/default/default/template/page/menu.phtml
+++ b/app/design/adminhtml/default/default/template/page/menu.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/payment/form/cc.phtml b/app/design/adminhtml/default/default/template/payment/form/cc.phtml
index f0d1069bfb..12592bd998 100644
--- a/app/design/adminhtml/default/default/template/payment/form/cc.phtml
+++ b/app/design/adminhtml/default/default/template/payment/form/cc.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/payment/form/ccsave.phtml b/app/design/adminhtml/default/default/template/payment/form/ccsave.phtml
index 0c60b839a5..18bcc6fb77 100644
--- a/app/design/adminhtml/default/default/template/payment/form/ccsave.phtml
+++ b/app/design/adminhtml/default/default/template/payment/form/ccsave.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/payment/form/checkmo.phtml b/app/design/adminhtml/default/default/template/payment/form/checkmo.phtml
index 69cce1f685..3b94595a9a 100644
--- a/app/design/adminhtml/default/default/template/payment/form/checkmo.phtml
+++ b/app/design/adminhtml/default/default/template/payment/form/checkmo.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/payment/form/purchaseorder.phtml b/app/design/adminhtml/default/default/template/payment/form/purchaseorder.phtml
index a63217ad13..6114fb0b8c 100644
--- a/app/design/adminhtml/default/default/template/payment/form/purchaseorder.phtml
+++ b/app/design/adminhtml/default/default/template/payment/form/purchaseorder.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/payment/info/cc.phtml b/app/design/adminhtml/default/default/template/payment/info/cc.phtml
index 18425f3f8f..ecf70d0dce 100644
--- a/app/design/adminhtml/default/default/template/payment/info/cc.phtml
+++ b/app/design/adminhtml/default/default/template/payment/info/cc.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/payment/info/ccsave.phtml b/app/design/adminhtml/default/default/template/payment/info/ccsave.phtml
index 29ed2a7bdc..e6e4edbcb0 100644
--- a/app/design/adminhtml/default/default/template/payment/info/ccsave.phtml
+++ b/app/design/adminhtml/default/default/template/payment/info/ccsave.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/payment/info/checkmo.phtml b/app/design/adminhtml/default/default/template/payment/info/checkmo.phtml
index e25b2d613d..164227033b 100644
--- a/app/design/adminhtml/default/default/template/payment/info/checkmo.phtml
+++ b/app/design/adminhtml/default/default/template/payment/info/checkmo.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/payment/info/default.phtml b/app/design/adminhtml/default/default/template/payment/info/default.phtml
index abb2d6a385..9fd74fa7a9 100644
--- a/app/design/adminhtml/default/default/template/payment/info/default.phtml
+++ b/app/design/adminhtml/default/default/template/payment/info/default.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/payment/info/pdf/cc.phtml b/app/design/adminhtml/default/default/template/payment/info/pdf/cc.phtml
index 6dc39f2c9b..2b5d64c142 100644
--- a/app/design/adminhtml/default/default/template/payment/info/pdf/cc.phtml
+++ b/app/design/adminhtml/default/default/template/payment/info/pdf/cc.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/payment/info/pdf/ccsave.phtml b/app/design/adminhtml/default/default/template/payment/info/pdf/ccsave.phtml
index 79cefec354..148df3e845 100644
--- a/app/design/adminhtml/default/default/template/payment/info/pdf/ccsave.phtml
+++ b/app/design/adminhtml/default/default/template/payment/info/pdf/ccsave.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/payment/info/pdf/checkmo.phtml b/app/design/adminhtml/default/default/template/payment/info/pdf/checkmo.phtml
index e82cae4a86..e178944c08 100644
--- a/app/design/adminhtml/default/default/template/payment/info/pdf/checkmo.phtml
+++ b/app/design/adminhtml/default/default/template/payment/info/pdf/checkmo.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/payment/info/pdf/default.phtml b/app/design/adminhtml/default/default/template/payment/info/pdf/default.phtml
index 8b54ba8dd2..b8850bec7e 100644
--- a/app/design/adminhtml/default/default/template/payment/info/pdf/default.phtml
+++ b/app/design/adminhtml/default/default/template/payment/info/pdf/default.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/payment/info/pdf/purchaseorder.phtml b/app/design/adminhtml/default/default/template/payment/info/pdf/purchaseorder.phtml
index 881aa7c354..6eb8a3b1c2 100644
--- a/app/design/adminhtml/default/default/template/payment/info/pdf/purchaseorder.phtml
+++ b/app/design/adminhtml/default/default/template/payment/info/pdf/purchaseorder.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/payment/info/purchaseorder.phtml b/app/design/adminhtml/default/default/template/payment/info/purchaseorder.phtml
index e7ad2ad607..5bd33f08ff 100644
--- a/app/design/adminhtml/default/default/template/payment/info/purchaseorder.phtml
+++ b/app/design/adminhtml/default/default/template/payment/info/purchaseorder.phtml
@@ -12,10 +12,17 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
  * @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 ?>
+
    getMethod()->getTitle() ?>
    
 
    __('Purchase Order Number: %s', $this->htmlEscape($this->getInfo()->getPoNumber())) ?>
    
diff --git a/app/design/adminhtml/default/default/template/paypal/express/info.phtml b/app/design/adminhtml/default/default/template/paypal/express/info.phtml
index 2eab8232fe..ed2ae09883 100644
--- a/app/design/adminhtml/default/default/template/paypal/express/info.phtml
+++ b/app/design/adminhtml/default/default/template/paypal/express/info.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/paypal/express/pdf/info.phtml b/app/design/adminhtml/default/default/template/paypal/express/pdf/info.phtml
index d1c8d5b52d..4b0e106ddb 100644
--- a/app/design/adminhtml/default/default/template/paypal/express/pdf/info.phtml
+++ b/app/design/adminhtml/default/default/template/paypal/express/pdf/info.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/paypaluk/direct/form.phtml b/app/design/adminhtml/default/default/template/paypaluk/direct/form.phtml
index 63411eca7f..0cfff72f27 100644
--- a/app/design/adminhtml/default/default/template/paypaluk/direct/form.phtml
+++ b/app/design/adminhtml/default/default/template/paypaluk/direct/form.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -40,7 +46,7 @@
         
  • 
             
    
                 
    
-                
+                
             
    
         
    • 
         
  • 
@@ -66,7 +72,7 @@
                 
    
                 
      
                 
    • __('Issue Number') ?>:
-                
      • 
+                
                 
    • __('Start Date') ?>:
                  
+                
                  
                 __('What is this?') ?>
             
    • 
diff --git a/app/design/adminhtml/default/default/template/paypaluk/direct/info.phtml b/app/design/adminhtml/default/default/template/paypaluk/direct/info.phtml
index 60dab0a46f..54e88b56d0 100644
--- a/app/design/adminhtml/default/default/template/paypaluk/direct/info.phtml
+++ b/app/design/adminhtml/default/default/template/paypaluk/direct/info.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/paypaluk/direct/pdf/info.phtml b/app/design/adminhtml/default/default/template/paypaluk/direct/pdf/info.phtml
index 411565f4fe..7f96366f9c 100644
--- a/app/design/adminhtml/default/default/template/paypaluk/direct/pdf/info.phtml
+++ b/app/design/adminhtml/default/default/template/paypaluk/direct/pdf/info.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/paypaluk/express/info.phtml b/app/design/adminhtml/default/default/template/paypaluk/express/info.phtml
index 2eab8232fe..ed2ae09883 100644
--- a/app/design/adminhtml/default/default/template/paypaluk/express/info.phtml
+++ b/app/design/adminhtml/default/default/template/paypaluk/express/info.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/paypaluk/express/pdf/info.phtml b/app/design/adminhtml/default/default/template/paypaluk/express/pdf/info.phtml
index d1c8d5b52d..4b0e106ddb 100644
--- a/app/design/adminhtml/default/default/template/paypaluk/express/pdf/info.phtml
+++ b/app/design/adminhtml/default/default/template/paypaluk/express/pdf/info.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/permissions/roleinfo.phtml b/app/design/adminhtml/default/default/template/permissions/roleinfo.phtml
index 32ee45144c..fb8c311e58 100644
--- a/app/design/adminhtml/default/default/template/permissions/roleinfo.phtml
+++ b/app/design/adminhtml/default/default/template/permissions/roleinfo.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -33,6 +39,6 @@
 
 
    
 
    
-
\ No newline at end of file
diff --git a/app/design/adminhtml/default/default/template/permissions/roles.phtml b/app/design/adminhtml/default/default/template/permissions/roles.phtml
index ab5b3ea287..f298d712d3 100644
--- a/app/design/adminhtml/default/default/template/permissions/roles.phtml
+++ b/app/design/adminhtml/default/default/template/permissions/roles.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/permissions/rolesedit.phtml b/app/design/adminhtml/default/default/template/permissions/rolesedit.phtml
index 9c59c6336a..4e1b8a1e6b 100644
--- a/app/design/adminhtml/default/default/template/permissions/rolesedit.phtml
+++ b/app/design/adminhtml/default/default/template/permissions/rolesedit.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/permissions/rolesusers.phtml b/app/design/adminhtml/default/default/template/permissions/rolesusers.phtml
index a8a1cc067d..7e1e37bbd3 100644
--- a/app/design/adminhtml/default/default/template/permissions/rolesusers.phtml
+++ b/app/design/adminhtml/default/default/template/permissions/rolesusers.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/permissions/userinfo.phtml b/app/design/adminhtml/default/default/template/permissions/userinfo.phtml
index cec95b1e18..ab6e5d47b0 100644
--- a/app/design/adminhtml/default/default/template/permissions/userinfo.phtml
+++ b/app/design/adminhtml/default/default/template/permissions/userinfo.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -40,6 +46,6 @@
 
 
    
 
    
-
\ No newline at end of file
diff --git a/app/design/adminhtml/default/default/template/permissions/usernroles.phtml b/app/design/adminhtml/default/default/template/permissions/usernroles.phtml
index 1db733cd2f..86167d8731 100644
--- a/app/design/adminhtml/default/default/template/permissions/usernroles.phtml
+++ b/app/design/adminhtml/default/default/template/permissions/usernroles.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/permissions/userroles.phtml b/app/design/adminhtml/default/default/template/permissions/userroles.phtml
index 059c8a4ba4..19b186d5f6 100644
--- a/app/design/adminhtml/default/default/template/permissions/userroles.phtml
+++ b/app/design/adminhtml/default/default/template/permissions/userroles.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/permissions/users.phtml b/app/design/adminhtml/default/default/template/permissions/users.phtml
index e365862de8..c8255c6c8f 100644
--- a/app/design/adminhtml/default/default/template/permissions/users.phtml
+++ b/app/design/adminhtml/default/default/template/permissions/users.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/poll/answers/list.phtml b/app/design/adminhtml/default/default/template/poll/answers/list.phtml
index 2d25a3cd06..cc53b1cf6a 100644
--- a/app/design/adminhtml/default/default/template/poll/answers/list.phtml
+++ b/app/design/adminhtml/default/default/template/poll/answers/list.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -25,33 +31,33 @@
     
    __('Assigned Answers') ?>
    
     
     getItems() as $_item): ?>
-        
    
-        
+        
    
+        
    
-                
-                
+                
+                
-                
-                
+                
    
             
    __('Answer Title:') ?> *getDeleteButtonHtml() ?>
             
    
             
    __('Votes Count:') ?> *getDeleteButtonHtml() ?>
-                    
+                
                 
              
    
         
    
         
-        
    
+        
     
 
 
 getAddButtonHtml(); ?>
 
 
diff --git a/app/design/adminhtml/default/default/template/popup.phtml b/app/design/adminhtml/default/default/template/popup.phtml
index e68fdb9f12..757a6a760d 100644
--- a/app/design/adminhtml/default/default/template/popup.phtml
+++ b/app/design/adminhtml/default/default/template/popup.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -34,39 +40,38 @@
 
 
 
-    getChildHtml('head') ?>
+getChildHtml('head') ?>
 
-
-
    
-  
    
-      
    
-      getChildHtml('left')): ?>
-          
    
-              
    
-                getChildHtml('left') ?>
-              
    
-              
    
-                
    
-                  
    getMessagesBlock()->getGroupedHtml() ?>
    
-                    getChildHtml('content') ?>
+
+
    
+    
    
+        
    
+        getChildHtml('left')): ?>
+            
    
+                
    
+                    getChildHtml('left') ?>
                 
    
-              
    
-          
    
+                
    
+                    
    
+                        
    getMessagesBlock()->getGroupedHtml() ?>
    
+                        getChildHtml('content') ?>
+                    
    
+                
    
+            
    
       
           
    getMessagesBlock()->getGroupedHtml() ?>
    
           getChildHtml('content') ?>
       
-     
    
-  
    
-  
    
-	  getChildHtml('footer') ?>
-  
    
-	  getChildHtml('js') ?>
-
-getChildHtml('profiler') ?>
-
+         
    
+    
    
+    
    
+        getChildHtml('footer') ?>
+    
    
+    getChildHtml('js') ?>
+    getChildHtml('profiler') ?>
+    
 
    
 getChildHtml('before_body_end') ?>
 
diff --git a/app/design/adminhtml/default/default/template/promo/fieldset.phtml b/app/design/adminhtml/default/default/template/promo/fieldset.phtml
index 8d4bb6bd82..d09cfc7abe 100644
--- a/app/design/adminhtml/default/default/template/promo/fieldset.phtml
+++ b/app/design/adminhtml/default/default/template/promo/fieldset.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Adminhtml
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/promo/form.phtml b/app/design/adminhtml/default/default/template/promo/form.phtml
index 6fb1169aed..3e3d4d6290 100644
--- a/app/design/adminhtml/default/default/template/promo/form.phtml
+++ b/app/design/adminhtml/default/default/template/promo/form.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/promo/widget/categories.phtml b/app/design/adminhtml/default/default/template/promo/widget/categories.phtml
deleted file mode 100644
index a06835f35b..0000000000
--- a/app/design/adminhtml/default/default/template/promo/widget/categories.phtml
+++ /dev/null
@@ -1,81 +0,0 @@
-
-
-
    
-
-getRootNode() && $this->getRootNode()->hasChildren()): ?>
-
-
\ No newline at end of file
diff --git a/app/design/adminhtml/default/default/template/rating/detailed.phtml b/app/design/adminhtml/default/default/template/rating/detailed.phtml
index c0e739a2e6..4365697593 100644
--- a/app/design/adminhtml/default/default/template/rating/detailed.phtml
+++ b/app/design/adminhtml/default/default/template/rating/detailed.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/rating/options.phtml b/app/design/adminhtml/default/default/template/rating/options.phtml
index fbde792d57..8cbf8331f6 100644
--- a/app/design/adminhtml/default/default/template/rating/options.phtml
+++ b/app/design/adminhtml/default/default/template/rating/options.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/rating/stars/detailed.phtml b/app/design/adminhtml/default/default/template/rating/stars/detailed.phtml
index 2bead27ea7..058eace0c8 100644
--- a/app/design/adminhtml/default/default/template/rating/stars/detailed.phtml
+++ b/app/design/adminhtml/default/default/template/rating/stars/detailed.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/rating/stars/summary.phtml b/app/design/adminhtml/default/default/template/rating/stars/summary.phtml
index e5089b8106..bc73c187f8 100644
--- a/app/design/adminhtml/default/default/template/rating/stars/summary.phtml
+++ b/app/design/adminhtml/default/default/template/rating/stars/summary.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/report/grid.phtml b/app/design/adminhtml/default/default/template/report/grid.phtml
index 7ba0a218d9..8a6cefb50e 100644
--- a/app/design/adminhtml/default/default/template/report/grid.phtml
+++ b/app/design/adminhtml/default/default/template/report/grid.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/report/store/switcher.phtml b/app/design/adminhtml/default/default/template/report/store/switcher.phtml
index 5a205149dc..d1bb8b6556 100644
--- a/app/design/adminhtml/default/default/template/report/store/switcher.phtml
+++ b/app/design/adminhtml/default/default/template/report/store/switcher.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/report/wishlist.phtml b/app/design/adminhtml/default/default/template/report/wishlist.phtml
index 9df358853d..81209ab61e 100644
--- a/app/design/adminhtml/default/default/template/report/wishlist.phtml
+++ b/app/design/adminhtml/default/default/template/report/wishlist.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/review/add.phtml b/app/design/adminhtml/default/default/template/review/add.phtml
index fa16921a16..2c5d4ddd9a 100644
--- a/app/design/adminhtml/default/default/template/review/add.phtml
+++ b/app/design/adminhtml/default/default/template/review/add.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/sales/items/column/name.phtml b/app/design/adminhtml/default/default/template/sales/items/column/name.phtml
index fe52242947..dffd916423 100644
--- a/app/design/adminhtml/default/default/template/sales/items/column/name.phtml
+++ b/app/design/adminhtml/default/default/template/sales/items/column/name.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -20,12 +26,22 @@
 ?>
 getItem()): ?>
     
    getName() ?>
    
-    
    helper('sales')->__('SKU') ?>: getSku() ?>
    
+    
    helper('sales')->__('SKU') ?>: getSku() ?>
    
     getOrderOptions()): ?>
         
    
-        getOrderOptions() as $option): ?>
-            
    
-            
    htmlEscape($option['value']); ?>
    
+        getOrderOptions() as $_option): ?>
+            
    
+            
    
+            htmlEscape(Mage::helper('core/string')->truncate($_option['value'], 55, '', $_remainder));?>
+            
+                ... htmlEscape($_remainder) ?>
+                
+            
+            
    
         
         
    
     
diff --git a/app/design/adminhtml/default/default/template/sales/items/column/qty.phtml b/app/design/adminhtml/default/default/template/sales/items/column/qty.phtml
index 9dba1a2593..b1376013f6 100644
--- a/app/design/adminhtml/default/default/template/sales/items/column/qty.phtml
+++ b/app/design/adminhtml/default/default/template/sales/items/column/qty.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/sales/items/renderer/default.phtml b/app/design/adminhtml/default/default/template/sales/items/renderer/default.phtml
index 6b370a824d..cb5d49c3a6 100644
--- a/app/design/adminhtml/default/default/template/sales/items/renderer/default.phtml
+++ b/app/design/adminhtml/default/default/template/sales/items/renderer/default.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/sales/order/comments/view.phtml b/app/design/adminhtml/default/default/template/sales/order/comments/view.phtml
index 1044bffcb4..24a0f4e573 100644
--- a/app/design/adminhtml/default/default/template/sales/order/comments/view.phtml
+++ b/app/design/adminhtml/default/default/template/sales/order/comments/view.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/sales/order/create/abstract.phtml b/app/design/adminhtml/default/default/template/sales/order/create/abstract.phtml
index 2454e23e48..f7b1da55b6 100644
--- a/app/design/adminhtml/default/default/template/sales/order/create/abstract.phtml
+++ b/app/design/adminhtml/default/default/template/sales/order/create/abstract.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -23,7 +29,7 @@
         
    getButtonsHtml() ?>
    
         
    getHeaderText() ?>
    
     
    
-    
    
+    
    
         getChildHtml() ?>
-    
    
+    
    
 
\ No newline at end of file
diff --git a/app/design/adminhtml/default/default/template/sales/order/create/billing/method/form.phtml b/app/design/adminhtml/default/default/template/sales/order/create/billing/method/form.phtml
index 9283a4f30d..a2bb9d08da 100644
--- a/app/design/adminhtml/default/default/template/sales/order/create/billing/method/form.phtml
+++ b/app/design/adminhtml/default/default/template/sales/order/create/billing/method/form.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/sales/order/create/comment.phtml b/app/design/adminhtml/default/default/template/sales/order/create/comment.phtml
index 5a83e82bfb..32dfb58265 100644
--- a/app/design/adminhtml/default/default/template/sales/order/create/comment.phtml
+++ b/app/design/adminhtml/default/default/template/sales/order/create/comment.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   adminhtml
  * @package    default_default
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -19,6 +25,6 @@
  */
  ?>
 
-__('Order Comments') ?>
    
-
    
+
    
+
 
\ No newline at end of file
diff --git a/app/design/adminhtml/default/default/template/sales/order/create/coupons/form.phtml b/app/design/adminhtml/default/default/template/sales/order/create/coupons/form.phtml
index eeffa205a6..e128bf28fa 100644
--- a/app/design/adminhtml/default/default/template/sales/order/create/coupons/form.phtml
+++ b/app/design/adminhtml/default/default/template/sales/order/create/coupons/form.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/sales/order/create/data.phtml b/app/design/adminhtml/default/default/template/sales/order/create/data.phtml
index 7c6e8391e1..5d320a5cbb 100644
--- a/app/design/adminhtml/default/default/template/sales/order/create/data.phtml
+++ b/app/design/adminhtml/default/default/template/sales/order/create/data.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    default_default
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/sales/order/create/form.phtml b/app/design/adminhtml/default/default/template/sales/order/create/form.phtml
index 9e8efaa6b1..15754a5125 100644
--- a/app/design/adminhtml/default/default/template/sales/order/create/form.phtml
+++ b/app/design/adminhtml/default/default/template/sales/order/create/form.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/sales/order/create/form/account.phtml b/app/design/adminhtml/default/default/template/sales/order/create/form/account.phtml
index fcd29246a6..de3888d4e4 100644
--- a/app/design/adminhtml/default/default/template/sales/order/create/form/account.phtml
+++ b/app/design/adminhtml/default/default/template/sales/order/create/form/account.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   adminhtml
  * @package    default_default
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/sales/order/create/giftmessage.phtml b/app/design/adminhtml/default/default/template/sales/order/create/giftmessage.phtml
index abe4cf14ce..771acd45b3 100644
--- a/app/design/adminhtml/default/default/template/sales/order/create/giftmessage.phtml
+++ b/app/design/adminhtml/default/default/template/sales/order/create/giftmessage.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    default_default
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -26,36 +32,32 @@
         
    
             
    __('Gift Message') ?>
    
         
    
-        
    
-        
-            
-                
-                
-            
-        
    
+        
    
+            
    
                 
    
-                    
    __('Add a gift message for the entire order') ?>
    
+                    
    __('Add a gift message for the entire order') ?>
    
                     getFormHtml($this->getQuote(), 'main') ?>
                 
    
-                
    		
+            
+            
    
                 getItems()): ?>
                     
    
-                        
    __('Add a gift message for each gift item') ?>
    
+                        
    __('Add a gift message for each gift item') ?>
    
                         
    
                             
-                                
    getName() ?>
    
+                                
    getName() ?>
    
                                 getFormHtml($_item, 'item'); ?>
                             
                         
    
                     
    
                 
-                
    
-
-        
    
+            
+            
    
+        
     
 
-
    
 
 
diff --git a/app/design/adminhtml/default/default/template/sales/order/create/items.phtml b/app/design/adminhtml/default/default/template/sales/order/create/items.phtml
index 89dd80d01f..e7ea082f1e 100644
--- a/app/design/adminhtml/default/default/template/sales/order/create/items.phtml
+++ b/app/design/adminhtml/default/default/template/sales/order/create/items.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/sales/order/create/items/grid.phtml b/app/design/adminhtml/default/default/template/sales/order/create/items/grid.phtml
index e835e08ba8..18d1287dd4 100644
--- a/app/design/adminhtml/default/default/template/sales/order/create/items/grid.phtml
+++ b/app/design/adminhtml/default/default/template/sales/order/create/items/grid.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -20,9 +26,9 @@
 ?>
 getItems() ?>
 
-    
    
-    
    helper('sales')->__('No ordered items') ?>
    
-    
    
+    
    
+        
    helper('sales')->__('No ordered items') ?>
    
+    
    
 
 
    
     10): ?>
@@ -39,7 +45,7 @@
             
             
             isGiftMessagesAvailable()): ?>
-            
+            
             
             
             
@@ -57,12 +63,22 @@
                     helper('sales')->__('Action') ?>
                 
             
+            
+                
+                    helper('sales')->__('Total %d product(s)', count($_items)) ?>
+                    helper('sales')->__('Subtotal:') ?>
+                    formatPrice($this->getSubtotal()) ?>
+                    formatPrice(-$this->getDiscountAmount()) ?>
+                    formatPrice($this->getSubtotalWithDiscount()) ?>
+                    isGiftMessagesAvailable()): ?>colspan="2"> 
+                
+            
             
                 
                 
                     
                         
    getName() ?>
    
-                            
    
+                            
    
                                 helper('sales')->__('SKU') ?>: getSku() ?>
                             
    
                             
    
@@ -156,7 +172,7 @@
                             
                         
                         isGiftMessagesAvailable()): ?>
-                        
+                        
                             isAllowedForGiftMessage($_item)): ?> checked="checked"isGiftMessagesAvailable($_item)): ?> disabled="disabled"/>
                         
                         
@@ -173,25 +189,17 @@
                     
                 
             
-            
-                
-                    helper('sales')->__('Total %d product(s)', count($_items)) ?>
-                    helper('sales')->__('Subtotal:') ?>
-                    formatPrice($this->getSubtotal()) ?>
-                    formatPrice(-$this->getDiscountAmount()) ?>
-                    formatPrice($this->getSubtotalWithDiscount()) ?>
-                    isGiftMessagesAvailable()): ?>colspan="2"> 
-                
-            
         
     
    
-    
+    
    
+    +    
-            
+            
+            
-            
-            
+            
    

         
    getInclExclTaxMessage(); ?>getInclExclTaxMessage(); ?>getButtonHtml($this->helper('sales')->__('Update Items and Qty\'s'),'order.itemsUpdate()'); ?>
         
    
         
    getChildHtml('coupons') ?>
    		getButtonHtml($this->helper('sales')->__('Update Items and Qty\'s'),'order.itemsUpdate()'); ?>
    getChildHtml('coupons') ?>
    		
         
    
     
    
     
    
diff --git a/app/design/adminhtml/default/default/template/sales/order/create/js.phtml b/app/design/adminhtml/default/default/template/sales/order/create/js.phtml
index dcbe1ecccb..ceb1f4f206 100644
--- a/app/design/adminhtml/default/default/template/sales/order/create/js.phtml
+++ b/app/design/adminhtml/default/default/template/sales/order/create/js.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Adminhtml
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/sales/order/create/newsletter/form.phtml b/app/design/adminhtml/default/default/template/sales/order/create/newsletter/form.phtml
index 76a92cdcf5..806ff49ab5 100644
--- a/app/design/adminhtml/default/default/template/sales/order/create/newsletter/form.phtml
+++ b/app/design/adminhtml/default/default/template/sales/order/create/newsletter/form.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/sales/order/create/shipping/method/form.phtml b/app/design/adminhtml/default/default/template/sales/order/create/shipping/method/form.phtml
index 4a848516c8..569e9164b9 100644
--- a/app/design/adminhtml/default/default/template/sales/order/create/shipping/method/form.phtml
+++ b/app/design/adminhtml/default/default/template/sales/order/create/shipping/method/form.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -35,7 +41,7 @@
                         isMethodActive($_code) ? 'checked="checked"' : '' ?>
                          value="" id="s_method_" />
                         
    
 
\ No newline at end of file
+
diff --git a/app/design/adminhtml/default/default/template/sales/order/shipment/tracking/info.phtml b/app/design/adminhtml/default/default/template/sales/order/shipment/tracking/info.phtml
index 35f8656908..f02112dffe 100644
--- a/app/design/adminhtml/default/default/template/sales/order/shipment/tracking/info.phtml
+++ b/app/design/adminhtml/default/default/template/sales/order/shipment/tracking/info.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/sales/order/shipment/view/form.phtml b/app/design/adminhtml/default/default/template/sales/order/shipment/view/form.phtml
index c7cfb34f70..d01cdfebfe 100644
--- a/app/design/adminhtml/default/default/template/sales/order/shipment/view/form.phtml
+++ b/app/design/adminhtml/default/default/template/sales/order/shipment/view/form.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/sales/order/shipment/view/items.phtml b/app/design/adminhtml/default/default/template/sales/order/shipment/view/items.phtml
index c13f5a37c8..edec7bf10a 100644
--- a/app/design/adminhtml/default/default/template/sales/order/shipment/view/items.phtml
+++ b/app/design/adminhtml/default/default/template/sales/order/shipment/view/items.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/sales/order/shipment/view/items/renderer/configurable.phtml b/app/design/adminhtml/default/default/template/sales/order/shipment/view/items/renderer/configurable.phtml
new file mode 100644
index 0000000000..85ea6800ad
--- /dev/null
+++ b/app/design/adminhtml/default/default/template/sales/order/shipment/view/items/renderer/configurable.phtml
@@ -0,0 +1,31 @@
+
+getItem() ?>
+
+    getColumnHtml($_item, 'configurable_name') ?>
+    getQty()*1 ?>
+
diff --git a/app/design/adminhtml/default/default/template/sales/order/shipment/view/items/renderer/default.phtml b/app/design/adminhtml/default/default/template/sales/order/shipment/view/items/renderer/default.phtml
index 74862bb970..d35281fec9 100644
--- a/app/design/adminhtml/default/default/template/sales/order/shipment/view/items/renderer/default.phtml
+++ b/app/design/adminhtml/default/default/template/sales/order/shipment/view/items/renderer/default.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/sales/order/shipment/view/tracking.phtml b/app/design/adminhtml/default/default/template/sales/order/shipment/view/tracking.phtml
index 6472e56612..a8d94441ef 100644
--- a/app/design/adminhtml/default/default/template/sales/order/shipment/view/tracking.phtml
+++ b/app/design/adminhtml/default/default/template/sales/order/shipment/view/tracking.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/sales/order/totalbar.phtml b/app/design/adminhtml/default/default/template/sales/order/totalbar.phtml
index 65a20426e9..2f281fec25 100644
--- a/app/design/adminhtml/default/default/template/sales/order/totalbar.phtml
+++ b/app/design/adminhtml/default/default/template/sales/order/totalbar.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/sales/order/totals.phtml b/app/design/adminhtml/default/default/template/sales/order/totals.phtml
index 0d06ff1203..0f17ff99b6 100644
--- a/app/design/adminhtml/default/default/template/sales/order/totals.phtml
+++ b/app/design/adminhtml/default/default/template/sales/order/totals.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/sales/order/view/form.phtml b/app/design/adminhtml/default/default/template/sales/order/view/form.phtml
index f91703f3de..b5a27df892 100644
--- a/app/design/adminhtml/default/default/template/sales/order/view/form.phtml
+++ b/app/design/adminhtml/default/default/template/sales/order/view/form.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/sales/order/view/giftmessage.phtml b/app/design/adminhtml/default/default/template/sales/order/view/giftmessage.phtml
index 961ff48ad4..5af39676b0 100644
--- a/app/design/adminhtml/default/default/template/sales/order/view/giftmessage.phtml
+++ b/app/design/adminhtml/default/default/template/sales/order/view/giftmessage.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -37,13 +43,13 @@
                       
                   
                   
-                      
+                      
                   
                   
-                      
+                      
                   
                   
-                      getSaveButtonHtml(); ?>
+                      getSaveButtonHtml(); ?>
                   
                 
               
diff --git a/app/design/adminhtml/default/default/template/sales/order/view/history.phtml b/app/design/adminhtml/default/default/template/sales/order/view/history.phtml
index 8841f6d94d..6695abccd6 100644
--- a/app/design/adminhtml/default/default/template/sales/order/view/history.phtml
+++ b/app/design/adminhtml/default/default/template/sales/order/view/history.phtml
@@ -12,13 +12,19 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   default
  * @package    default_default
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
  * @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 ?>
-
    
+
    
     canAddComment()):?>
     
    
         
    __('Add Order Comments') ?>
    
@@ -67,4 +73,4 @@
     
-
    
+
    
\ No newline at end of file
diff --git a/app/design/adminhtml/default/default/template/sales/order/view/info.phtml b/app/design/adminhtml/default/default/template/sales/order/view/info.phtml
index 413f643e32..b4146354ab 100644
--- a/app/design/adminhtml/default/default/template/sales/order/view/info.phtml
+++ b/app/design/adminhtml/default/default/template/sales/order/view/info.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -36,24 +42,24 @@
             ()
         
         
-        
    
+        
    
             
-                
+                
-                
+                
-                
+                getRelationChildId()): ?>
             
-                
@@ -61,7 +67,7 @@
             getRelationParentId()): ?>
             
-                
@@ -69,11 +75,11 @@
             getRemoteIp()): ?>
             
-                
+                
    
             
    
                 formatDate($_order->getCreatedAt(), 'medium', true) ?>formatDate($_order->getCreatedAt(), 'medium', true) ?>
             
    
             
    
                 getStatusLabel() ?>getStatusLabel() ?>
             
    
             
    
                 getOrderStoreName() ?>getOrderStoreName() ?>
             
    
             
    
                 
+                
                     getRelationChildRealId() ?>
                 
             
    
                 
+                
                     getRelationParentRealId() ?>
                 
             
    
                 getRemoteIp() ?>getRemoteIp() ?>
             
    
             
             
    
-        
    
+        
     
 
 
    
@@ -84,36 +90,34 @@
         
    
         
    
             
    
-              
             
    
         
    
     
diff --git a/app/design/adminhtml/default/default/template/sales/order/view/items.phtml b/app/design/adminhtml/default/default/template/sales/order/view/items.phtml
index 1498dae061..dce9dab502 100644
--- a/app/design/adminhtml/default/default/template/sales/order/view/items.phtml
+++ b/app/design/adminhtml/default/default/template/sales/order/view/items.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/sales/order/view/items/renderer/default.phtml b/app/design/adminhtml/default/default/template/sales/order/view/items/renderer/default.phtml
index 28b27ebaff..cfe9b8a0f4 100644
--- a/app/design/adminhtml/default/default/template/sales/order/view/items/renderer/default.phtml
+++ b/app/design/adminhtml/default/default/template/sales/order/view/items/renderer/default.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/sales/order/view/tab/history.phtml b/app/design/adminhtml/default/default/template/sales/order/view/tab/history.phtml
index 2ba9f6a59d..62582fb436 100644
--- a/app/design/adminhtml/default/default/template/sales/order/view/tab/history.phtml
+++ b/app/design/adminhtml/default/default/template/sales/order/view/tab/history.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/sales/order/view/tab/info.phtml b/app/design/adminhtml/default/default/template/sales/order/view/tab/info.phtml
index f16bd49f96..3b242cf7ee 100644
--- a/app/design/adminhtml/default/default/template/sales/order/view/tab/info.phtml
+++ b/app/design/adminhtml/default/default/template/sales/order/view/tab/info.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -92,7 +98,7 @@
             
    
                 
    __('Comments History') ?>
    
             
    
-            getChildHtml('order_history') ?>
+            
    getChildHtml('order_history') ?>
    
         
     
     
    
diff --git a/app/design/adminhtml/default/default/template/sales/order/view/tracking.phtml b/app/design/adminhtml/default/default/template/sales/order/view/tracking.phtml
index c12b99c17d..bdae595498 100644
--- a/app/design/adminhtml/default/default/template/sales/order/view/tracking.phtml
+++ b/app/design/adminhtml/default/default/template/sales/order/view/tracking.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/store/switcher.phtml b/app/design/adminhtml/default/default/template/store/switcher.phtml
index 0a46668cbe..9e111be8e2 100644
--- a/app/design/adminhtml/default/default/template/store/switcher.phtml
+++ b/app/design/adminhtml/default/default/template/store/switcher.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/store/switcher/enhanced.phtml b/app/design/adminhtml/default/default/template/store/switcher/enhanced.phtml
new file mode 100644
index 0000000000..19262156f4
--- /dev/null
+++ b/app/design/adminhtml/default/default/template/store/switcher/enhanced.phtml
@@ -0,0 +1,117 @@
+
+getWebsiteCollection() ?>
+getSize()): ?>
+
    
+
    
+
+
    
+
    
+
+
\ No newline at end of file
diff --git a/app/design/adminhtml/default/default/template/system/autocomplete.phtml b/app/design/adminhtml/default/default/template/system/autocomplete.phtml
index 9019e70b6f..1cbc235391 100644
--- a/app/design/adminhtml/default/default/template/system/autocomplete.phtml
+++ b/app/design/adminhtml/default/default/template/system/autocomplete.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/system/cache/edit.phtml b/app/design/adminhtml/default/default/template/system/cache/edit.phtml
index 6ec98a06b4..e8abaded61 100644
--- a/app/design/adminhtml/default/default/template/system/cache/edit.phtml
+++ b/app/design/adminhtml/default/default/template/system/cache/edit.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -27,8 +33,6 @@
  *  getForm() - html
  */
 ?>
-
-
 
    
 	
@@ -56,8 +60,17 @@ function cacheCatalogAction(button)
             getCatalogData() as $_item): ?>
             
-                
-                
+                
+                
@@ -65,9 +78,6 @@ function cacheCatalogAction(button)
 
-
-
-
-
diff --git a/app/design/adminhtml/default/default/template/system/config/edit.phtml b/app/design/adminhtml/default/default/template/system/config/edit.phtml
index 9c76de6a87..16b2deb3b9 100644
--- a/app/design/adminhtml/default/default/template/system/config/edit.phtml
+++ b/app/design/adminhtml/default/default/template/system/config/edit.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -38,9 +44,6 @@
 getChildHtml('form') ?>
 
-
-
-
-
diff --git a/app/design/adminhtml/default/default/template/system/config/form/field/array.phtml b/app/design/adminhtml/default/default/template/system/config/form/field/array.phtml
index 21a532b693..691c41a1ff 100644
--- a/app/design/adminhtml/default/default/template/system/config/form/field/array.phtml
+++ b/app/design/adminhtml/default/default/template/system/config/form/field/array.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -60,7 +66,7 @@ $_colspan = $_colspan > 1 ? 'colspan="' . $_colspan . '"' : '';
 
diff --git a/app/design/adminhtml/default/default/template/system/config/js.phtml b/app/design/adminhtml/default/default/template/system/config/js.phtml
index e8f954b219..89a26e834c 100644
--- a/app/design/adminhtml/default/default/template/system/config/js.phtml
+++ b/app/design/adminhtml/default/default/template/system/config/js.phtml
@@ -12,14 +12,20 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
  * @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 ?>
-
diff --git a/app/design/adminhtml/default/default/template/system/config/tabs.phtml b/app/design/adminhtml/default/default/template/system/config/tabs.phtml
index 643855822b..a459ff626b 100644
--- a/app/design/adminhtml/default/default/template/system/config/tabs.phtml
+++ b/app/design/adminhtml/default/default/template/system/config/tabs.phtml
@@ -12,14 +12,19 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
  * @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 ?>
-
-
    
+
    
     
     
-    
+    
    
 
    
 
 getTitle()): ?>
diff --git a/app/design/adminhtml/default/default/template/system/convert/profile/run.phtml b/app/design/adminhtml/default/default/template/system/convert/profile/run.phtml
index 98849e2e4c..20e070a9f2 100644
--- a/app/design/adminhtml/default/default/template/system/convert/profile/run.phtml
+++ b/app/design/adminhtml/default/default/template/system/convert/profile/run.phtml
@@ -39,9 +39,9 @@ function getTransferType()
 
 
      
 
    • 
-
        
-
      • __('Please make sure that your changes were saved before running the profile.') ?>
        • 
-
      
+    
        
+        
      • __('Please make sure that your changes were saved before running the profile.') ?>
        • 
+    
      
 
      • 
 
    
 
 
    
 
-
diff --git a/app/design/adminhtml/default/default/template/system/design/index.phtml b/app/design/adminhtml/default/default/template/system/design/index.phtml
index bc04b40b31..f3d81aa79c 100644
--- a/app/design/adminhtml/default/default/template/system/design/index.phtml
+++ b/app/design/adminhtml/default/default/template/system/design/index.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/system/email/template/edit.phtml b/app/design/adminhtml/default/default/template/system/email/template/edit.phtml
index 8b1d6d6170..ad2d27f81e 100644
--- a/app/design/adminhtml/default/default/template/system/email/template/edit.phtml
+++ b/app/design/adminhtml/default/default/template/system/email/template/edit.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -101,7 +107,8 @@
 
 
 
-
diff --git a/app/design/adminhtml/default/default/template/system/email/template/list.phtml b/app/design/adminhtml/default/default/template/system/email/template/list.phtml
index 88b068efd0..d11355bdba 100644
--- a/app/design/adminhtml/default/default/template/system/email/template/list.phtml
+++ b/app/design/adminhtml/default/default/template/system/email/template/list.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/system/email/template/preview.phtml b/app/design/adminhtml/default/default/template/system/email/template/preview.phtml
index 22bd9e6d4c..d622539969 100644
--- a/app/design/adminhtml/default/default/template/system/email/template/preview.phtml
+++ b/app/design/adminhtml/default/default/template/system/email/template/preview.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/system/info.phtml b/app/design/adminhtml/default/default/template/system/info.phtml
index 1665bca9f5..bb761c86b9 100644
--- a/app/design/adminhtml/default/default/template/system/info.phtml
+++ b/app/design/adminhtml/default/default/template/system/info.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/system/shipping/applicable_country.phtml b/app/design/adminhtml/default/default/template/system/shipping/applicable_country.phtml
index 382c5112b9..983cba514c 100644
--- a/app/design/adminhtml/default/default/template/system/shipping/applicable_country.phtml
+++ b/app/design/adminhtml/default/default/template/system/shipping/applicable_country.phtml
@@ -12,14 +12,20 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
  * @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 ?>
-
diff --git a/app/design/adminhtml/default/default/template/system/shipping/ups.phtml b/app/design/adminhtml/default/default/template/system/shipping/ups.phtml
index f17d58f3f2..8ad93b3399 100644
--- a/app/design/adminhtml/default/default/template/system/shipping/ups.phtml
+++ b/app/design/adminhtml/default/default/template/system/shipping/ups.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -46,7 +52,8 @@ if(!$storeCode && $websiteCode){
     $stroredFreeShipment = Mage::getStoreConfig('carriers/ups/free_method');
 }
 ?>
-
\ No newline at end of file
diff --git a/app/design/adminhtml/default/default/template/system/store/delete_group.phtml b/app/design/adminhtml/default/default/template/system/store/delete_group.phtml
index 0a833ee4a5..521d919f78 100644
--- a/app/design/adminhtml/default/default/template/system/store/delete_group.phtml
+++ b/app/design/adminhtml/default/default/template/system/store/delete_group.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -32,6 +38,6 @@
     
     
    
     
    getChildHtml('confirm_deletion_button') ?> getChildHtml('cancel_button') ?>
    
 
-
diff --git a/app/design/adminhtml/default/default/template/system/store/delete_store.phtml b/app/design/adminhtml/default/default/template/system/store/delete_store.phtml
index f9843dab32..b0951afbba 100644
--- a/app/design/adminhtml/default/default/template/system/store/delete_store.phtml
+++ b/app/design/adminhtml/default/default/template/system/store/delete_store.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -32,6 +38,6 @@
     
     
    
     
    getChildHtml('confirm_deletion_button') ?> getChildHtml('cancel_button') ?>
    
 
-
diff --git a/app/design/adminhtml/default/default/template/system/store/delete_website.phtml b/app/design/adminhtml/default/default/template/system/store/delete_website.phtml
index 139f4794c4..766aa81071 100644
--- a/app/design/adminhtml/default/default/template/system/store/delete_website.phtml
+++ b/app/design/adminhtml/default/default/template/system/store/delete_website.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -32,6 +38,6 @@
     
     
    
     
    getChildHtml('confirm_deletion_button') ?> getChildHtml('cancel_button') ?>
    
 
-
diff --git a/app/design/adminhtml/default/default/template/tag/edit.phtml b/app/design/adminhtml/default/default/template/tag/edit.phtml
index 45d131f9d2..63d693ec07 100644
--- a/app/design/adminhtml/default/default/template/tag/edit.phtml
+++ b/app/design/adminhtml/default/default/template/tag/edit.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -34,7 +40,7 @@
 
    
     getChildHtml('tagForm'); ?>
 
-
\ No newline at end of file
diff --git a/app/design/adminhtml/default/default/template/tax/importExport.phtml b/app/design/adminhtml/default/default/template/tax/importExport.phtml
index f0436051a2..4d7aba8eeb 100644
--- a/app/design/adminhtml/default/default/template/tax/importExport.phtml
+++ b/app/design/adminhtml/default/default/template/tax/importExport.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -19,34 +25,38 @@
  */
 ?>
 
    
-    
    
 		
    
                 
+                    
+                        
+                        
+                            
+                        
+                        
+                         
      
+                    
+                    		 
             
    
             
             
 
 
    
 
 
 
    __('Import / Export Tax Rates') ?>
    
+    
+        
+            
+        
+    
    __('Import / Export Tax Rates') ?>
    
 
    
-
 
    
-	
-		
-    
    
-			
    
+    
    
+        
             
    
-			
    __('Import Tax Rates') ?>
    
+                
    __('Import Tax Rates') ?>
    
             
    
-			
    
-				__('Import Tax Rates') ?>
-				
-		    	getButtonHtml('Import Tax Rates', "this.form.submit()") ?>
-			
    
-			
-			
-		
    		
-			
    
-
-            
    __('Export Tax Rates') ?>
    
-			
    
-				__('Export Tax Rates') ?>
-		        getButtonHtml('Export Tax Rates', "this.form.submit()") ?>
-		    
    
-			
    
-    	
    
-
    
\ No newline at end of file
+            
    
+                __('Import Tax Rates') ?>
+                
+                getButtonHtml('Import Tax Rates', "this.form.submit()") ?>
+            
    
+        
+        
+    
    
+    
    
+        
    
+            
    
+                
    __('Export Tax Rates') ?>
    
+            
    
+            
    
+                __('Export Tax Rates') ?>
+                getButtonHtml('Export Tax Rates', "this.form.submit()") ?>
+            
    
+        
    
+    
    
+    
    
+
diff --git a/app/design/adminhtml/default/default/template/tax/rate/form.phtml b/app/design/adminhtml/default/default/template/tax/rate/form.phtml
index 7643bb222c..ccdee615a6 100644
--- a/app/design/adminhtml/default/default/template/tax/rate/form.phtml
+++ b/app/design/adminhtml/default/default/template/tax/rate/form.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -21,8 +27,6 @@
 
    
     getFormHtml() ?>
 
    
-
 
\ No newline at end of file
+
diff --git a/app/design/adminhtml/default/default/template/tax/rate/title.phtml b/app/design/adminhtml/default/default/template/tax/rate/title.phtml
index 00833821af..64b6f1b5a1 100644
--- a/app/design/adminhtml/default/default/template/tax/rate/title.phtml
+++ b/app/design/adminhtml/default/default/template/tax/rate/title.phtml
@@ -1,3 +1,29 @@
+
  */ ?>
     
     getStores() as $_store): ?>
@@ -14,7 +40,7 @@
     
     
         
-            Note: Leave empty to use tax identifier
+            
    __('Note:'); ?> __('Leave empty to use tax identifier'); ?>
    
         
     
  */ ?>
diff --git a/app/design/adminhtml/default/default/template/tax/toolbar/class/add.phtml b/app/design/adminhtml/default/default/template/tax/toolbar/class/add.phtml
index 1256d3b91c..f69dac1c10 100644
--- a/app/design/adminhtml/default/default/template/tax/toolbar/class/add.phtml
+++ b/app/design/adminhtml/default/default/template/tax/toolbar/class/add.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/tax/toolbar/class/save.phtml b/app/design/adminhtml/default/default/template/tax/toolbar/class/save.phtml
index 96d4a2084d..87e170ebe7 100644
--- a/app/design/adminhtml/default/default/template/tax/toolbar/class/save.phtml
+++ b/app/design/adminhtml/default/default/template/tax/toolbar/class/save.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -32,7 +38,7 @@
 
 
 toHtml(); ?>
-
 
\ No newline at end of file
diff --git a/app/design/adminhtml/default/default/template/tax/toolbar/rate/add.phtml b/app/design/adminhtml/default/default/template/tax/toolbar/rate/add.phtml
index 41657c1ac3..ab8ee01485 100644
--- a/app/design/adminhtml/default/default/template/tax/toolbar/rate/add.phtml
+++ b/app/design/adminhtml/default/default/template/tax/toolbar/rate/add.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/tax/toolbar/rate/save.phtml b/app/design/adminhtml/default/default/template/tax/toolbar/rate/save.phtml
index 3891ea5c04..4b2d9a0de0 100644
--- a/app/design/adminhtml/default/default/template/tax/toolbar/rate/save.phtml
+++ b/app/design/adminhtml/default/default/template/tax/toolbar/rate/save.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -33,7 +39,7 @@
 
 
 toHtml(); ?>
-
 
\ No newline at end of file
diff --git a/app/design/adminhtml/default/default/template/tax/toolbar/rule/add.phtml b/app/design/adminhtml/default/default/template/tax/toolbar/rule/add.phtml
index 84c5cad7fc..1f3a055893 100644
--- a/app/design/adminhtml/default/default/template/tax/toolbar/rule/add.phtml
+++ b/app/design/adminhtml/default/default/template/tax/toolbar/rule/add.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/tax/toolbar/rule/save.phtml b/app/design/adminhtml/default/default/template/tax/toolbar/rule/save.phtml
index 57c88baf25..d932d9f011 100644
--- a/app/design/adminhtml/default/default/template/tax/toolbar/rule/save.phtml
+++ b/app/design/adminhtml/default/default/template/tax/toolbar/rule/save.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -33,7 +39,7 @@
 
 
 toHtml(); ?>
-
 
\ No newline at end of file
diff --git a/app/design/adminhtml/default/default/template/urlrewrite/form.phtml b/app/design/adminhtml/default/default/template/urlrewrite/form.phtml
index c1101b99ac..9ec72a4ff9 100644
--- a/app/design/adminhtml/default/default/template/urlrewrite/form.phtml
+++ b/app/design/adminhtml/default/default/template/urlrewrite/form.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/urlrewrite/product/categories.phtml b/app/design/adminhtml/default/default/template/urlrewrite/product/categories.phtml
index 634cdad82c..8c77eb62dc 100644
--- a/app/design/adminhtml/default/default/template/urlrewrite/product/categories.phtml
+++ b/app/design/adminhtml/default/default/template/urlrewrite/product/categories.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -23,21 +29,103 @@
         
    __('Product Categories') ?>
    
     
     
    
-        
+        
         
    
     
    
-    
    
-    Note: if selected product or category has been associated in this module, you can't select one of them.
-    
    
+    
    __('Note:'); ?> __('If selected product or category has been associated in this module, you can\'t select one of them.'); ?>
    
 
 getRootNode() && $this->getRootNode()->hasChildren()): ?>
 
 
\ No newline at end of file
diff --git a/app/design/adminhtml/default/default/template/widget/accordion.phtml b/app/design/adminhtml/default/default/template/widget/accordion.phtml
index 16eac2a93d..3c96a93c4a 100644
--- a/app/design/adminhtml/default/default/template/widget/accordion.phtml
+++ b/app/design/adminhtml/default/default/template/widget/accordion.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/widget/breadcrumbs.phtml b/app/design/adminhtml/default/default/template/widget/breadcrumbs.phtml
index 1969e42312..ffde9f46a2 100644
--- a/app/design/adminhtml/default/default/template/widget/breadcrumbs.phtml
+++ b/app/design/adminhtml/default/default/template/widget/breadcrumbs.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/widget/form.phtml b/app/design/adminhtml/default/default/template/widget/form.phtml
index ba2d494c9e..2214577d2c 100644
--- a/app/design/adminhtml/default/default/template/widget/form.phtml
+++ b/app/design/adminhtml/default/default/template/widget/form.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/widget/form/container.phtml b/app/design/adminhtml/default/default/template/widget/form/container.phtml
index 26af6322b6..b2de750658 100644
--- a/app/design/adminhtml/default/default/template/widget/form/container.phtml
+++ b/app/design/adminhtml/default/default/template/widget/form/container.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/widget/form/element.phtml b/app/design/adminhtml/default/default/template/widget/form/element.phtml
index 11294429a1..c7188782f2 100644
--- a/app/design/adminhtml/default/default/template/widget/form/element.phtml
+++ b/app/design/adminhtml/default/default/template/widget/form/element.phtml
@@ -1,119 +1,127 @@
-
-getType()){
-    case 'fieldset': ?>
-
-    
    getLegend() ?>
    
-    
    
-        getLegend() ?>
-        getElements() as $_element): ?>
-            drawElement($_element) ?>
-        
-    
    
-      
-      
-    
-      
-    
-        getLabel()): ?>
-        
-    
-      
-    
-        getLabel()): ?>
-        getOnClick() ? 'onClick="'.$element->getOnClick().'"' : '' ) ?>/>
-    
-      
-    
-        getLabel()): ?>
-        
-    
-      
-        
-      
-    
-        
-	getRadios() as $_radio): ?>
-	getValue() == $element->getChecked() ) ? 'checked="true"' : '' ?> > getLabel() ?>
-	
-    
-      
-    
-	  
-		
-		
-	  
-    
-	  
-			
-					
-					
-			
-      
-      
-      
-      
-getScript()): ?>
-
-
+
+getType()){
+    case 'fieldset': ?>
+
+    
    getLegend() ?>
    
+    
    
+        getLegend() ?>
+        getElements() as $_element): ?>
+            drawElement($_element) ?>
+        
+    
    
+      
+      
+    
+      
+    
+        getLabel()): ?>
+        
+    
+      
+    
+        getLabel()): ?>
+        getOnClick() ? 'onClick="'.$element->getOnClick().'"' : '' ) ?>/>
+    
+      
+    
+        getLabel()): ?>
+        
+    
+      
+        
+      
+    
+        
+	getRadios() as $_radio): ?>
+	getValue() == $element->getChecked() ) ? 'checked="true"' : '' ?> > getLabel() ?>
+	
+    
+      
+    
+	  
+		
+		
+	  
+    
+	  
+			
+					
+					
+			
+      
+      
+      
+      
+getScript()): ?>
+
+
diff --git a/app/design/adminhtml/default/default/template/widget/form/element/gallery.phtml b/app/design/adminhtml/default/default/template/widget/form/element/gallery.phtml
index 10086f5a59..a6899ed290 100644
--- a/app/design/adminhtml/default/default/template/widget/form/element/gallery.phtml
+++ b/app/design/adminhtml/default/default/template/widget/form/element/gallery.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -55,12 +61,13 @@
 
 
 
-    
+    
 
 
 
         
-
-
-
+    
 
diff --git a/app/design/adminhtml/default/default/template/widget/form/renderer/element.phtml b/app/design/adminhtml/default/default/template/widget/form/renderer/element.phtml
index 7ae6862985..ac817c1d43 100644
--- a/app/design/adminhtml/default/default/template/widget/form/renderer/element.phtml
+++ b/app/design/adminhtml/default/default/template/widget/form/renderer/element.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Adminhtml
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/widget/form/renderer/fieldset.phtml b/app/design/adminhtml/default/default/template/widget/form/renderer/fieldset.phtml
index 3de1300c76..8ea8d322f8 100644
--- a/app/design/adminhtml/default/default/template/widget/form/renderer/fieldset.phtml
+++ b/app/design/adminhtml/default/default/template/widget/form/renderer/fieldset.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   Mage
  * @package    Mage_Adminhtml
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -26,16 +32,15 @@
 
 
 getNoContainer()): ?>
-    
    serialize(array('class')) ?>>
+    
    
 
-	
    
-	        
-	            
-	                getChildrenHtml() ?>
-	            
-	        
    
-	
    
-
+    
    
+        
+            
+                getChildrenHtml() ?>
+            
+        
    
+    
    
 getNoContainer()): ?>
-    
    
+    
 
\ No newline at end of file
diff --git a/app/design/adminhtml/default/default/template/widget/form/renderer/fieldset/element.phtml b/app/design/adminhtml/default/default/template/widget/form/renderer/fieldset/element.phtml
index 6fe181639a..eaea0b023f 100644
--- a/app/design/adminhtml/default/default/template/widget/form/renderer/fieldset/element.phtml
+++ b/app/design/adminhtml/default/default/template/widget/form/renderer/fieldset/element.phtml
@@ -1,32 +1,38 @@
-
-getElement() ?>
-getNoDisplay()): ?>
-
-    getType()=='hidden'): ?>
-    getElementHtml()) ?>
-    
-    getLabelHtml()) ?>
-    getElementHtml()) ?>
-    getNote()): ?> class="note">getNote() ?>
-    
-
+
+getElement() ?>
+getNoDisplay()): ?>
+
+    getType()=='hidden'): ?>
+    getElementHtml()) ?>
+    
+    getLabelHtml()) ?>
+    getElementHtml()) ?>
+    getNote()): ?> class="note">getNote()?$_element->getNote():' ' ?>
+    
+
 
\ No newline at end of file
diff --git a/app/design/adminhtml/default/default/template/widget/grid.phtml b/app/design/adminhtml/default/default/template/widget/grid.phtml
index 615e7376bf..c1047af1f6 100644
--- a/app/design/adminhtml/default/default/template/widget/grid.phtml
+++ b/app/design/adminhtml/default/default/template/widget/grid.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -20,7 +26,7 @@
 ?>
 getColumns());
 	            getHeadersVisibility()): ?>
 	                
 	                getColumns() as $_column): ?>
-	                    getHeaderHtmlProperty() ?>>getHeaderHtml() ?>
+	                    getHeaderHtmlProperty() ?>>getHeaderHtml() ?>
 	                
 	                
 	            
 	            getFilterVisibility()): ?>
 	                
 	                getColumns() as $_column): ?>
-	                    getHeaderHtmlProperty() ?>>getFilterHtml() ?>
+	                    getHeaderHtmlProperty() ?>>getFilterHtml() ?>
 	                
 	                
 	            
diff --git a/app/design/adminhtml/default/default/template/widget/grid/container.phtml b/app/design/adminhtml/default/default/template/widget/grid/container.phtml
index 6333c43fda..8a23409b68 100644
--- a/app/design/adminhtml/default/default/template/widget/grid/container.phtml
+++ b/app/design/adminhtml/default/default/template/widget/grid/container.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/widget/grid/massaction.phtml b/app/design/adminhtml/default/default/template/widget/grid/massaction.phtml
index 0e986b1e1c..420d7b51a7 100644
--- a/app/design/adminhtml/default/default/template/widget/grid/massaction.phtml
+++ b/app/design/adminhtml/default/default/template/widget/grid/massaction.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/widget/tabs.phtml b/app/design/adminhtml/default/default/template/widget/tabs.phtml
index 4d9c0dee4a..d400027ed7 100644
--- a/app/design/adminhtml/default/default/template/widget/tabs.phtml
+++ b/app/design/adminhtml/default/default/template/widget/tabs.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/widget/tabshoriz.phtml b/app/design/adminhtml/default/default/template/widget/tabshoriz.phtml
index d5085fb081..efe4033b05 100644
--- a/app/design/adminhtml/default/default/template/widget/tabshoriz.phtml
+++ b/app/design/adminhtml/default/default/template/widget/tabshoriz.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -33,6 +39,7 @@
 
 
 
 
\ No newline at end of file
diff --git a/app/design/adminhtml/default/default/template/widget/tabsleft.phtml b/app/design/adminhtml/default/default/template/widget/tabsleft.phtml
index d4927df452..94b177e195 100644
--- a/app/design/adminhtml/default/default/template/widget/tabsleft.phtml
+++ b/app/design/adminhtml/default/default/template/widget/tabsleft.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/adminhtml/default/default/template/widget/view/container.phtml b/app/design/adminhtml/default/default/template/widget/view/container.phtml
index 596990d3f4..9e5e092954 100644
--- a/app/design/adminhtml/default/default/template/widget/view/container.phtml
+++ b/app/design/adminhtml/default/default/template/widget/view/container.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/frontend/default/default/layout/bundle.xml b/app/design/frontend/default/default/layout/bundle.xml
index 5d2f163c31..1c94c82a3a 100644
--- a/app/design/frontend/default/default/layout/bundle.xml
+++ b/app/design/frontend/default/default/layout/bundle.xml
@@ -13,6 +13,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage_Bundle
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/frontend/default/default/layout/catalog.xml b/app/design/frontend/default/default/layout/catalog.xml
index a3bf9f4213..9d0c7e1ce0 100644
--- a/app/design/frontend/default/default/layout/catalog.xml
+++ b/app/design/frontend/default/default/layout/catalog.xml
@@ -13,6 +13,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/frontend/default/default/layout/catalogsearch.xml b/app/design/frontend/default/default/layout/catalogsearch.xml
index f481fe8f26..96ec19f691 100644
--- a/app/design/frontend/default/default/layout/catalogsearch.xml
+++ b/app/design/frontend/default/default/layout/catalogsearch.xml
@@ -13,6 +13,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -60,6 +66,12 @@
         
             
         
+        
+            js_csscalendar/calendar-win2k-1.css
+            jscalendar/calendar.js
+            jscalendar/lang/calendar-en.js
+            jscalendar/calendar-setup.js
+        
         
             
         
diff --git a/app/design/frontend/default/default/layout/checkout.xml b/app/design/frontend/default/default/layout/checkout.xml
index 6945dd3671..352e130efd 100644
--- a/app/design/frontend/default/default/layout/checkout.xml
+++ b/app/design/frontend/default/default/layout/checkout.xml
@@ -13,6 +13,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/frontend/default/default/layout/cms.xml b/app/design/frontend/default/default/layout/cms.xml
index be1efdf4b5..ebbe685da3 100644
--- a/app/design/frontend/default/default/layout/cms.xml
+++ b/app/design/frontend/default/default/layout/cms.xml
@@ -13,6 +13,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/frontend/default/default/layout/contacts.xml b/app/design/frontend/default/default/layout/contacts.xml
index 2508889d3d..ed59c48386 100644
--- a/app/design/frontend/default/default/layout/contacts.xml
+++ b/app/design/frontend/default/default/layout/contacts.xml
@@ -13,6 +13,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/frontend/default/default/layout/core.xml b/app/design/frontend/default/default/layout/core.xml
index 0a93d1ba54..beb0e356db 100644
--- a/app/design/frontend/default/default/layout/core.xml
+++ b/app/design/frontend/default/default/layout/core.xml
@@ -13,6 +13,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/frontend/default/default/layout/customer.xml b/app/design/frontend/default/default/layout/customer.xml
index b2bd98088c..f8e5d03da1 100644
--- a/app/design/frontend/default/default/layout/customer.xml
+++ b/app/design/frontend/default/default/layout/customer.xml
@@ -13,6 +13,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/frontend/default/default/layout/directory.xml b/app/design/frontend/default/default/layout/directory.xml
index 85b4f9fdfa..1913df183a 100644
--- a/app/design/frontend/default/default/layout/directory.xml
+++ b/app/design/frontend/default/default/layout/directory.xml
@@ -13,6 +13,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -42,4 +48,14 @@ Category layered navigation layout
             
     
 
+
+
+
+    
+        
+            
+        
+    
 
\ No newline at end of file
diff --git a/app/design/frontend/default/default/layout/giftmessage.xml b/app/design/frontend/default/default/layout/giftmessage.xml
index 598eefdb58..09b7fe3021 100644
--- a/app/design/frontend/default/default/layout/giftmessage.xml
+++ b/app/design/frontend/default/default/layout/giftmessage.xml
@@ -13,6 +13,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/frontend/default/default/layout/googleanalytics.xml b/app/design/frontend/default/default/layout/googleanalytics.xml
index 4e62ef8617..4ff23fc69d 100644
--- a/app/design/frontend/default/default/layout/googleanalytics.xml
+++ b/app/design/frontend/default/default/layout/googleanalytics.xml
@@ -13,6 +13,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/frontend/default/default/layout/googlecheckout.xml b/app/design/frontend/default/default/layout/googlecheckout.xml
index 335a4a1888..2193ae005d 100644
--- a/app/design/frontend/default/default/layout/googlecheckout.xml
+++ b/app/design/frontend/default/default/layout/googlecheckout.xml
@@ -13,6 +13,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/frontend/default/default/layout/newsletter.xml b/app/design/frontend/default/default/layout/newsletter.xml
index 6743d02a22..e6f313c8ad 100644
--- a/app/design/frontend/default/default/layout/newsletter.xml
+++ b/app/design/frontend/default/default/layout/newsletter.xml
@@ -13,6 +13,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/frontend/default/default/layout/page.xml b/app/design/frontend/default/default/layout/page.xml
index 6edc8f6310..8fbcb06bac 100644
--- a/app/design/frontend/default/default/layout/page.xml
+++ b/app/design/frontend/default/default/layout/page.xml
@@ -13,6 +13,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -29,6 +35,7 @@ Default layout, loads most of the pages
 
             
                 
+                
                 
                 
                 
diff --git a/app/design/frontend/default/default/layout/paypal.xml b/app/design/frontend/default/default/layout/paypal.xml
index adee365073..9e6e2eef46 100644
--- a/app/design/frontend/default/default/layout/paypal.xml
+++ b/app/design/frontend/default/default/layout/paypal.xml
@@ -13,6 +13,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/frontend/default/default/layout/paypaluk.xml b/app/design/frontend/default/default/layout/paypaluk.xml
index 58abd00365..d27a953d44 100644
--- a/app/design/frontend/default/default/layout/paypaluk.xml
+++ b/app/design/frontend/default/default/layout/paypaluk.xml
@@ -13,6 +13,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/frontend/default/default/layout/poll.xml b/app/design/frontend/default/default/layout/poll.xml
index 0ca4ce957e..a515c1f6a1 100644
--- a/app/design/frontend/default/default/layout/poll.xml
+++ b/app/design/frontend/default/default/layout/poll.xml
@@ -13,6 +13,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/frontend/default/default/layout/productalert.xml b/app/design/frontend/default/default/layout/productalert.xml
index c13dfdf44e..3665824ab1 100644
--- a/app/design/frontend/default/default/layout/productalert.xml
+++ b/app/design/frontend/default/default/layout/productalert.xml
@@ -13,6 +13,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/frontend/default/default/layout/reports.xml b/app/design/frontend/default/default/layout/reports.xml
index 0596cb7dc4..736382e940 100644
--- a/app/design/frontend/default/default/layout/reports.xml
+++ b/app/design/frontend/default/default/layout/reports.xml
@@ -13,6 +13,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/frontend/default/default/layout/review.xml b/app/design/frontend/default/default/layout/review.xml
index 5df30e8f2f..212a6bddcf 100644
--- a/app/design/frontend/default/default/layout/review.xml
+++ b/app/design/frontend/default/default/layout/review.xml
@@ -13,6 +13,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -74,6 +80,7 @@ Product reviews page
                 
                 
                 
+                
                 
                 
                 
diff --git a/app/design/frontend/default/default/layout/rss.xml b/app/design/frontend/default/default/layout/rss.xml
index dee476f0d6..079190da4a 100644
--- a/app/design/frontend/default/default/layout/rss.xml
+++ b/app/design/frontend/default/default/layout/rss.xml
@@ -13,6 +13,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/frontend/default/default/layout/sales.xml b/app/design/frontend/default/default/layout/sales.xml
index c0c54f2bef..6623882226 100644
--- a/app/design/frontend/default/default/layout/sales.xml
+++ b/app/design/frontend/default/default/layout/sales.xml
@@ -13,6 +13,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/frontend/default/default/layout/sendfriend.xml b/app/design/frontend/default/default/layout/sendfriend.xml
index f92a3f4b2d..5cd3b8737b 100644
--- a/app/design/frontend/default/default/layout/sendfriend.xml
+++ b/app/design/frontend/default/default/layout/sendfriend.xml
@@ -13,6 +13,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/frontend/default/default/layout/shipping.xml b/app/design/frontend/default/default/layout/shipping.xml
index b0508bd0aa..ab52748abe 100644
--- a/app/design/frontend/default/default/layout/shipping.xml
+++ b/app/design/frontend/default/default/layout/shipping.xml
@@ -13,6 +13,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/frontend/default/default/layout/tag.xml b/app/design/frontend/default/default/layout/tag.xml
index f9bdd0ef24..9fada3b9d2 100644
--- a/app/design/frontend/default/default/layout/tag.xml
+++ b/app/design/frontend/default/default/layout/tag.xml
@@ -13,6 +13,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/frontend/default/default/layout/wishlist.xml b/app/design/frontend/default/default/layout/wishlist.xml
index 713dd33a4b..5d153a86e8 100644
--- a/app/design/frontend/default/default/layout/wishlist.xml
+++ b/app/design/frontend/default/default/layout/wishlist.xml
@@ -13,6 +13,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/frontend/default/default/template/bundle/catalog/product/list/partof.phtml b/app/design/frontend/default/default/template/bundle/catalog/product/list/partof.phtml
index 646d77219c..e1de8c9f37 100644
--- a/app/design/frontend/default/default/template/bundle/catalog/product/list/partof.phtml
+++ b/app/design/frontend/default/default/template/bundle/catalog/product/list/partof.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage_Bundle
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/frontend/default/default/template/bundle/catalog/product/price.phtml b/app/design/frontend/default/default/template/bundle/catalog/product/price.phtml
index 14275d5a84..266b642f92 100644
--- a/app/design/frontend/default/default/template/bundle/catalog/product/price.phtml
+++ b/app/design/frontend/default/default/template/bundle/catalog/product/price.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage_Bundle
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -32,11 +38,11 @@
                 __('As low as') ?>:
                 helper('tax')->displayBothPrices() && $this->isRatesGraterThenZero()): ?>
                     
-                        __('Excl. Tax') ?>:
+                        __('Excl. Tax:') ?>
                         currency($_minimalPriceTax) ?>
                     
                     
-                        __('Incl. Tax') ?>:
+                        __('Incl. Tax:') ?>
                         currency($_minimalPriceInclTax) ?>
                     
             
    
@@ -50,11 +56,11 @@
                 __('From') ?>:
                 helper('tax')->displayBothPrices() && $this->isRatesGraterThenZero()): ?>
                     
-                        __('Excl. Tax') ?>:
+                        __('Excl. Tax:') ?>
                         currency($_minimalPriceTax) ?>
                     
                     
-                        __('Incl. Tax') ?>:
+                        __('Incl. Tax:') ?>
                         currency($_minimalPriceInclTax) ?>
                     
                 
@@ -67,7 +73,7 @@
                     __('To') ?>:
                     helper('tax')->displayBothPrices() && $this->isRatesGraterThenZero()): ?>
                         
-                            __('Excl. Tax') ?>:
+                            __('Excl. Tax:') ?>
                             currency($_maximalPriceTax) ?>
                         
                         
@@ -81,11 +87,11 @@
             
                 helper('tax')->displayBothPrices() && $this->isRatesGraterThenZero()): ?>
                     
-                        __('Excl. Tax') ?>:
+                        __('Excl. Tax:') ?>
                         currency($_minimalPriceTax) ?>
                     
                     
-                        __('Incl. Tax') ?>:
+                        __('Incl. Tax:') ?>
                         currency($_minimalPriceInclTax) ?>
                     
                 
diff --git a/app/design/frontend/default/default/template/bundle/catalog/product/view/price.phtml b/app/design/frontend/default/default/template/bundle/catalog/product/view/price.phtml
index 00c12a1872..b5d70fabd2 100644
--- a/app/design/frontend/default/default/template/bundle/catalog/product/view/price.phtml
+++ b/app/design/frontend/default/default/template/bundle/catalog/product/view/price.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -28,11 +34,11 @@
         helper('tax')->displayBothPrices() && $this->isRatesGraterThenZero()): ?>
         
             
-                helper('tax')->__('Excl. Tax') ?>:
+                __('Excl. Tax:') ?>
                 currency($_finalPrice,true,false) ?>
             
             
-                helper('tax')->__('Incl. Tax') ?>:
+                __('Incl. Tax:') ?>
                 currency($_finalPriceInclTax,true,false) ?>
             
         
diff --git a/app/design/frontend/default/default/template/bundle/catalog/product/view/tierprices.phtml b/app/design/frontend/default/default/template/bundle/catalog/product/view/tierprices.phtml
index 6252e067e8..56de5cc514 100644
--- a/app/design/frontend/default/default/template/bundle/catalog/product/view/tierprices.phtml
+++ b/app/design/frontend/default/default/template/bundle/catalog/product/view/tierprices.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/frontend/default/default/template/bundle/catalog/product/view/type/bundle.phtml b/app/design/frontend/default/default/template/bundle/catalog/product/view/type/bundle.phtml
index 9a55385cc3..e4eb58a950 100644
--- a/app/design/frontend/default/default/template/bundle/catalog/product/view/type/bundle.phtml
+++ b/app/design/frontend/default/default/template/bundle/catalog/product/view/type/bundle.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage_Bundle
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -25,9 +31,9 @@
 
-    
    helper('catalog')->__('Availability: In stock.') ?>
    
+    
    helper('catalog')->__('Availability') ?>: helper('catalog')->__('In stock.') ?>
    
 
-    
    helper('catalog')->__('Availability: Out of stock.') ?>
    
+    
    helper('catalog')->__('Availability') ?>: helper('catalog')->__('Out of stock.') ?>
    
 
 
 
    
diff --git a/app/design/frontend/default/default/template/bundle/catalog/product/view/type/bundle/option/checkbox.phtml b/app/design/frontend/default/default/template/bundle/catalog/product/view/type/bundle/option/checkbox.phtml
index 025b3831d1..a5262cac6b 100644
--- a/app/design/frontend/default/default/template/bundle/catalog/product/view/type/bundle/option/checkbox.phtml
+++ b/app/design/frontend/default/default/template/bundle/catalog/product/view/type/bundle/option/checkbox.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage_Bundle
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -30,8 +36,8 @@
 
     
      
         
-        
    • getIsDefault() && $_selection->isSaleable())?' checked="checked" ':'' ?>isSaleable()?' disabled="disabled" ':'' ?> value="getSelectionId() ?>" />
-            
      
+        
    • getIsDefault() && $_selection->isSaleable())?' checked="checked" ':'' ?>isSaleable()?' disabled="disabled" ':'' ?> value="getSelectionId() ?>" />
+            
             getRequired()): ?>
                 setValidationContainer('bundle-option-'.$_option->getId().'-'.$_selection->getSelectionId(), 'bundle-option-'.$_option->getId().'-container') ?>
             
diff --git a/app/design/frontend/default/default/template/bundle/catalog/product/view/type/bundle/option/multi.phtml b/app/design/frontend/default/default/template/bundle/catalog/product/view/type/bundle/option/multi.phtml
index a86649f46a..52055fddbb 100644
--- a/app/design/frontend/default/default/template/bundle/catalog/product/view/type/bundle/option/multi.phtml
+++ b/app/design/frontend/default/default/template/bundle/catalog/product/view/type/bundle/option/multi.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage_Bundle
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/frontend/default/default/template/bundle/catalog/product/view/type/bundle/option/radio.phtml b/app/design/frontend/default/default/template/bundle/catalog/product/view/type/bundle/option/radio.phtml
index b0a72b1847..849c70bf05 100644
--- a/app/design/frontend/default/default/template/bundle/catalog/product/view/type/bundle/option/radio.phtml
+++ b/app/design/frontend/default/default/template/bundle/catalog/product/view/type/bundle/option/radio.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage_Bundle
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -48,13 +54,13 @@
     
         
        
         getRequired()): ?>
-            
      • isSalable())?'':' checked="checked" ' ?> value="" />
-            
        
+            
      • isSalable())?'':' checked="checked" ' ?> value="" />
+            
             
        • 
         
         
-            
      • getIsDefault() && $_selection->isSaleable())?' checked="checked" ':'' ?>isSaleable()?' disabled="disabled" ':'' ?>value="getSelectionId() ?>" />
-            
        
+            
      • getIsDefault() && $_selection->isSaleable())?' checked="checked" ':'' ?>isSaleable()?' disabled="disabled" ':'' ?> value="getSelectionId() ?>" />
+            
             getRequired()): ?>
                 setValidationContainer('bundle-option-'.$_option->getId().'-'.$_selection->getSelectionId(), 'bundle-option-'.$_option->getId().'-container') ?>
             
diff --git a/app/design/frontend/default/default/template/bundle/catalog/product/view/type/bundle/option/select.phtml b/app/design/frontend/default/default/template/bundle/catalog/product/view/type/bundle/option/select.phtml
index 81f2411ff9..82a7a004d8 100644
--- a/app/design/frontend/default/default/template/bundle/catalog/product/view/type/bundle/option/select.phtml
+++ b/app/design/frontend/default/default/template/bundle/catalog/product/view/type/bundle/option/select.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage_Bundle
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -45,7 +51,7 @@
         getSelectionTitlePrice($_selections[0]) ?>
         
     
-        
             
             
                 
diff --git a/app/design/frontend/default/default/template/bundle/catalog/product/view/type/bundle/options.phtml b/app/design/frontend/default/default/template/bundle/catalog/product/view/type/bundle/options.phtml
index a58bc1e481..41253afca6 100644
--- a/app/design/frontend/default/default/template/bundle/catalog/product/view/type/bundle/options.phtml
+++ b/app/design/frontend/default/default/template/bundle/catalog/product/view/type/bundle/options.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage_Bundle
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/frontend/default/default/template/bundle/email/order/items/creditmemo/default.phtml b/app/design/frontend/default/default/template/bundle/email/order/items/creditmemo/default.phtml
index 551a64c64e..acdb5b5b3d 100644
--- a/app/design/frontend/default/default/template/bundle/email/order/items/creditmemo/default.phtml
+++ b/app/design/frontend/default/default/template/bundle/email/order/items/creditmemo/default.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage_Bundle
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -46,11 +52,11 @@
 
 
     getOrderItem()->getParentItem()): ?>
-    htmlEscape($_item->getName()) ?>
+    htmlEscape($_item->getName()) ?>
     
     getValueHtml($_item)?>
     
-    getSku() ?>
+    getSku() ?>
     
         canShowPriceInfo($_item)): ?>
             getQty()*1 ?>
@@ -60,7 +66,14 @@
     
     
         canShowPriceInfo($_item)): ?>
-            getOrder()->formatPrice($_item->getRowTotal()) ?>
+            helper('tax')->displayCartPriceInclTax($_item->getOrderItem()->getOrder()->getStore())): ?>
+                getOrderItem()->getOrder()->formatPrice($_item->getRowTotal() + $_item->getTaxAmount()) ?>
+            helper('tax')->displayCartPriceExclTax($_item->getOrderItem()->getOrder()->getStore())): ?>
+                getOrderItem()->getOrder()->formatPrice($_item->getRowTotal()) ?>
+            
+                __('Excl. Tax'); ?>: getOrderItem()->getOrder()->formatPrice($_item->getRowTotal()) ?>
        
+                __('Incl. Tax'); ?>: getOrderItem()->getOrder()->formatPrice($_item->getRowTotal() + $_item->getTaxAmount()) ?>
+            
         
              
         
diff --git a/app/design/frontend/default/default/template/bundle/email/order/items/invoice/default.phtml b/app/design/frontend/default/default/template/bundle/email/order/items/invoice/default.phtml
index 14dd899069..8fd5ef7ed9 100644
--- a/app/design/frontend/default/default/template/bundle/email/order/items/invoice/default.phtml
+++ b/app/design/frontend/default/default/template/bundle/email/order/items/invoice/default.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -47,11 +53,11 @@
 
 
     getOrderItem()->getParentItem()): ?>
-    htmlEscape($_item->getName()) ?>
+    htmlEscape($_item->getName()) ?>
     
     getValueHtml($_item)?>
     
-    getSku() ?>
+    getSku() ?>
     
         canShowPriceInfo($_item)): ?>
             getQty()*1 ?>
@@ -61,7 +67,14 @@
     
     
         canShowPriceInfo($_item)): ?>
-            getOrder()->formatPrice($_item->getRowTotal()) ?>
+            helper('tax')->displayCartPriceInclTax($_item->getOrderItem()->getOrder()->getStore())): ?>
+                getOrderItem()->getOrder()->formatPrice($_item->getRowTotal() + $_item->getTaxAmount()) ?>
+            helper('tax')->displayCartPriceExclTax($_item->getOrderItem()->getOrder()->getStore())): ?>
+                getOrderItem()->getOrder()->formatPrice($_item->getRowTotal()) ?>
+            
+                __('Excl. Tax'); ?>: getOrderItem()->getOrder()->formatPrice($_item->getRowTotal()) ?>
        
+                __('Incl. Tax'); ?>: getOrderItem()->getOrder()->formatPrice($_item->getRowTotal() + $_item->getTaxAmount()) ?>
+            
         
              
         
diff --git a/app/design/frontend/default/default/template/bundle/email/order/items/order/default.phtml b/app/design/frontend/default/default/template/bundle/email/order/items/order/default.phtml
index bf171fe927..efe5f833d6 100644
--- a/app/design/frontend/default/default/template/bundle/email/order/items/order/default.phtml
+++ b/app/design/frontend/default/default/template/bundle/email/order/items/order/default.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -47,11 +53,11 @@
 
 
     getParentItem()): ?>
-    htmlEscape($_item->getName()) ?>
+    htmlEscape($_item->getName()) ?>
     
     getValueHtml($_item)?>
     
-    getSku() ?>
+    getSku() ?>
     
     getParentItem()): ?>
         getQtyOrdered()*1 ?>
@@ -61,7 +67,14 @@
     
     
     getParentItem()): ?>
-        getOrder()->formatPrice($_item->getRowTotal()) ?>
+        helper('tax')->displayCartPriceInclTax($_item->getOrder()->getStore())): ?>
+            getOrder()->formatPrice($_item->getRowTotal() + $_item->getTaxBeforeDiscount()) ?>
+        helper('tax')->displayCartPriceExclTax($_item->getOrder()->getStore())): ?>
+            getOrder()->formatPrice($_item->getRowTotal()) ?>
+        
+            __('Excl. Tax'); ?>: getOrder()->formatPrice($_item->getRowTotal()) ?>
        
+            __('Incl. Tax'); ?>: getOrder()->formatPrice($_item->getRowTotal() + $_item->getTaxBeforeDiscount()) ?>
+        
     
          
     
@@ -76,7 +89,7 @@
         
        
             getItemOptions() as $option): ?>
             
        
-						
        
+            
        
             
         
        
         
diff --git a/app/design/frontend/default/default/template/bundle/email/order/items/shipment/default.phtml b/app/design/frontend/default/default/template/bundle/email/order/items/shipment/default.phtml
index d0627e4470..6d7bc859f8 100644
--- a/app/design/frontend/default/default/template/bundle/email/order/items/shipment/default.phtml
+++ b/app/design/frontend/default/default/template/bundle/email/order/items/shipment/default.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage_Bundle
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -46,11 +52,11 @@
 
 
     getParentItem()): ?>
-    htmlEscape($_item->getName()) ?>
+    htmlEscape($_item->getName()) ?>
     
     getValueHtml($_item) ?>
     
-    getSku() ?>
+    getSku() ?>
     
         isShipmentSeparately() && $_item->getParentItem()) || (!$this->isShipmentSeparately() && !$_item->getParentItem())): ?>
             getId()])): ?>
diff --git a/app/design/frontend/default/default/template/bundle/sales/order/creditmemo/items/renderer.phtml b/app/design/frontend/default/default/template/bundle/sales/order/creditmemo/items/renderer.phtml
index 30c1b8e646..ba24e64563 100644
--- a/app/design/frontend/default/default/template/bundle/sales/order/creditmemo/items/renderer.phtml
+++ b/app/design/frontend/default/default/template/bundle/sales/order/creditmemo/items/renderer.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage_Bundle
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -49,7 +55,7 @@
     
     
 
-
+ id="order-item-row-getId() ?>">
     getOrderItem()->getParentItem()): ?>
     
        htmlEscape($_item->getName()) ?>
        
     
@@ -61,18 +67,18 @@
         canShowPriceInfo($_item)): ?>
             helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceExclTax()): ?>
                 
-                                    helper('tax')->displayCartBothPrices()): ?>
-                      helper('tax')->__('Excl. Tax'); ?>:
-                  
-                  getOrder()->formatPrice($_item->getPrice()) ?>
+                    helper('tax')->displayCartBothPrices()): ?>
+                        helper('tax')->__('Excl. Tax'); ?>:
+                    
+                    getOrder()->formatPrice($_item->getPrice()) ?>
                 
             
             helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceInclTax()): ?>
                 
-                                    helper('tax')->displayCartBothPrices()): ?>
-                      helper('tax')->__('Incl. Tax'); ?>:
-                  
-                  getOrder()->formatPrice($this->helper('checkout')->getPriceInclTax($_item)); ?>
+                    helper('tax')->displayCartBothPrices()): ?>
+                        helper('tax')->__('Incl. Tax'); ?>:
+                    
+                    getOrder()->formatPrice($this->helper('checkout')->getPriceInclTax($_item)); ?>
                 
             
         
@@ -90,18 +96,18 @@
         canShowPriceInfo($_item)): ?>
             helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceExclTax()): ?>
                 
-                                    helper('tax')->displayCartBothPrices()): ?>
-                      helper('tax')->__('Excl. Tax'); ?>:
-                  
-                  getOrder()->formatPrice($_item->getRowTotal()) ?>
+                    helper('tax')->displayCartBothPrices()): ?>
+                        helper('tax')->__('Excl. Tax'); ?>:
+                    
+                    getOrder()->formatPrice($_item->getRowTotal()) ?>
                 
             
             helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceInclTax()): ?>
                 
-                                    helper('tax')->displayCartBothPrices()): ?>
-                      helper('tax')->__('Incl. Tax'); ?>:
-                  
-                  getOrder()->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item)); ?>
+                    helper('tax')->displayCartBothPrices()): ?>
+                        helper('tax')->__('Incl. Tax'); ?>:
+                    
+                    getOrder()->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item)); ?>
                 
             
         
@@ -134,7 +140,8 @@
             
        htmlEscape($_option['label']) ?>
        
             getPrintStatus()): ?>
                 getFormatedOptionValue($_option['value']) ?>
-                 class="truncated">
+                 class="truncated">
+                    
                     
                     
        
                         
        
@@ -145,7 +152,7 @@
                     
                 
             
-                
        htmlEscape($_option['value']) ?>
+                
        htmlEscape($_option['value']) ?>
        
             
         
         
        
diff --git a/app/design/frontend/default/default/template/bundle/sales/order/invoice/items/renderer.phtml b/app/design/frontend/default/default/template/bundle/sales/order/invoice/items/renderer.phtml
index e2a0cf3c1f..81b556162a 100644
--- a/app/design/frontend/default/default/template/bundle/sales/order/invoice/items/renderer.phtml
+++ b/app/design/frontend/default/default/template/bundle/sales/order/invoice/items/renderer.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage_Bundle
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -58,18 +64,18 @@
         canShowPriceInfo($_item)): ?>
             helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceExclTax()): ?>
                 
-                                    helper('tax')->displayCartBothPrices()): ?>
-                      helper('tax')->__('Excl. Tax'); ?>:
-                  
-                  getOrder()->formatPrice($_item->getPrice()) ?>
+                    helper('tax')->displayCartBothPrices()): ?>
+                        helper('tax')->__('Excl. Tax'); ?>:
+                    
+                    getOrder()->formatPrice($_item->getPrice()) ?>
                 
             
             helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceInclTax()): ?>
                 
-                                    helper('tax')->displayCartBothPrices()): ?>
-                      helper('tax')->__('Incl. Tax'); ?>:
-                  
-                  getOrder()->formatPrice($this->helper('checkout')->getPriceInclTax($_item)); ?>
+                    helper('tax')->displayCartBothPrices()): ?>
+                        helper('tax')->__('Incl. Tax'); ?>:
+                    
+                    getOrder()->formatPrice($this->helper('checkout')->getPriceInclTax($_item)); ?>
                 
             
         
@@ -87,18 +93,18 @@
         canShowPriceInfo($_item)): ?>
             helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceExclTax()): ?>
                 
-                                    helper('tax')->displayCartBothPrices()): ?>
-                      helper('tax')->__('Excl. Tax'); ?>:
-                  
-                  getOrder()->formatPrice($_item->getRowTotal()) ?>
+                    helper('tax')->displayCartBothPrices()): ?>
+                        helper('tax')->__('Excl. Tax'); ?>:
+                    
+                    getOrder()->formatPrice($_item->getRowTotal()) ?>
                 
             
             helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceInclTax()): ?>
                 
-                                    helper('tax')->displayCartBothPrices()): ?>
-                      helper('tax')->__('Incl. Tax'); ?>:
-                  
-                  getOrder()->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item)); ?>
+                    helper('tax')->displayCartBothPrices()): ?>
+                        helper('tax')->__('Incl. Tax'); ?>:
+                    
+                    getOrder()->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item)); ?>
                 
             
         
@@ -117,7 +123,8 @@
             
        htmlEscape($_option['label']) ?>
        
             getPrintStatus()): ?>
                 getFormatedOptionValue($_option['value']) ?>
-                 class="truncated">
+                 class="truncated">
+                    
                     
                     
        
                         
        
@@ -128,7 +135,7 @@
                     
                 
             
-                
        htmlEscape($_option['value']) ?>
+                
        htmlEscape($_option['value']) ?>
        
             
         
         
        
diff --git a/app/design/frontend/default/default/template/bundle/sales/order/items/renderer.phtml b/app/design/frontend/default/default/template/bundle/sales/order/items/renderer.phtml
index a2648359d6..6220d62d98 100644
--- a/app/design/frontend/default/default/template/bundle/sales/order/items/renderer.phtml
+++ b/app/design/frontend/default/default/template/bundle/sales/order/items/renderer.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage_Bundle
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -58,18 +64,18 @@
         getParentItem()): ?>
             helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceExclTax()): ?>
                 
-                                    helper('tax')->displayCartBothPrices()): ?>
-                      __('Excl. Tax'); ?>:
-                  
+                    helper('tax')->displayCartBothPrices()): ?>
+                        __('Excl. Tax'); ?>:
+                    
                   getOrder()->formatPrice($this->getItem()->getPrice()) ?>
                 
             
             helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceInclTax()): ?>
                 
-                                    helper('tax')->displayCartBothPrices()): ?>
-                      __('Incl. Tax'); ?>:
-                  
-                  getOrder()->formatPrice($this->helper('checkout')->getPriceInclTax($this->getItem())); ?>
+                    helper('tax')->displayCartBothPrices()): ?>
+                        __('Incl. Tax'); ?>:
+                    
+                    getOrder()->formatPrice($this->helper('checkout')->getPriceInclTax($this->getItem())); ?>
                 
             
         
@@ -80,7 +86,7 @@
         getParentItem() && $this->isChildCalculated()) ||
                 (!$_item->getParentItem() && !$this->isChildCalculated())): ?>
             
-                        getQtyOrdered() > 0): ?>
+            getQtyOrdered() > 0): ?>
                 __('Ordered'); ?>: getQtyOrdered()*1 ?>
        
             
             getQtyShipped() > 0 && !$this->isShipmentSeparately()): ?>
@@ -103,18 +109,18 @@
         getParentItem()): ?>
             helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceExclTax()): ?>
                 
-                                    helper('tax')->displayCartBothPrices()): ?>
-                      __('Excl. Tax'); ?>:
-                  
-                  getOrder()->formatPrice($this->getItem()->getRowTotal()) ?>
+                    helper('tax')->displayCartBothPrices()): ?>
+                        __('Excl. Tax'); ?>:
+                    
+                    getOrder()->formatPrice($this->getItem()->getRowTotal()) ?>
                 
             
             helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceInclTax()): ?>
                 
-                                    helper('tax')->displayCartBothPrices()): ?>
-                      __('Incl. Tax'); ?>:
-                  
-                  getOrder()->formatPrice($this->helper('checkout')->getSubtotalInclTax($this->getItem())); ?>
+                    helper('tax')->displayCartBothPrices()): ?>
+                        __('Incl. Tax'); ?>:
+                    
+                    getOrder()->formatPrice($this->helper('checkout')->getSubtotalInclTax($this->getItem())); ?>
                 
             
         
@@ -141,7 +147,8 @@
             
        htmlEscape($_option['label']) ?>
        
             getPrintStatus()): ?>
                 getFormatedOptionValue($_option['value']) ?>
-                 class="truncated">
+                 class="truncated">
+                    
                     
                     
        
                         
        
@@ -152,14 +159,15 @@
                     
                 
             
-                
        htmlEscape($_option['value']) ?>
+                
        htmlEscape($_option['value']) ?>
        
             
         
         
        
         
         getDescription() ?>
         helper('giftmessage/message')->getIsMessagesAvailable('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?>
-            
        __('Gift Message') ?>
+            
        
+            __('Gift Message') ?>
         
     
      
diff --git a/app/design/frontend/default/default/template/bundle/sales/order/shipment/items/renderer.phtml b/app/design/frontend/default/default/template/bundle/sales/order/shipment/items/renderer.phtml
index 12fb6eb2ac..31f05df9af 100644
--- a/app/design/frontend/default/default/template/bundle/sales/order/shipment/items/renderer.phtml
+++ b/app/design/frontend/default/default/template/bundle/sales/order/shipment/items/renderer.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage_Bundle
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -45,7 +51,7 @@
     
     
 
- id="order-item-row-getId() ?>">
+ id="order-item-row-getId() ?>">
     getParentItem()): ?>
     
        htmlEscape($_item->getName()) ?>
        
     
@@ -77,7 +83,8 @@
             
        htmlEscape($_option['label']) ?>
        
             getPrintStatus()): ?>
                 getFormatedOptionValue($_option['value']) ?>
-                 class="truncated">
+                 class="truncated">
+                    
                     
                     
        
                         
        
@@ -88,14 +95,15 @@
                     
                 
             
-                
        htmlEscape($_option['value']) ?>
+                
        htmlEscape($_option['value']) ?>
        
             
         
         
        
         
         getDescription() ?>
         helper('giftmessage/message')->getIsMessagesAvailable('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?>
-            
        __('Gift Message') ?>
+            
        
+            __('Gift Message') ?>
         
     
      
diff --git a/app/design/frontend/default/default/template/callouts/left_col.phtml b/app/design/frontend/default/default/template/callouts/left_col.phtml
index a473c9a91e..42f4c3884b 100644
--- a/app/design/frontend/default/default/template/callouts/left_col.phtml
+++ b/app/design/frontend/default/default/template/callouts/left_col.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -20,13 +26,13 @@
 ?>
 
 
        
-	getLinkUrl(),0,4))==='http'): ?>
-		
-	getLinkUrl()): ?>
-		
-	
+    getLinkUrl(),0,4))==='http'): ?>
+        
+    getLinkUrl()): ?>
+        
+    
     <?php echo $this->__($this->getImgAlt()) ?>
-	getLinkUrl()): ?>
-	
-	
-
        
\ No newline at end of file
+    getLinkUrl()): ?>
+    
+    
+
        
diff --git a/app/design/frontend/default/default/template/callouts/right_col.phtml b/app/design/frontend/default/default/template/callouts/right_col.phtml
index 3433613cec..1810500eb5 100644
--- a/app/design/frontend/default/default/template/callouts/right_col.phtml
+++ b/app/design/frontend/default/default/template/callouts/right_col.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/frontend/default/default/template/catalog/category/page.phtml b/app/design/frontend/default/default/template/catalog/category/page.phtml
index b2aef92a24..a7f695016c 100644
--- a/app/design/frontend/default/default/template/catalog/category/page.phtml
+++ b/app/design/frontend/default/default/template/catalog/category/page.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -19,7 +25,7 @@
  */
 ?>
 
        
-	
        getTitle() ?>
        
+    
        getTitle() ?>
        
 
        
 
        
     getContent() ?>
diff --git a/app/design/frontend/default/default/template/catalog/category/view.phtml b/app/design/frontend/default/default/template/catalog/category/view.phtml
index 708bd72d3b..bdd166fa15 100644
--- a/app/design/frontend/default/default/template/catalog/category/view.phtml
+++ b/app/design/frontend/default/default/template/catalog/category/view.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -53,9 +59,11 @@
     getCurrentCategory()->getDescription()): ?>
         
        
     
+IsRssCatalogEnable() && $this->IsTopCategory()): ?>
         __('Subscribe to RSS Feed') ?>
     
+*/ ?>
     getCmsBlockHtml() ?>
     getProductListHtml() ?>
 
diff --git a/app/design/frontend/default/default/template/catalog/layer/filter.phtml b/app/design/frontend/default/default/template/catalog/layer/filter.phtml
index 77feac23cc..1eee6ce3af 100644
--- a/app/design/frontend/default/default/template/catalog/layer/filter.phtml
+++ b/app/design/frontend/default/default/template/catalog/layer/filter.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/frontend/default/default/template/catalog/layer/state.phtml b/app/design/frontend/default/default/template/catalog/layer/state.phtml
index f1d4b5a38d..80eade128d 100644
--- a/app/design/frontend/default/default/template/catalog/layer/state.phtml
+++ b/app/design/frontend/default/default/template/catalog/layer/state.phtml
@@ -12,16 +12,22 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
  * @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 ?>
-
@@ -32,7 +38,7 @@
     
         
      • 
             <?php echo $this->__('Remove This Item') ?>
-            getName() ?>: getLabel() ?>
+            __($_filter->getName()) ?>: getLabel() ?>
         
        • 
     
     
diff --git a/app/design/frontend/default/default/template/catalog/layer/view.phtml b/app/design/frontend/default/default/template/catalog/layer/view.phtml
index 55fdfb0d60..ce3c7f7337 100644
--- a/app/design/frontend/default/default/template/catalog/layer/view.phtml
+++ b/app/design/frontend/default/default/template/catalog/layer/view.phtml
@@ -12,16 +12,22 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
  * @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 ?>
-
@@ -40,7 +46,7 @@
                 getFilters() ?>
                 
                 getItemsCount()): ?>
-                
        getName() ?>
        
+                
        __($_filter->getName()) ?>
        
                 
        
                 getHtml() ?>
                 
        
diff --git a/app/design/frontend/default/default/template/catalog/navigation/left.phtml b/app/design/frontend/default/default/template/catalog/navigation/left.phtml
index 0070c0c3ec..73feb82564 100644
--- a/app/design/frontend/default/default/template/catalog/navigation/left.phtml
+++ b/app/design/frontend/default/default/template/catalog/navigation/left.phtml
@@ -13,6 +13,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/frontend/default/default/template/catalog/navigation/top.phtml b/app/design/frontend/default/default/template/catalog/navigation/top.phtml
index 53eafc98df..af95683051 100644
--- a/app/design/frontend/default/default/template/catalog/navigation/top.phtml
+++ b/app/design/frontend/default/default/template/catalog/navigation/top.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/frontend/default/default/template/catalog/product/compare/list.phtml b/app/design/frontend/default/default/template/catalog/product/compare/list.phtml
index 249518a01d..a93b9e64bc 100644
--- a/app/design/frontend/default/default/template/catalog/product/compare/list.phtml
+++ b/app/design/frontend/default/default/template/catalog/product/compare/list.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -111,14 +117,10 @@
         
     
     
        
-        
+        
     
        
 
    
-
+
 
-
+
 
diff --git a/app/design/frontend/default/default/template/catalog/product/compare/sidebar.phtml b/app/design/frontend/default/default/template/catalog/product/compare/sidebar.phtml
index c25956c562..a7d30329c1 100644
--- a/app/design/frontend/default/default/template/catalog/product/compare/sidebar.phtml
+++ b/app/design/frontend/default/default/template/catalog/product/compare/sidebar.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/frontend/default/default/template/catalog/product/gallery.phtml b/app/design/frontend/default/default/template/catalog/product/gallery.phtml
index 1f1e74043c..88b8c5721b 100644
--- a/app/design/frontend/default/default/template/catalog/product/gallery.phtml
+++ b/app/design/frontend/default/default/template/catalog/product/gallery.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -30,7 +36,6 @@
     
   
   
    htmlEscape($this->getCurrentImage()->getLabel()) ?>
    
-  
    
    width="" src="helper('catalog/image')->init($this->getProduct(), 'image', $this->getImageFile()); ?>" alt="htmlEscape($this->getCurrentImage()->getLabel()) ?>" title="htmlEscape($this->getCurrentImage()->getLabel()) ?>" id="product-gallery-image" style="display:block;" />
   
    
     getPreviusImageUrl()): ?>
@@ -43,8 +48,10 @@
   
    __('Close Window') ?>
    
 
    
 
diff --git a/app/design/frontend/default/default/template/catalog/product/list.phtml b/app/design/frontend/default/default/template/catalog/product/list.phtml
index 7908351f48..a4bf5dab5e 100644
--- a/app/design/frontend/default/default/template/catalog/product/list.phtml
+++ b/app/design/frontend/default/default/template/catalog/product/list.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -38,7 +44,7 @@
 
 
    
 
-    
    
+    
    
         
         
    
             
@@ -80,53 +86,43 @@
 
 
 
-
     
+
    
 count() ?>
-    
-    
-    
-    
-        
-    
-    
-    
+                
    
+                    helper('wishlist')->isAllow()) : ?>
+                    __('Add to Wishlist') ?>
+                    
+                    getAddToCompareUrl($_product)): ?>
    
+                    __('Add to Compare') ?>
+                    
+                
    
+            
+        
+        
+        
-    
-          
-    
-    
-    
-    
-    
    
     
    
-            
    
-                
-                    <?php echo $this->htmlEscape($_product->getName()) ?>
-                
-            
    
-            
    htmlEscape($_product->getName()) ?>
    
-            getRatingSummary()): ?>
-            getReviewsSummaryHtml($_product, 'short') ?>
-            
-            getPriceHtml($_product, true) ?>
-            isSaleable()): ?>
-            
-            
-            
    __('Out of stock') ?>
    
-            
-            
    
-            
    
-                helper('wishlist')->isAllow()) : ?>
-                __('Add to Wishlist') ?>
+        
+        
      
+        
+            
    1. 
+                
      
+                    
+                        <?php echo $this->htmlEscape($_product->getName()) ?>
+                    
+                
      
+                
      htmlEscape($_product->getName()) ?>
      
+                getRatingSummary()): ?>
+                getReviewsSummaryHtml($_product, 'short') ?>
                 
-                getAddToCompareUrl($_product)): ?>
      
-                __('Add to Compare') ?>
+                getPriceHtml($_product, true) ?>
+                isSaleable()): ?>
+                    
+                
+                
      __('Out of stock') ?>
      
                 
-            
      
-        
    
     
     
    
-    
+    
 
    
-
 
 getToolbarHtml() ?>
-
\ No newline at end of file
+
diff --git a/app/design/frontend/default/default/template/catalog/product/list/related.phtml b/app/design/frontend/default/default/template/catalog/product/list/related.phtml
index 5b83e02523..a5ae543f72 100644
--- a/app/design/frontend/default/default/template/catalog/product/list/related.phtml
+++ b/app/design/frontend/default/default/template/catalog/product/list/related.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/frontend/default/default/template/catalog/product/list/toolbar.phtml b/app/design/frontend/default/default/template/catalog/product/list/toolbar.phtml
index 694d963d3f..3fb0a38ae9 100644
--- a/app/design/frontend/default/default/template/catalog/product/list/toolbar.phtml
+++ b/app/design/frontend/default/default/template/catalog/product/list/toolbar.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -98,9 +104,6 @@
                     <?php echo $this->__('Set Descending Direction') ?>
                 
             
-            helper('rss/catalog')->getTagFeedUrl()): ?>
-            __('Subscribe to Feed') ?>
-            
         
     
     
diff --git a/app/design/frontend/default/default/template/catalog/product/list/upsell.phtml b/app/design/frontend/default/default/template/catalog/product/list/upsell.phtml
index 963b643d0e..0be9890b76 100644
--- a/app/design/frontend/default/default/template/catalog/product/list/upsell.phtml
+++ b/app/design/frontend/default/default/template/catalog/product/list/upsell.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/frontend/default/default/template/catalog/product/new.phtml b/app/design/frontend/default/default/template/catalog/product/new.phtml
index e043bad7fa..4f238700cf 100644
--- a/app/design/frontend/default/default/template/catalog/product/new.phtml
+++ b/app/design/frontend/default/default/template/catalog/product/new.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   default_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -20,40 +26,40 @@
 ?>
 getProductCollection()) && $_products->getSize()): ?>
 
    
-
    __('New Products') ?>
    
-
-
-getItems() as $_product): ?>
-    5): continue; endif; ?>
-
-    
+    
+    
+            
+        
+        
+    
    
-        
    
-            
-                <?php echo $this->htmlEscape($_product->getName()) ?>
-            
-        
    
-            
    htmlEscape($_product->getName()) ?>
    
-            getReviewsSummaryHtml($_product, 'short') ?>
-            getPriceHtml($_product) ?>
-            isSaleable()): ?>
-            
-            
-            
    __('Out of stock') ?>
    
-            
-            
    
-            
    
-                helper('wishlist')->isAllow()) : ?>
-                __('Add to Wishlist') ?>
-                
-                getAddToCompareUrl($_product)): ?>
    
-                __('Add to Compare') ?>
+    
    __('New Products') ?>
    
+    
+    
+    getItems() as $_product): ?>
+        5): continue; endif; ?>
+        
-
-
-        
-    
-    
-
    
+            
    
+                
+                    <?php echo $this->htmlEscape($_product->getName()) ?>
+                
+            
    
+                
    htmlEscape($_product->getName()) ?>
    
+                getReviewsSummaryHtml($_product, 'short') ?>
+                getPriceHtml($_product) ?>
+                isSaleable()): ?>
+                
+                
+                
    __('Out of stock') ?>
    
                 
-            
    
-            		 
    
+                
    
+                
    
+                    helper('wishlist')->isAllow()) : ?>
+                    __('Add to Wishlist') ?>
+                    
+                    getAddToCompareUrl($_product)): ?>
    
+                    __('Add to Compare') ?>
+                    
+                
    
+                		 
    
+
    
 
\ No newline at end of file
diff --git a/app/design/frontend/default/default/template/catalog/product/price.phtml b/app/design/frontend/default/default/template/catalog/product/price.phtml
index 8cf86cbcdb..5155c03e37 100644
--- a/app/design/frontend/default/default/template/catalog/product/price.phtml
+++ b/app/design/frontend/default/default/template/catalog/product/price.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -39,16 +45,16 @@
 
         helper('tax')->displayBothPrices() && $_finalPriceInclTax != $_finalPrice): ?>
             
-                __('Excl. Tax:') ?>
+                __('Excl. Tax:') ?>
                 currency($_price,true,false) ?>
             
             
-                __('Incl. Tax:') ?>
+                __('Incl. Tax:') ?>
                 currency($_finalPriceInclTax,true,false) ?>
             
         
         currency($_price,true,true) ?>
-		
+        
 
     
         
    
@@ -57,23 +63,23 @@
         
    
 
         helper('tax')->displayBothPrices() && $_finalPriceInclTax != $_finalPrice): ?>
-	        
    
-	            __('Special Price:') ?>
-	            
-	                __('Excl. Tax:') ?>
-	                currency($_finalPrice,true,false) ?>
-	            
+            
    
+                __('Special Price:') ?>
+                
+                    __('Excl. Tax:') ?>
+                    currency($_finalPrice,true,false) ?>
+                
             
-                __('Incl. Tax:') ?>
+                __('Incl. Tax:') ?>
                 currency($_finalPriceInclTax,true,false) ?>
             
-			
    
+            
    
         
         
    
             __('Special Price:') ?>
             currency($_finalPrice,true,false) ?>
         
    
-		
+        
 
     
 
@@ -86,14 +92,31 @@
     
    
 
 isGrouped()): */ ?>
-
+    helper('tax')->getPrice($_product, $_minimalPriceValue, $includingTax = null);
+    $_inclTax = $this->helper('tax')->getPrice($_product, $_minimalPriceValue, $includingTax = true);
+    ?>
     getDisplayMinimalPrice() && $_minimalPriceValue): ?>
         
    
-            
-                __('Starting at:') ?>
-                currency($_minimalPrice,true,false) ?>
-            
+            __('Starting at:') ?>
+            helper('tax')->displayBothPrices() && ($_exclTax !== $_inclTax)): ?>
+                
+                    __('Excl. Tax:') ?>
+                    currency($_exclTax, true, false) ?>
+                
+                
+                    __('Incl. Tax:') ?>
+                    currency($_inclTax, true, false) ?>
+                
+            
+                helper('tax')->displayCartPriceInclTax()) {
+                    $_showPrice = $_exclTax;
+                }
+                ?>
+            currency($_showPrice, true, false) ?>
+            
         
    
     getDisplayMinimalPrice() && $_minimalPrice): */ ?>
-
-isGrouped()): */ ?>
\ No newline at end of file
+isGrouped()): */ ?>
diff --git a/app/design/frontend/default/default/template/catalog/product/view.phtml b/app/design/frontend/default/default/template/catalog/product/view.phtml
index 2dc8f1c79a..eab11f2b96 100644
--- a/app/design/frontend/default/default/template/catalog/product/view.phtml
+++ b/app/design/frontend/default/default/template/catalog/product/view.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -79,13 +85,13 @@
 
             getChildHtml('other');?>
 
-            hasOptions()):?>
+            isSaleable() && $this->hasOptions()):?>
                 getChildChildHtml('container1', '', true, true) ?>
             
 
         
    
         
    
-        hasOptions()):?>
+        isSaleable() && $this->hasOptions()):?>
             getChildChildHtml('container2', '', true, true) ?>
         
     
diff --git a/app/design/frontend/default/default/template/catalog/product/view/additional.phtml b/app/design/frontend/default/default/template/catalog/product/view/additional.phtml
index 1f8fb6f81f..a3eedcf23d 100644
--- a/app/design/frontend/default/default/template/catalog/product/view/additional.phtml
+++ b/app/design/frontend/default/default/template/catalog/product/view/additional.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/frontend/default/default/template/catalog/product/view/addto.phtml b/app/design/frontend/default/default/template/catalog/product/view/addto.phtml
index ea773647b7..5650f46217 100644
--- a/app/design/frontend/default/default/template/catalog/product/view/addto.phtml
+++ b/app/design/frontend/default/default/template/catalog/product/view/addto.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/frontend/default/default/template/catalog/product/view/addtocart.phtml b/app/design/frontend/default/default/template/catalog/product/view/addtocart.phtml
index 7cf13958a0..47db176a8a 100644
--- a/app/design/frontend/default/default/template/catalog/product/view/addtocart.phtml
+++ b/app/design/frontend/default/default/template/catalog/product/view/addtocart.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/frontend/default/default/template/catalog/product/view/attributes.phtml b/app/design/frontend/default/default/template/catalog/product/view/attributes.phtml
index 507439af4c..adc64b203d 100644
--- a/app/design/frontend/default/default/template/catalog/product/view/attributes.phtml
+++ b/app/design/frontend/default/default/template/catalog/product/view/attributes.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -29,7 +35,7 @@
     
-        
+        
diff --git a/app/design/frontend/default/default/template/catalog/product/view/description.phtml b/app/design/frontend/default/default/template/catalog/product/view/description.phtml
index 9af5f71d62..1ce2885b97 100644
--- a/app/design/frontend/default/default/template/catalog/product/view/description.phtml
+++ b/app/design/frontend/default/default/template/catalog/product/view/description.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
diff --git a/app/design/frontend/default/default/template/catalog/product/view/media.phtml b/app/design/frontend/default/default/template/catalog/product/view/media.phtml
index 87cf77c143..366ccae302 100644
--- a/app/design/frontend/default/default/template/catalog/product/view/media.phtml
+++ b/app/design/frontend/default/default/template/catalog/product/view/media.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -26,7 +32,7 @@
 ?>
 getProduct() ?>
 getImage() != 'no_selection' && $_product->getImage()): ?>
-
    <?php echo $this->htmlEscape($_product->getName()) ?>
    
+
    <?php echo $this->htmlEscape($_product->getName()) ?>
    __('Double click on above image to view full picture') ?>
    
@@ -42,14 +48,16 @@
     });
 
 
-<?php echo $this->htmlEscape($_product->getName()) ?>
+    <?php echo $this->htmlEscape($_product->getName()) ?>
 
 getGalleryImages()) > 0): ?>
 
    
     
    __('More Views') ?>
    
     
      
     getGalleryImages() as $_image): ?>
-        
    • <?php echo $this->htmlEscape($_image->getLabel()) ?>
      • 
+        
    • 
+            <?php echo $this->htmlEscape($_image->getLabel()) ?>
+        
      • 
     
     
    
 
    
diff --git a/app/design/frontend/default/default/template/catalog/product/view/options.phtml b/app/design/frontend/default/default/template/catalog/product/view/options.phtml
index e63d132911..5a9c9a7362 100644
--- a/app/design/frontend/default/default/template/catalog/product/view/options.phtml
+++ b/app/design/frontend/default/default/template/catalog/product/view/options.phtml
@@ -12,6 +12,12 @@
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
  *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
  * @category   design_default
  * @package    Mage
  * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
@@ -31,12 +37,9 @@
             this.formElements = this.productForm.getElementsBySelector('input', 'select', 'textarea', 'button');
             this.removeRequire(element.readAttribute('id').sub('option_', ''));
 
-            template = '
    
     
     
    __($_data['label']) ?>