Commit Graph

1635 Commits

Author SHA1 Message Date
tDidierjean 63688446d5 // Changes to ajax tab loading in product page
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11478 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 13:05:29 +00:00
lLefevre 9d74a9e989 // move call method initPack() in AdminProductsController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11476 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 12:35:33 +00:00
lLefevre 2b38da2edd // move call method initPack() in AdminProductsController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11475 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 12:34:55 +00:00
tDidierjean 3f3f99bded // Fix to translations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11470 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 11:05:55 +00:00
mBertholino 16de8f7129 // improve features in adminProduct code and product/features.tpl ; the update of a feature wasn't working
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11469 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 11:00:26 +00:00
rGaillard 4a32db9c86 // Fix installer && not displaying Shop fields on specific price when multishop is disabled
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11463 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 10:36:54 +00:00
tDidierjean 94955a4f56 // Fix unit price calculation and display in BO
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11461 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 10:12:46 +00:00
lLefevre 5b498b35dc // Fix bug add pack
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11460 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 10:09:44 +00:00
vChabot 79fce310ae // little fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11458 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 10:08:21 +00:00
vAugagneur 3bae3d127a //added translation
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11457 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 09:59:53 +00:00
vChabot 23aa8049c6 // adding categories with shop association
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11455 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 09:46:38 +00:00
aFolletete 083f1baf61 // fix issue on ajax querie on adding product
// clean code

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11451 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 09:23:31 +00:00
lLefevre c7fa4db0a5 [-] FO : #PSTEST-72 : delete specific price in product tab
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11448 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 09:00:15 +00:00
mMarinetti ac09b5e2bc // optmization adminshopurlcontroller
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11446 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-20 23:14:11 +00:00
aFolletete bb4576c4ab // when you adding a product on order, you can set a specific price
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11444 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-20 22:52:41 +00:00
mMarinetti e9f57535b5 // fix toolbar bo shop controller and process delete error message
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11442 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-20 22:38:04 +00:00
bMancone 449e6f2eb7 // Stock : translations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11440 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-20 18:36:58 +00:00
bMancone 6840363b9b // Stock : translations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11439 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-20 18:09:22 +00:00
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 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
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
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 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
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 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
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
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 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
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
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
rMalie 1d2f9e44c4 // Improve collections : where() method reworked (prototype changed) + validation of fields
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11383 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-19 16:57:28 +00:00
mDeflotte 772147a6ee // Removing some id_warehouse
// Adding some checks with advanced_stock_management product attribute

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11375 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-19 16:01:41 +00:00
jBreux 4e810c850c [+] Project : Add specific prices to a specific customer
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11364 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-19 15:31:18 +00:00
lLefevre 42bad872d7 [-] BO : #PSTEST-31 : update in AdminProductsController : available_date
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11363 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-19 14:42:58 +00:00
mBertholino 4d8db42292 // improve adminShopController adminShopUrlController and adminGroupShopController code, in order to have a default Status value activated.
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11361 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-19 14:36:29 +00:00
tDidierjean dac7c7795c // Fix bug with specific prices creation
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11358 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-19 13:53:56 +00:00
lLefevre 800b9f164d [-] BO : #PSTEST-56 : fixed incorrect request in shop filters
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11357 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-19 13:35:58 +00:00
lLefevre 373232aa93 // small bugs in combinaitions of virtual products
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11356 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-19 13:20:30 +00:00
rMalie b7ae37f6d7 // Change prototype of methods from(), leftJoin(), innerJoin(), leftOuterJoin() and naturalJoin() for DbQuery class
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11351 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-19 11:13:13 +00:00
tDidierjean 26f835a0ac // Small fixes to BO
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11348 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-19 10:33:13 +00:00
mDeflotte 39ee8e03ae // $required_fields must not be static
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11347 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-19 10:28:53 +00:00
aFolletete 92805dc869 [+] BO : on order edition, you can add a discount
[+] BO : on order edition, you can delete a discount
// Adding two new columns in order_cart_rule table: id_order_invoice, value_tax_excl

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11330 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-18 17:18:54 +00:00
aFolletete 538cb58556 // clean code
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11323 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-17 16:26:59 +00:00