Commit Graph

2363 Commits

Author SHA1 Message Date
fSerny 0b1e2ba0a3 [-] PROJECT : Moving xml files to xml directory
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11438 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-20 17:37:14 +00:00
vChabot 6ef2e2cc50 [*] BO : New category management with multi shop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11437 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-20 17:36:08 +00:00
tDidierjean 2576abc756 // Fix bug when updating product tags
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11436 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-20 17:30:12 +00:00
fGaillard b03bfc5efd // Fixed warehouse shops list
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11435 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-20 17:29:24 +00:00
vAugagneur d7fe661aa4 //fixed js bug
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11434 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-20 17:22:35 +00:00
mMarinetti 1423fb7cea // retrocompatibility fix : displayHeader and displayFooter
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11433 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-20 17:17:57 +00:00
jBreux bd9261af97 // Fix comparator
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11432 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-20 17:03:08 +00:00
mDeflotte 7776b7af6d // Add id_shop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11431 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-20 16:58:27 +00:00
tDidierjean 549aff4ce6 // Complete the removal of Image->legend property
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11430 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-20 16:54:44 +00:00
tDidierjean 631e33affe // AdminTranslations: fix toolbar and remove google translate
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11429 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-20 16:48:05 +00:00
bMancone 94e8022772 // Stock : improvements (ergonomy/translations)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11428 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-20 16:45:05 +00:00
jBreux 3fda89d7c4 // Smarty 3 standardize
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11427 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-20 16:42:21 +00:00
fSerny 2c6f2da512 [-] BO : Filter modules system repaired and now in ajax
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11426 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-20 16:17:21 +00:00
mDeflotte 64d0b39bfa // Password input form login is not formated correctly
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11425 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-20 16:08:05 +00:00
jBreux 984c6c54ba // Smarty 3 standardize
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11424 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-20 16:05:59 +00:00
jBreux c9d150b36b // Fix bug and Smarty 3 standardize
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11423 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-20 16:04:45 +00:00
mMarinetti ce2a0221e0 // toolbar bug admintranslations - temporary fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11422 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-20 16:01:43 +00:00
tDidierjean 425b83eff8 // Fix bug with specific prices creation
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11421 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-20 15:37:49 +00:00
mDeflotte f00ce25f7b // Remove "*" from require radio button
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11420 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-20 15:23:21 +00:00
lLefevre c29b3acdc1 // added the name of controller as class in form.tpl
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11419 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-20 15:18:32 +00:00
tDidierjean c8342112c8 // fix category autocompletion binding
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11417 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-20 15:13:26 +00:00
mDeflotte 68c1fb7c5d // Add translation
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11416 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-20 15:04:07 +00:00
mDeflotte 1415a788ad // Generate order reference durring upgrade
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11415 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-20 14:54:42 +00:00
mBertholino 49a1282cfb // improve authentification.tpl code, in order to display errors messages.
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11414 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-20 14:39:27 +00:00
aKorczak 3527399c24 [-] WS: Norm fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11413 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-20 14:38:18 +00:00
aKorczak 9fe70bb963 [-] WS: Norm fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11412 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-20 14:38:00 +00:00
lLefevre cb07593455 [-] MO : #PSTEST-44 : Category cannot be parent of herself
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11411 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-20 14:28:01 +00:00
mDeflotte 348d0227f9 // Adding some translations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11410 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-20 14:08:43 +00:00
mDeflotte daa8c7f8c9 // BugFix - Changing error message "name is to long (32 chars max)" + Adding context to Tools::displayError()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11409 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-20 14:06:57 +00:00
bMancone 59fd81a2e2 // StockManager: fixed
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11408 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-20 13:51:05 +00:00
rMalie a2ff7db3e2 // Fix default value of iterator in collections
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11407 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-20 13:49:59 +00:00
bMancone 4b15867b80 // Stockavailable debugged
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11406 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-20 13:31:45 +00:00
lLefevre 710a5018aa [-] MO : #PSTEST-41 : update ProcessAttachment method
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11405 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-20 13:06:28 +00:00
bMancone 7a9648775c // AdminProductsController: fixed bug on suppliers associations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11404 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-20 13:03:27 +00:00
mMarinetti 95eda3498f // fix minor issue about Hook::preloadHookAlias
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11403 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-20 12:55:33 +00:00
tDidierjean 855651d625 // Changes to AdminProducts workflow
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11400 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-20 10:44:25 +00:00
mDeflotte 5af57107f9 // BugFix - PSTEST-51 - Ajout dans un pack - Message d'erreur avec faute d'orthographe
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11399 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-20 10:19:58 +00:00
bMancone 121a314ef1 // Stock: fixed upgrade script
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11398 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-20 10:09:59 +00:00
mDeflotte 8fb44e6892 // BugFix - PSTEST-64 - Duplication de produit dans la liste et la fiche
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11396 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-20 09:43:56 +00:00
rMalie 33b340dcaa // Fix duplication of images
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11395 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-20 09:40:59 +00:00
mDeflotte 67dff10638 // BugFix - PSTEST-65 - bouton retour à la liste onglet paiement
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11393 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-20 09:00:26 +00:00
bMancone 895437e02d // Stock : updated Product
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11392 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-20 08:52:45 +00:00
aFolletete d3a3a76421 // add payment information on Payment table
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11391 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-19 19:03:27 +00:00
bMancone 8af781e449 // Webservice: Stock
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11390 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-19 18:34:31 +00:00
aFolletete 5d7a120e50 // management of discount addition when no invoice on current order
// update the discount form when new invoice is created

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11389 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-19 18:24:03 +00:00
vSchoener 4b8097e154 // Add module upgrader
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11388 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-19 17:54:54 +00:00
vSchoener 5efc077d8d // Fix xss
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11387 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-19 17:47:24 +00:00
fSerny bb28baec68 [-] BO : Bulk action management repaired
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11386 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-19 17:31:33 +00:00
mDeflotte 016e7b268f // Removing red error message when orders total is diferent form the total paid if there are multiple orders with the same reference
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11385 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-19 17:26:17 +00:00
lLefevre bd13b988b1 [-] FO : #PSTEST-54 : price pack
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11384 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-19 17:04:20 +00:00