Commit Graph

1795 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
fBrignoli 0a9889f3af [-] CO : incorrect left join conditions in getTaxRules
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10649 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-25 10:22:58 +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 7b58ec6c0e // CHANGELOG ! Thanks to pizza fix ;)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10642 b9a71923-0436-4b27-9f14-aed3839534dd
1.5.0.1
2011-11-23 23:33:52 +00:00
fSerny a3a06d737b // Pizza fix :D
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10641 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 23:24:22 +00:00
tDidierjean 1657c1c5b1 // fix category tree if tree but maybe no tree
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10640 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 23:18:07 +00:00
tDidierjean dfabd7878a // fix category tree if tree
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10639 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 23:14:48 +00:00
tDidierjean ca8fbb4d47 // fix category_tree if no tree
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10638 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 23:13:15 +00:00
vAugagneur 47b2176b4d //
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10637 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 23:07:30 +00:00
aFolletete 3d39e32c43 // fixed little issue
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10636 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 23:05:56 +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
mMarinetti 6fb9419dbc // fix product edition page
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10634 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 23:01:45 +00:00
fSerny 76cb8f5e03 // Little fix on admin_order.js
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10633 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 23:01:08 +00:00
vAugagneur 367c863e3a //
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10632 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 22:54:43 +00:00
rGaillard ffc24ed10b // Fix ajax create account
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10631 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 22:52:34 +00:00
vAugagneur c3e7c28220 //
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10630 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 22:45:25 +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
vAugagneur bc3f7c89a9 //
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10628 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 22:44:15 +00:00
fBrignoli 49b2efe3a5 // John Doe is now "reglo"
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10627 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 22:43:34 +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
tDidierjean 005913ce3b // add BO translations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10625 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 22:39:26 +00:00
tDidierjean 722223c2a4 // fix generateReference()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10624 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 22:32:16 +00:00
tDidierjean dbe72f8f76 // add BO translations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10623 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 22:24:40 +00:00
tDidierjean d8fcdf19fe // fix AdminController translations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10622 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 22:21:25 +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
fBrignoli 0ebcc6cb67 // John DOE's order is back!
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10620 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 22:17:25 +00:00
dMetzger 1af8b45b5f // Toolbar removed from cart rules
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10619 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 22:07:22 +00:00
mMarinetti 8356cb82cf // strtouper(Tools::passwdGen(12)) replace uniqid, and Alain asked me to add "lol"
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10618 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 22:07:08 +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
lLefevre 7f14442c89 // added translations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10616 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 21:53:21 +00:00
rGaillard f59ff65357 //small fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10615 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 21:51:17 +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
mMarinetti b027122859 // removed global $_LANGADM in smartyadmin.config.inc.php (not used)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10613 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 21:48:02 +00:00
tDidierjean a69d737ad8 // Fix bug with product quantity update
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10612 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 21:45:11 +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
tDidierjean 42134be069 // Fix incorrect translation strings in tpl
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10609 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 21:33:13 +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
rGaillard b03a1730f6 // Fix back office order link
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10607 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 21:27:57 +00:00
bMancone f1755dc5b2 // Stock : french translations on cover/instant state and mvt
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10606 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 21:22:10 +00:00
bMancone 48b82a094f // Stock : fixed translations in tpl
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10605 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 21:20:40 +00:00
mMarinetti acc401e3e8 // removed looong looong code
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10604 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 21:18:11 +00:00
dMetzger 7648f8ece0 // Order processing bugs fixed
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10603 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 21:02:51 +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
rGaillard 0b3c094698 // Fix PHP notice
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10600 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 20:47:50 +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
lLefevre c4732a431a // fix bug "apply priority management" in AdminProductsController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10596 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 20:01:33 +00:00