Commit Graph

3975 Commits

Author SHA1 Message Date
vAugagneur 92663eee4f [*] BO : add link to Customer messages in tab order #PSFV-514
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13456 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-20 13:10:16 +00:00
dMetzger ae8471b7d6 [-] BO : small fixes on AdminCartRules #PSFV-506
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13455 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-20 10:25:21 +00:00
fBrignoli f437fe1106 // merge 1.4 => 1.5 (bug #PSCFI-4954)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13453 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-20 10:01:37 +00:00
bMancone 2145cd543b // Fixed missing parameters when calling Currency::exists
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13450 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-20 09:22:15 +00:00
dMetzger 2c7720ab08 // You shall not DIE!
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13448 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-20 09:14:01 +00:00
rGaillard cd20b82227 // Fix bugs on Admin Orders
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13446 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-17 17:37:04 +00:00
mDeflotte 5f9b81c3a2 // Remove unuseful lines
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13445 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-17 16:26:29 +00:00
rGaillard 844dddccfd // Fix little bug in helperform
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13444 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-17 16:22:16 +00:00
mDeflotte caf5a6afc3 // Shippping calculation on multishipping did not use package address delivery but the cart address delivery
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13442 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-17 15:57:37 +00:00
mMarinetti 166d540dbd // die2exception
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13441 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-17 15:49:27 +00:00
mMarinetti 2f7d1984a3 // fix category_product index unique in upgrade process 1.4.7.0
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13440 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-17 15:34:28 +00:00
tDidierjean f41fbf40a8 // refactor product attribute ajax actions
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13439 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-17 15:16:09 +00:00
mMarinetti 650aedd44a // handle query errors in migrate_orders.php
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13438 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-17 15:06:47 +00:00
tDidierjean 3ddcf5cfe0 // replace all uses of "combinaison" by "combination"
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13437 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-17 15:03:56 +00:00
tDidierjean a0857d3573 // Deprecate function
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13436 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-17 14:54:32 +00:00
mDeflotte b8fbd8f98f // [-] MO : #PSFV-531 - Removing unused smarty vars
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13435 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-17 14:51:56 +00:00
tDidierjean 403db40a7f [*] BO : #PSTEST-784 - selected attribute is now visible
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13434 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-17 14:50:01 +00:00
fBrignoli 07e1787cdd [-] BO : Bug Fixed #PSTESTS-672 An error has occured during currency creation
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13433 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-17 14:49:49 +00:00
mDeflotte 534009e343 [-] MO : #PSFV-531 - Fix bug on the module Loyalty with pagination links
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13432 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-17 14:49:29 +00:00
mDeflotte 0db654d8c9 [-] MO : #PSFV-532 - Fix bug on the module Loyalty - "points" are not upgrading on changing combination
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13429 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-17 13:36:29 +00:00
vKham c79ab16ff1 // change icon multishop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13428 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-17 13:17:45 +00:00
mMarinetti 74920d9a78 // fix upgrade_order_canada bug (report from 1.4 fix)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13427 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-17 12:58:52 +00:00
mDeflotte c9bcaec32b [-] BO : BugFix : #PSTEST-807 : stay on the form when an error occured
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13423 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-17 12:00:12 +00:00
rMalie 5cce9a9d22 // Fix "you edit field for" multishop #PSTEST-796
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13422 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-17 10:32:45 +00:00
rMalie 748f3647ee // Fix group shop filter association in getList() and improve assoshop with Group: text
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13421 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-17 10:06:00 +00:00
dMetzger 50955422a8 // Removed misplaced debug file
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13420 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-17 09:56:47 +00:00
mDeflotte a53711aeb4 // Improve guest tracking render
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13418 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-17 09:41:40 +00:00
mDeflotte 13fe61115e // Fix bug with css rules
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13417 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-17 09:33:44 +00:00
mDeflotte d344df74de [-] FO : #PSTEST-803 - Change mail links
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13416 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-17 09:23:44 +00:00
mDeflotte 049acb187a [-] FO : #PSTEST-803 - Change mail links
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13415 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-17 09:01:26 +00:00
mDeflotte 27aa6e915f // Missing css rules
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13414 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-17 08:57:29 +00:00
rMalie fbb43a7d28 // Fix #PSFV-382 (remove genders images from img/)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13413 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-16 17:22:38 +00:00
rMalie b0d24b3ae4 // Fix shop association in admin on attributes page
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13412 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-16 17:11:49 +00:00
mDeflotte 19e93647d7 // Fix style override problem with file-uploader button
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13411 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-16 17:08:14 +00:00
rMalie 1c40f0b03d // French translations (by Xavier)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13410 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-16 17:03:17 +00:00
mDeflotte 76ba932185 [-] FO : #PSTEST-771 - Add description to supplier's product list
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13409 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-16 16:48:07 +00:00
mDeflotte aa7ebfe681 [-] BO : #PSTEST-776 - Fix bug with attribute order change
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13408 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-16 16:23:58 +00:00
aFolletete 3992d7da89 [-] BO : the default country of shop is correctly selected by default in forms with country field #PSTEST-493
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13407 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-16 15:55:11 +00:00
mDeflotte 92db3de64a [-] BO : #PSTEST-775 - Change button cancel, for back to list on the attribute and feature form
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13406 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-16 15:36:35 +00:00
tDidierjean 40dfc0591d [-] BO : fix bug #PSTEST-786 - virtual products block does not show
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13405 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-16 15:27:55 +00:00
mDeflotte 17826d2a3c [-] FO : #PSTEST-772 - Add description to manufacturer's product list
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13404 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-16 15:19:38 +00:00
mMarinetti bee21430e9 // fix bug about order_canada upgrade
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13403 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-16 15:19:11 +00:00
rMalie baef9c4967 // French translations (by Xavier)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13402 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-16 15:18:47 +00:00
lLefevre ece21a06b7 [-] BO : #PSTEST-792 : Translation of scenes
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13400 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-16 15:15:19 +00:00
fBrignoli 463d718dbb [-] BO : Bug Fixed #PSTEST-543 - Unable to bulk delete a tax rule
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13399 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-16 15:06:34 +00:00
rMalie 091d1e64a9 // Remove search box from quick access & search list in BO
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13397 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-16 15:01:56 +00:00
rMalie 3c79768737 [*] Classes : table prefix is no longer required in Db::getInstance()->delete() method
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13396 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-16 14:54:52 +00:00
rMalie 40798e75dd // Fix install when _DB_PREFIX_ is empty
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13395 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-16 14:44:09 +00:00
mDeflotte 83053fa035 // [-] BO : #PSTEST-769 - Use context instead of the Configuration::get()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13394 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-16 14:23:07 +00:00
mDeflotte 5b942b7993 [-] BO : #PSTEST-769 - The default country must be pre-selected on address list
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13393 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-16 14:13:04 +00:00