Commit Graph

591 Commits

Author SHA1 Message Date
dMetzger
bb7050715b // bug fix for the cart rules
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10525 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 13:38:41 +00:00
lLefevre
a6b66fb288 // Fix bug in AdminPaymentController && added toolbar
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10521 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 13:21:39 +00:00
dSevere
ad6e5b1cb8 // AdminController and stock management : some debug and updates
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10520 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 13:15:40 +00:00
tDidierjean
27e910572c // fixes to orders->view product, adminsearch->toolbar, admintaxrules hint
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10519 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 13:14:07 +00:00
rMalie
0f87f86203 // Fix some bug on multishop + improve display of shop pages
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10518 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 13:09:23 +00:00
bMancone
2dbeb55bf1 // AdminProductsController: added new array to translate tabs name. Added translations of fr/admin & SupplyOrderForm(PDF)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10516 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 11:41:25 +00:00
fSerny
79867d0a75 [-] BO : AdminModules fix on Addons Connection
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10514 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 11:31:39 +00:00
rGaillard
ddcdcd571d // Warning is now displayed for shop without url
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10512 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 11:11:45 +00:00
vSchoener
130cf8ed11 // Update accounting controller due to last commit
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10511 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 10:57:07 +00:00
rGaillard
3790730861 // Little fix on carts tab filters
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10509 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 10:37:33 +00:00
rGaillard
fd06e5c1a1 // Fix online visitors on carts tab
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10507 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 10:32:13 +00:00
rGaillard
06ab93a8f6 // ajax process off adminaccess is now in the controller
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10503 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 10:01:22 +00:00
mDeflotte
4261dbc0df // Multishipping : Refresh carrier list
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10502 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 09:57:21 +00:00
lLefevre
4427b9a377 // Fix bug in AdminCartsController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10499 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 09:28:36 +00:00
vAugagneur
c827a9af0e //
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10479 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 22:09:22 +00:00
vAugagneur
9756801649 [+] BO : added new input type tags
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10477 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 21:48:07 +00:00
dSevere
844b0f4055 // Product Admin Controller : update toolbar + bugs fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10467 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 19:17:41 +00:00
bMancone
699ee23d94 // AdminStockMvt : ergonomy
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10465 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 18:50:53 +00:00
lLefevre
5f91af9c4e // fix display AdminLogsController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10459 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 17:21:41 +00:00
mDeflotte
5532f12d80 // Multishipping : on opc, on putting multi-shipping to off, the cart is set to one address delivery
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10458 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 17:18:30 +00:00
tDidierjean
4dc0ebb2de // fix AdminStatsTab::displayStats() when no module is active
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10457 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 17:17:19 +00:00
lLefevre
a848e82ae9 // fix bug AdminTranslationsController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10456 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 17:14:11 +00:00
lLefevre
cbea65eb66 // fix bug in AdminController method initView()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10455 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 17:00:09 +00:00
tDidierjean
c5c479dcb7 // Added toolbar to AdminModulesPositions and added full products list on AdminProducts
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10453 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 16:49:52 +00:00
fBrignoli
cb92bacb97 // Strict standard on initView
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10452 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 16:45:47 +00:00
dSevere
1934e2ef6a // Product Admin Controller : update interfaces for quantities, suppliers and warehouses + bugs fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10451 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 16:41:42 +00:00
lLefevre
3ceff1df09 // delete multiple button save in AdminStatsTabController and added juery ui datepicker
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10450 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 16:36:10 +00:00
rMontagne
f00820e090 //fix UpdateShopAssocImage
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10449 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 16:29:10 +00:00
bMancone
6d46e7dced // Supply Orders : prices are now correctly converted, depending on the currency of the order/warehouse
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10448 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 16:23:00 +00:00
mDeflotte
49922799e1 // BugFix : Problem with token
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10446 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 16:09:49 +00:00
lLefevre
40d2a6282b // fix added toolbar in AdminInformationController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10445 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 16:05:08 +00:00
lLefevre
62696d85f9 // fix added toolbar in AdminTranslationsController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10444 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 15:54:14 +00:00
bMancone
e69629b214 // Supply Orders : it is not possible to create an order if the date_delivery_expected is in the past, anymore.
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10441 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 15:31:01 +00:00
fSerny
c68c8be6e8 [-] BO : AdminModules - Fix on GetModulesOnDisk and general ergonomy
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10434 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 14:53:58 +00:00
vChabot
4b15da6656 // attributes position works fine
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10433 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 14:53:50 +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
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
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
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
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
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
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
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