Commit Graph

5386 Commits

Author SHA1 Message Date
rMalie 4e567f3d31 // Report fix of PSCFI-4282 from 1.4 to 1.5
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10833 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-01 14:45:33 +00:00
mDeflotte 8ae27b7a8a // Removing a console.log
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10832 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-01 14:34:53 +00:00
mDeflotte 394206e9ef // id_warehouse is now on the order details and not on orders table
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10831 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-01 14:31:26 +00:00
fBrignoli b2f33740fe // OrderInvoice PDF compliant
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10830 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-01 14:24:17 +00:00
fBrignoli 2ae9a4281b // ps_ => PREFIX_
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10829 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-01 14:08:49 +00:00
lLefevre 1a6fb756eb // Adding a rollover on the lines of tables
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10828 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-01 13:49:31 +00:00
mDeflotte 1e8ed9d47e // Little fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10827 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-01 12:58:35 +00:00
mDeflotte e111883814 // Adding reference of the order on the history
// Improving render of the button multi-shipping

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10825 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-01 12:58:21 +00:00
tDidierjean 562adfc172 // AdminCurrencies refactoring
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10824 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-01 09:44:58 +00:00
mDeflotte 0c87d98914 // Blocklayered: Slider could be change with two inputs or a list of values
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10822 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-01 09:16:10 +00:00
tDidierjean bca384dc71 // AdminControllers fixes
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10821 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-30 18:16:13 +00:00
bMancone 29c75d7798 // Added CSV class. Allows to export supply order details as CSV, for instance
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10820 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-30 17:49:51 +00:00
aFolletete 8bbd830446 // fix little bug on AdminOrdersController
[~] Deprecated: Cart::getOrderShippingCost()

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10818 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-30 17:25:27 +00:00
tDidierjean a9f425d6b2 // postprocess refactoring
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10817 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-30 17:16:28 +00:00
bMancone 9152514eb4 // AdminSupplyOrders : improved
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10816 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-30 17:08:23 +00:00
lLefevre c1aee41233 // fix bug link "details" in AdminFeaturesController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10815 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-30 16:52:23 +00:00
aFolletete 13bdaf6c3f [*] BO : you can now generate manually the invoice
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10814 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-30 16:41:24 +00:00
lLefevre 003ac6e01b // fix small bugs
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10813 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-30 16:32:51 +00:00
dSevere 577aa781bc // Stock Available : Add shared management for group of shops
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10812 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-30 16:28:06 +00:00
lLefevre 8671928caf // added toolbar in cart_rules form.tpl
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10811 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-30 16:08:30 +00:00
lLefevre 88e6b1ac1a // added pluging datepicker in AdminReferrersController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10810 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-30 15:45:59 +00:00
lLefevre 2067344c18 // fix bug in bulk_actions of type "delete" in AdminController's
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10809 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-30 15:24:50 +00:00
mDeflotte b08563276b // BugFix : message "Please chose a carrier" but a delivery option is setted.
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10807 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-30 14:56:33 +00:00
lLefevre a8e8b25194 // fix small bugs
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10806 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-30 14:55:49 +00:00
mDeflotte ff3c4b6881 // Blocklayered: BugFix in pagination
// Blocklayered: Add translations
// Blocklayered: BugFix with sliders (when cursor min and max are at 0)

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10805 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-30 14:50:45 +00:00
lLefevre 72b833fe31 // added list of tables and attributes in AdminRequestSqlController + change export request
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10803 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-30 13:25:14 +00:00
lLefevre 02f5a262d9 // added list of tables and attributes in AdminRequestSqlController + change export request
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10802 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-30 13:24:43 +00:00
tDidierjean f9c4410e8d // Rename AdminController methods initForm() initList() etc. to renderForm() renderList()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10799 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-30 11:06:38 +00:00
bMancone 12261242e3 // missing comment on getFilterStatus()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10797 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-30 10:35:14 +00:00
bMancone 1913786e66 // Stock: updated controllers
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10796 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-30 10:32:55 +00:00
lLefevre dda2735056 // fix small bug in AdminTaxRulesGroupController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10793 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-30 10:27:21 +00:00
mDeflotte 3ab955a654 // Blocklayered: Allow texture for color attribute
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10792 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-30 09:44:44 +00:00
rMalie 4188def509 // Fix id_shop on meta
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10789 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-30 08:50:16 +00:00
rMalie c2ce21b43d // Fix id_shop on meta
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10788 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-30 08:49:30 +00:00
rMalie eb2fde29b3 // Fix id_shop on meta
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10787 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-30 08:47:37 +00:00
mDeflotte 314cd37e67 // Blocklayered: Remove url_params of products in ps 1.5
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10786 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-30 08:46:02 +00:00
mDeflotte a42ab201f0 // Blocklayered: BO message used "echo", replaced by a return.
// Blocklayered: Bug when show_limit = 0

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10785 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-30 08:33:37 +00:00
tDidierjean 5c61feb04b // Changes to controller and AdminCustomers refactoring
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10764 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-29 18:35:17 +00:00
mDeflotte 557e05ae01 // Now blocklayered work with PS1.5 and 1.4
// Adding some improvement to the blocklayered : Filters are now customizable (checkbox, radio, ...)

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10763 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-29 18:03:21 +00:00
lLefevre f787bbd3e6 // added 1.5.0.2 version in install script + fix deleted Adminlogin accesses
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10762 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-29 17:47:14 +00:00
vKham 2abd646ca4 // new layout page stats, substitute fieldset by div, legend by h2, delete stylesheet on html delete engines
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10761 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-29 17:43:12 +00:00
vKham ad65287eeb // new layout page stats, substitute fieldset by div, legend by h2, delete stylesheet on html
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10760 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-29 17:42:38 +00:00
bMancone 66a0d5e50f // AdminSupplyOrdersController: fixed actions displayed when updating quantity received.
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10759 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-29 17:32:26 +00:00
bMancone c5dab89eb5 // AdminSupplyOrdersController: fixed bugs when adding products to the order
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10758 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-29 17:04:43 +00:00
bMancone b61478ca1e // AdminSupplyOrdersController: fixed condition..
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10755 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-29 16:48:19 +00:00
rMalie 9c7bc59954 // Add override debug in BO too
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10748 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-29 15:44:53 +00:00
lLefevre 31bf5b5864 // fix remove button delete for AdminCountriesController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10747 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-29 15:18:10 +00:00
bMancone 2ff4ce919f // AdminSupplyOrdersController: added confirm message before using a template to create an order
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10746 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-29 14:47:06 +00:00
bMancone e918d53dfa // AdminSupplyOrdersController: it now possible to create supply order templates, and use them to create actual supply orders
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10745 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-29 14:36:15 +00:00
bMancone 3cae130e9d // AdminController: added beforeAdd() method
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10744 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-29 14:35:43 +00:00