Commit Graph

726 Commits

Author SHA1 Message Date
mMarinetti 194c182e8c // report bugfix from trunk to 1.5.x branch
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11625 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-22 16:03:19 +00:00
fSerny 71f2f43ca6 [*] BO : Partial refund now handle quantity
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11624 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-22 15:57:30 +00:00
vChabot 99007ec463 // preference admin controller updated and tools convertbyte too
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11623 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-22 15:56:34 +00:00
mDeflotte 683e3fd594 // No return parent::postProcess();
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11621 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-22 15:32:49 +00:00
jBreux e3a5d7fe37 [+] Project : B2B Features
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11619 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-22 15:30:21 +00:00
bMancone 92d004241c // Warehouse: fixed queries. AdminPPreferencesController: fixed advanced stock management
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11610 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-22 14:26:45 +00:00
lLefevre 9d8452eef0 [-] BO : #PSTEST-22 : Orthographe à revoir dans combinaisons de la fiche produit
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11607 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-22 14:16:11 +00:00
bMancone ac441b6ac9 // Warehouse: when being flaged as deleted, fixed deletion of associations with carriers, products, shops. StockInterfaces: fixed size of the filters
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11602 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-22 13:58:16 +00:00
mMarinetti 1e1141acc8 // fix #PSTEST-125
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11598 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-22 13:43:23 +00:00
vChabot 2a5faa0271 // Improvement : target blank on PDF
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11594 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-22 13:38:00 +00:00
mDeflotte 5f430e1f97 // By default virtual product don't need to have stock to be sold
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11593 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-22 13:29:18 +00:00
lLefevre cddb713ba1 [-] BO : #PSTEST-102: Texte d'une fenêtre de message en anglais
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11592 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-22 13:29:00 +00:00
tDidierjean f1bc6322c3 // Change translations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11589 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-22 13:07:40 +00:00
mDeflotte 8da11c4662 // Translations for helper (2)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11586 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-22 12:42:43 +00:00
bMancone ab214d4c37 // translations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11584 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-22 11:35:39 +00:00
bMancone 3be610fdd2 // AdminproductsController: Quantity - added checks before updating depends_on_stock & advanced_stock_management
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11583 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-22 11:27:50 +00:00
bMancone 6a4eb7e768 // AdminWarehousesController: fixed association with carriers. Warehouse: fixed association with carriers. Carrier: norm & tags. AdminProductsController: added warning when using the advanced stock management without assocations with warehouses/carriers
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11582 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-22 11:09:33 +00:00
jBreux f1bda28edb [+] Project : Possibility to enable or disable tabs
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11581 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-22 11:02:55 +00:00
lLefevre 923af93fc3 // fix bug virtual product
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11578 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-22 10:30:25 +00:00
lLefevre fda1332b58 // Change product tab loading
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11569 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-22 10:09:21 +00:00
fSerny ec93df4efa [*] BO : Addons modules are now downloaded and installed at the same time (when you click on install button)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11567 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-22 09:40:29 +00:00
mDeflotte cc7584e340 // Problem with product return
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11566 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-22 09:39:44 +00:00
mMarinetti 0f827d6994 // reported fix from 1.4.x
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11556 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 20:36:17 +00:00
rGaillard 22915d5b12 // Revert AdminShop categories
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11544 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 19:35:07 +00:00
vKham c3dde0b518 // add stylesheet stats, commandes, new icon back to list
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11541 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 18:10:07 +00:00
fSerny b204c0f896 [*] BO : Native modules are now downloadable without login on addons
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11525 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 17:24:59 +00:00
rGaillard 739e51ce9a // Add specific_price management for backoffice order && fix installer
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11520 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 17:16:46 +00:00
lLefevre 9a37a8af4a // fix fatal error
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11517 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 17:03:01 +00:00
lLefevre fd22a6233e [-] FO : #PSTEST-104 : delete button add in AdminCartsController.php
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11514 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 16:48:41 +00:00
jBreux 6bafe02714 [+] Project : Added the ability for groups to show or hide prices for their members
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11513 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 16:42:17 +00:00
vChabot a089131884 // removing categories assocation with shop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11509 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 16:18:24 +00:00
vChabot e5d53567ae // removing categories shop association
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11504 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 16:05:42 +00:00
tDidierjean bbaa2154de // Fix SpecificPriceRule form and multishop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11502 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 15:40:41 +00:00
jBreux 272ce10298 [+] Project : Add Smarty console options
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11501 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 15:35:34 +00:00
bMancone c1d793c10f // Quantities are now correctly setted when using the AttributeGenerator
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11499 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 15:22:20 +00:00
tDidierjean 86b31d8ba7 // Change product tab loading
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11495 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 14:41:35 +00:00
bMancone 0d0f43f783 // Orders : fixed stock (available quantity & Stock)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11491 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 14:24:34 +00:00
vSchoener 8742c90560 // Update export to user Stock movement if the feature is activated and fix bug for the merge of the products order
// It Properly works :)



git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11490 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 14:21:45 +00:00
mDeflotte 847883c387 // BugFix : Missing params multilang
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11486 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 14:07:42 +00:00
lLefevre cf9017f05f [-] FO : #PSTEST-92 : added display of size fields in attachments.tpl
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11483 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 13:57:08 +00:00
lLefevre 2367807440 [-] FO : #PSTEST-74 : change the condition of product if is a virtual product
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11481 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 13:42:14 +00:00
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