 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 |
|
|
mDeflotte
|
f21b8defa1
|
// BugFix with id_address_delivery
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10595 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-23 19:27:57 +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 |
|
|
rGaillard
|
15298ee65b
|
// Add license to some module
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10593 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-23 19:20:49 +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
|
6db9f7dcb0
|
// fix adminproducts images, layout-ajax improvements
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10591 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-23 18:52:33 +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 |
|
|
mMarinetti
|
b12517c17c
|
[+] BO : new javascript function doAdminAjax to simplify uses of ajax request (the prototype of this function can evolve before beta)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10588 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-23 18:38:50 +00:00 |
|
|
rGaillard
|
b7fecada80
|
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10587 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-23 18:37:38 +00:00 |
|
|
mMarinetti
|
fdd72b47fa
|
// admincontroller fix when json
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10586 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-23 18:36:59 +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 |
|
|
dMetzger
|
c32038a6f4
|
// Removed the underlined space in the BO list headers
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10584 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-23 18:20:08 +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 |
|
|
vChabot
|
d9b6c6401a
|
// adding the php upgrade to move every orders into order_carrier
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10582 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-23 18:10:01 +00:00 |
|
|
vSchoener
|
e66762fc85
|
// Update bad javascript var for opc
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10581 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-23 18:09:50 +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 |
|
|
bMancone
|
45fbdd8635
|
// Stock : improved translations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10574 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-23 17:23:10 +00:00 |
|
|
mDeflotte
|
3989b708c8
|
// Delivery option are now auto-selected in the checkout
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10572 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-23 17:21:30 +00:00 |
|
|
fBrignoli
|
ba7ec2dd9d
|
[-] FO : Undefined method getOutOfStock
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10571 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-23 17:18:09 +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 |
|
|
tDidierjean
|
d84b5b2749
|
// BO menu now uses the new icons
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10569 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-23 17:12:18 +00:00 |
|
|
rMalie
|
69feff1ee1
|
// Fix stock for multishop on search
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10568 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-23 17:07:46 +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 |
|