Commit Graph

1610 Commits

Author SHA1 Message Date
mDeflotte 3fbdda4b45 // BugFix with a css rule
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10432 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 14:46:00 +00:00
lLefevre b0366ed9ac // fix bug in AdminBackupController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10431 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 14:44:54 +00:00
mDeflotte 0d5421a40c // Dont need to set the id_carrier in class Cart
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10430 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 14:41:41 +00:00
bMancone bbdf6513a8 // Update Supply Order Form (PDF)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10428 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 14:37:36 +00:00
mMarinetti 2ee0842282 // check if PS_MODE_DEV is defined before checking its value
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10426 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 14:32:58 +00:00
mMarinetti 4a5f3dc5c9 // autoupgrade will not be present in alpha release
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10425 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 14:31:56 +00:00
fBrignoli 312d93a601 // deprecated function replaced
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10424 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 14:29:12 +00:00
rGaillard 2ad9e4aa20 // Fix bugs AdminShopController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10423 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 14:22:11 +00:00
vAugagneur 663009b3bb //fixed small bug on live edit
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10422 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 14:11:34 +00:00
mDeflotte da416dea61 // Autoset id_carrier on the cart constructor + Replace a hookExec()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10420 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 14:09:52 +00:00
mMarinetti 3f649efee7 // restored previous changes since r10392.
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10419 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 14:06:55 +00:00
mDeflotte 8c0e148b75 // Re-put Cart->id_carrier + BugFix with shipping cost calculation
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10417 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 13:50:53 +00:00
mMarinetti 99e90d5492 // fix required fields
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10415 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 13:29:07 +00:00
mMarinetti 7056c69af1 // fix products informations page
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10414 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 13:28:24 +00:00
rMalie abead31e0f // Apply fix on reduction price from 1.4 to new system on 1.5
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10412 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 13:24:19 +00:00
lLefevre f632af5e7a // fix bug statsforecast and added toolbar in AdminDbController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10411 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 13:23:23 +00:00
vChabot 9fef06a9bb // correcting merge problem
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10409 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 13:07:47 +00:00
dSevere e095ebccd3 // Stock Available : bug fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10408 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 12:57:09 +00:00
bMancone 7b394c6cbd // Product names are now correctly displayed in AdminStockManagement & AdminStockCover
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10398 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 12:40:56 +00:00
dSevere d0c1167d6c // Stock Available : bug fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10395 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 12:39:30 +00:00
fSerny f0cf51ab64 // Addons connection
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10394 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 09:54:14 +00:00
rMontagne 9159631b27 Refactoring image system
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10393 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 09:46:02 +00:00
rMontagne bb524bf7a5 // Refactoring images.tpl
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10392 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 09:35:34 +00:00
rMontagne b7437fdb3c Refactoring image system
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10391 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 09:34:25 +00:00
mDeflotte eab460df2d // BugFix id_carrier in cart not defined + choosing address delivery for multishiping on opc
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10389 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 09:28:22 +00:00
tDidierjean e0415ec7e2 // Remove deprecated calls to Tools::addJS/CSS in modules
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10388 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 09:24:56 +00:00
bMancone 5b4d337cd6 // Warehouse: shops are now correctly associated
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10387 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 09:23:32 +00:00
fSerny 1723512579 // Change Addons login Position
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10386 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 09:19:41 +00:00
rGaillard ed19c60ff8 // Fixed redirect link after logout
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10385 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 09:17:32 +00:00
fBrignoli e176ea6dd3 // broken due to merge
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10384 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 09:11:30 +00:00
lLefevre 7025caef50 // small fixes to BO and norm
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10383 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 09:03:03 +00:00
rMalie a4b5aa4251 git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10382 b9a71923-0436-4b27-9f14-aed3839534dd 2011-11-22 08:48:49 +00:00
fSerny 620653ce13 [*] BO : AdminModules improved performance
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10381 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 23:42:33 +00:00
fSerny ef9d7c62b6 // Fix on Module Class
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10380 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 23:21:49 +00:00
fSerny c333d84530 [*] BO : Admin Modules now works in Ajax :)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10379 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 21:44:52 +00:00
mMarinetti 2ee1dd5813 // AdminProducts informations fix, saveAndStay fix,
[+] BO : if json, ajax-layout.tpl can generate json with conf, _errors, warnings, informations and page var
// HelpAccess improvement
// now Product does not require quantity anymore

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10377 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 19:26:30 +00:00
dSevere e05452c7c4 // Product Warehouse location : Manage multiple warehouses and location associated for a product / product attribute
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10376 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 19:10:27 +00:00
dSevere a9b5f70767 // Product Warehouse location : Manage multiple warehouses and location associated for a product / product attribute
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10375 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 18:43:04 +00:00
bMancone de6d9c7bbe // Supply Orders: the supply order form is now generated (PDF)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10374 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 18:31:44 +00:00
tDidierjean 5dc1c8a71c // small fixes to BO
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10372 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 17:49:47 +00:00
vKham ff30d33e8f // add new images config checklist dashboard
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10370 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 17:32:43 +00:00
vKham 2a83293a54 // new bloc homepage configuration checklist, link
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10368 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 17:24:02 +00:00
lLefevre 20b05a63ee // delete link of list in AdminTrackingController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10367 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 17:21:31 +00:00
lLefevre e902d3e1dd // added tpl in AdminTrackingController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10366 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 17:11:51 +00:00
fSerny 2190551536 [*] BO : New module interface tab now connected to PrestaShop Addons
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10365 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 17:11:01 +00:00
lLefevre 9e74ede928 // fix bug in AdminTrackingController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10364 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 17:09:51 +00:00
tDidierjean b10fb843b5 // remove smarty translate addslashes for BO
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10363 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 16:53:58 +00:00
vSchoener b45021c243 // update security injections
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10362 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 16:07:40 +00:00
tDidierjean 7ec7dd4bbe // Add BO translations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10360 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 15:46:40 +00:00
mMarinetti 8a82865591 // fix tracking
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10359 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 15:46:07 +00:00