Commit Graph

3477 Commits

Author SHA1 Message Date
dMetzger ff44291d38 [-] FO : uncombinable cart rules are not combinable anymore
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12721 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-26 15:17:23 +00:00
mDeflotte 2a21769946 [-] BO : #PSTEST-476 - Fix problem with slashes added before "'"
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12720 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-26 15:05:56 +00:00
rMalie 9c823e3cdd // Normalize
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12719 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-26 14:44:24 +00:00
dMetzger b274997203 [-] BO : voucher creation in the order detail fixed
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12718 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-26 14:34:58 +00:00
mDeflotte 265b61588e [-] BO : #PSTEST-583 - Add translation for the button "Edit this mail templates", and fixed tinyMCE area not shown on mail translation page
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12717 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-26 14:31:31 +00:00
rMalie 2159489ad2 // Add more informations on deprecated data
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12716 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-26 14:10:31 +00:00
rGaillard acae0cb8aa // Fix AdminProduct tabs
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12715 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-26 13:44:23 +00:00
dMetzger b39c0061a7 [*] BO : new dimension added to the product filter in the cart rules
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12714 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-26 13:30:16 +00:00
mDeflotte 5a9ba91f12 [-] BO : #PSTEST-575 - Replace a || by a &&
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12713 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-26 13:28:35 +00:00
rMalie 840d0476c3 // Fix Exception in autoload
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12712 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-26 13:15:42 +00:00
rGaillard 735b3c07c0 // Small fixes on AdminProduct tab
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12711 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-26 12:50:41 +00:00
rMalie 1aea427aaa // Fix potential issue on autoload if class_index is corrupted
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12710 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-26 12:49:22 +00:00
mDeflotte cf85d8a712 [-] BO : #PSTEST-586 - Bad table name
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12709 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-26 10:47:03 +00:00
fSerny 217ad6106c [-] BO : AdminModule replacing cURL by file_get_content with POST stream_context
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12708 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-26 10:44:36 +00:00
rMalie 4325eccc55 // Normalize
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12706 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-26 10:28:25 +00:00
rMalie d1e9dadec8 // Fix installer context
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12704 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-26 09:57:27 +00:00
rMalie 350f3ec749 // Normalize
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12703 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-26 09:29:50 +00:00
fBrignoli 93a46c830d [*] LO : Colombia states
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12702 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-26 09:24:19 +00:00
bMancone c05495eade // Stock : general improvements
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12700 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-25 19:05:06 +00:00
mMarinetti 863069f098 // migrate orders does not use constant
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12699 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-25 18:15:55 +00:00
bMancone abfeef382b // Improved PDF header
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12698 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-25 18:10:22 +00:00
bMancone 00c7a1f4b6 // Fixed AdminOrdersController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12697 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-25 18:05:19 +00:00
bMancone 494e434a1d // Fixed combinations CSV import for PS 1.5
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12696 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-25 18:01:32 +00:00
rMalie e47d23bfce // Normalize
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12694 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-25 17:26:04 +00:00
mDeflotte cd6fa32ec7 [-] BO : #PSTEST-582 - Select default currency on tab tab product > supplier
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12693 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-25 16:59:55 +00:00
rMalie 4958802ccf // Normalize
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12692 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-25 16:48:14 +00:00
rMalie 359b51d1ea // Normalize
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12691 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-25 16:39:34 +00:00
tDidierjean b2e21e6ce1 [-] BO : fix bug on product page when clicking save&stay on prices tab
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12690 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-25 16:17:00 +00:00
rMalie 7a30d151e6 // Normalize
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12689 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-25 16:13:36 +00:00
fGaillard a15c3ce6eb [-] MO : MailAlerts module upgraded for PrestaShop 1.5
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12688 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-25 16:04:31 +00:00
rMalie 33cf4fab23 // Normalize
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12687 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-25 15:51:47 +00:00
rGaillard b5fca7d839 // Debug BackOffice order
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12686 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-25 15:24:11 +00:00
bMancone 78294f7085 // fixed CSV import
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12685 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-25 15:04:25 +00:00
bMancone 8018e8057e // Supply Order ergonomy
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12684 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-25 15:03:56 +00:00
mDeflotte 3eb93e4ad6 [-] BO : #PSTEST-521 - Translations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12683 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-25 14:55:25 +00:00
rMalie 6e008f47d9 // Normalize
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12682 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-25 14:45:32 +00:00
mDeflotte 589ab416da // Change translations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12681 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-25 14:42:05 +00:00
rMalie c994c25fe1 // Normalize
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12680 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-25 14:40:12 +00:00
tDidierjean bd7ba6969b [-] BO : fix regression on product image upload
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12679 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-25 14:21:53 +00:00
jBreux 8c25b56777 [*] Project : Add possibility to use admin controllers in modules
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12678 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-25 14:12:36 +00:00
mBertholino 0d16fb2892 [-] BO : #PSTEST-579
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12677 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-25 12:56:01 +00:00
mDeflotte ddf6aa83bc [-] BO : #PSTEST-519 - Change french translation
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12676 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-25 10:33:30 +00:00
mDeflotte 045ae7c344 [-] BO : #PSTEST-497 - Remove alert payement message when the order is canceled
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12675 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-25 10:24:50 +00:00
aFolletete 709dfb5272 // clean code
[-] BO : fixed bug #PSTEST-510 - Now, you can't define several times the same order status

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12669 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-25 09:55:12 +00:00
mDeflotte 8b7efa75bf // Change a translation
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12668 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-25 09:51:06 +00:00
mBertholino 291d67d047 //small update of the file admin-dev/themes/default/template/controllers/orders/form.tpl ; add in javascript the function displayAddressDetail
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12667 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-25 09:30:03 +00:00
mDeflotte 1d7aa16dc4 // Fix bug with object model validation
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12666 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-25 09:11:30 +00:00
mDeflotte 720d8ff457 // Removing console.log
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12665 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-25 08:38:09 +00:00
mDeflotte b21f2ad048 // Improving delivery option list render
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12664 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-25 08:23:28 +00:00
mDeflotte 563ff8c375 // Avoid notice with undefined variable confirm
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12663 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-25 08:13:05 +00:00