Commit Graph

476 Commits

Author SHA1 Message Date
fBrignoli
39ee88bdf2 [-] BO : Incorrect CartRule value
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10650 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-25 10:34:43 +00:00
tDidierjean
62422904f3 // change to orders list display
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10648 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-25 10:13:49 +00:00
aFolletete
04a3aab393 // WAOW ! Adding change currency feature in AdminOrdersController ! It's amaizing :D Wonderful ;)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10635 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 23:04:33 +00:00
vAugagneur
c66db0eef1 //
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10629 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 22:44:28 +00:00
fSerny
f5aadafc92 [-] BO : Partial refund - part 4
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10626 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 22:42:17 +00:00
rGaillard
b7c28b8c48 // Fix shop import stock available
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10621 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 22:19:48 +00:00
dMetzger
42e3ab3b90 // BO login bug fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10617 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 22:04:01 +00:00
bMancone
f4ed4ce3ee // AdminCartRulesController : fixed toolbar in initForm()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10614 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 21:49:48 +00:00
fSerny
3c7d9ba53b [*] BO : Partial refund - part 3
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10611 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 21:42:27 +00:00
lLefevre
4eaf942429 // fix bug added and remove attachement in AdminProductsController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10610 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 21:37:18 +00:00
vAugagneur
66b1f844e4 [+] BO : login and lost password is now in ajax and convert in AdminController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10608 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 21:32:11 +00:00
mMarinetti
e5d25eea83 // fix save and stay in product page
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10602 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 20:52:52 +00:00
fSerny
ac24d5ddd8 [-] BO : Load customer and cart in AdminOrderController init to fix a bug with CancelProduct
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10601 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 20:52:37 +00:00
bMancone
00fa12e8f1 // AdminDeliverySlipController : fixed toolbars
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10599 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 20:45:18 +00:00
vSchoener
fb66ab60e3 // Fix missing jquery plugin for the address layout
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10598 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 20:32:44 +00:00
bMancone
c666cd32ab // Stock : updated preferences for advanced stock management
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10597 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 20:02:08 +00:00
dMetzger
c604df470d // Cart rules fixed in admin customers
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10594 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 19:22:23 +00:00
vSchoener
2490a1def3 // Update Accounting and fix undefined var
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10592 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 19:13:44 +00:00
mMarinetti
c8faf79c15 // fix adminproducts images
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10590 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 18:50:10 +00:00
dSevere
ddcede4ef5 // Product Suppliers : Debug and optimizations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10589 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 18:48:09 +00:00
tDidierjean
9ebe542fdb // fix product live preview and duplication
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10585 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 18:33:11 +00:00
rGaillard
d3458a1c26 // Revert good priorities on conditions
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10583 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 18:16:55 +00:00
lLefevre
bcd15e8f6f // Fix bug in AdminCustomersController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10580 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 18:01:07 +00:00
dMetzger
f670f7573f [+] BO : add new feature, Order edition
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10579 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 17:45:52 +00:00
lLefevre
5660c09d62 // delete btn preview if the shop have not virtual_uri in AdminProductsController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10577 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 17:37:16 +00:00
lLefevre
b365c2befa // delete btn preview if the shop have not virtual_uri in AdminProductsController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10570 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 17:14:19 +00:00
lLefevre
cc50d29cc3 // added link for preview in AdminProductsController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10566 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 17:05:29 +00:00
rMalie
e4654570e9 // Some fix on multishop + stock
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10564 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 17:00:20 +00:00
lLefevre
38d17b447e // Fix bug in AdminProductsController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10562 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 16:49:15 +00:00
tDidierjean
2d3db2e15d // Add actions to product list and fix product duplication
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10560 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 16:45:14 +00:00
rGaillard
1207b5bf40 // Small fixes
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10558 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 16:31:53 +00:00
lLefevre
74145e0081 // fix bug added action edit and delete in AdminScenesController + norms
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10555 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 16:13:23 +00:00
dSevere
2d238bbac7 // Stock Management : Show stock interfaces only if the option is active in the configuration + debug
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10554 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 16:07:57 +00:00
tDidierjean
5dbd54ff5f // Fix helper translations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10548 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 15:28:05 +00:00
tDidierjean
cb8cec2551 // refactoring AdminTranslations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10542 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 15:00:48 +00:00
rGaillard
f8acb56108 // Little change on adminpayment
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10537 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 14:29:40 +00:00
lLefevre
8a5493103d // fix bug change translate AdminTab for AdminController in AdminTranslationsController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10536 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 14:25:13 +00:00
mMarinetti
668f3676eb // fix redirect
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10531 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 14:01:28 +00:00
fSerny
4c83dce8f4 [-] BO : AdminModule Addons Icon now appear in AutoComplete Search
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10527 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 13:49:15 +00:00
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