Commit Graph

4876 Commits

Author SHA1 Message Date
rMalie 0c2dd0cd2f // MERGE product_multistore branch : product fields are now editable per shop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14682 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-17 13:32:12 +00:00
mDeflotte d4d1c35cb9 [-] BO : #PSCFI-5378 - Create voucher from the BO after a product return
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14681 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-17 13:19:13 +00:00
jBreux d126db086f // Fix page link (for W3C)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14680 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-17 12:54:02 +00:00
bMancone ffebd91170 // Normalize AdminWarehousesController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14679 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-17 12:24:43 +00:00
bMancone d3b0c7fec1 // Fixed warehouses/carriers associations - #PI-134
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14678 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-17 12:21:22 +00:00
lLefevre 7e3e03b869 [-] BO : fix #PSFV-870 : translations modules
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14677 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-17 09:51:55 +00:00
bMancone caf154c77d // Fixed #PSTEST-1146
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14676 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-17 09:49:55 +00:00
bMancone d9e01b3375 // WS : Warehouses - #PI-127
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14673 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-17 09:21:04 +00:00
mDeflotte d0809600a0 [-] BO : #PSFV-434 - Bad product total calculation (confusion with wt)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14672 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-17 09:08:54 +00:00
tDidierjean 08921ed277 [-] BO : fix display bug when virtual file upload fails
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14671 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-17 08:53:45 +00:00
rMalie 099c6a7080 // Fix id_shop in URL for BO
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14670 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-17 08:26:31 +00:00
dMetzger 04797eb90b [-] BO : fixed double in the product list of the cart rules when multi-shop is activated #PSTEST-1154
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14669 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-17 08:09:16 +00:00
tDidierjean ca71733f00 [*] BO : #PSTEST-1157 - Ajax deletion of virtual file
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14668 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-17 08:07:35 +00:00
rGaillard 1e1970e13c // Fix default carrier selection on backoffice order
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14660 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-16 14:03:07 +00:00
bMancone 285becae29 // Fixed stock_available when ordering products
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14656 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-16 13:39:15 +00:00
lLefevre 5c6e33b72a [*] BO : #PSFV-832 : change the type of the property "ajax"
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14655 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-16 13:24:28 +00:00
lLefevre 4e61be6b9e [-] BO : fix #PSFV-866 : Add the missing hook for update a product
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14654 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-16 12:57:38 +00:00
lLefevre 7a48decd82 [-] BO : fix #PSFV-826
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14653 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-16 12:26:53 +00:00
tDidierjean b48a19a62e [-] BO : fix bug #PSFV-860 - Can't edit combinations with an existing product
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14652 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-16 11:57:51 +00:00
rGaillard 3c2f9de5ba // small fixes
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14651 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-16 09:47:34 +00:00
rMalie 41f137e82b // Fix id_shop in URL
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14650 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-16 09:45:19 +00:00
lLefevre 33be3bd623 [-] BO : fix #PSFV-856 (translation)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14649 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-16 09:44:25 +00:00
lLefevre 04680dd807 [-] BO : fix #PSFV-857
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14648 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-16 09:37:25 +00:00
mDeflotte b9018cf28d [-] BO : #PSFV-776 - Fix Bug with order editing on the back office
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14647 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-16 09:34:31 +00:00
rMalie 3971ab65fa // Fix id_shop in URL
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14644 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-16 09:07:24 +00:00
bMancone ea4e871897 // Fixed AdminProductsController : could not save product
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14643 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-16 08:30:09 +00:00
rGaillard aed2458a70 [-] BO: Fix specific prices on BackOffice order
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14642 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-13 17:20:17 +00:00
tDidierjean 2db490b3c2 [-] BO : fix bug #PSFV-839 - Reset products features while editing products
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14640 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-13 16:03:05 +00:00
lLefevre 235fb68255 // Update AdminTranslationsController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14639 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-13 15:29:19 +00:00
fBrignoli 2144c1e12b [-] Installer : Bug Fixed #PSFV-819 - order_tax shouldn't exist
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14638 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-13 15:27:08 +00:00
mDeflotte 2befe3cd42 [-] BO : #PSFV-775 - Fix bug with for ajax reload
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14637 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-13 15:26:43 +00:00
mMarinetti bb13bf8db2 [-] Installer : Fixed #PSCFI-5182
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14636 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-13 15:17:43 +00:00
mDeflotte 39f403ac17 [-] BO : #PSCFI-PSCFI-5323 - Refound displayed instead of Return on the order lines if the order is shipped
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14635 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-13 14:26:11 +00:00
mDeflotte 813415a344 // Add missing parameter
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14634 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-13 14:25:00 +00:00
lLefevre 2b807940ae [-] BO : #PSFV-855 : Fix bug in BlockCMS AND set submit_action to NULL
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14633 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-13 14:15:45 +00:00
mDeflotte 58ef5e6e9b [-] FO : #PSCFI-5322 - Order::hasBeenDelivered and Order::hasBeenPaid don't work for all order states
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14629 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-13 13:40:29 +00:00
aFolletete d7777f270e [-] BO : fixed bug #PSFV-504 - Even if the invoices management is disabled, you can create an invoice
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14627 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-13 10:01:21 +00:00
mDeflotte 886ab283de [-] FO : #PSFV-815 - Fix bug on the cart with carrier on updating the country of the address
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14624 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-13 08:22:27 +00:00
tDidierjean d5ed4fae2b // translations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14622 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-13 08:19:58 +00:00
lLefevre a11f0a7828 [-] BO : fix #PSCFI-5408
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14620 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-13 08:02:06 +00:00
mDeflotte 0b5dc7128d [-] BO : #PSFV-775 - Fix bug with ajax form reload
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14615 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-12 16:03:45 +00:00
tDidierjean 0d4ab7b7f2 // translate is not lazy
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14614 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-12 15:34:40 +00:00
tDidierjean c3c6505bd0 [*] BO : #PI-124 - update lazy registering
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14613 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-12 15:04:47 +00:00
rGaillard b1f2433205 [*] BO: It is now possible to apply a specific price of 0 euros
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14612 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-12 14:51:23 +00:00
lLefevre e6ab36e942 [-] BO : fix #PSFV-852 : url encoded incorrect when in the search there is specials character
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14611 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-12 14:00:53 +00:00
tDidierjean 728781929e [*] BO : #PI-124 - lazy registering of smarty functions
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14610 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-12 13:54:43 +00:00
mDeflotte e4fc557cb0 [-] BO : #PSFV-797 - Fix bug with order invoice pdf and customized products
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14609 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-12 13:35:01 +00:00
mDeflotte 9b4aad56a9 [-] BO : #PSFV-797 - Fix bug with order invoice pdf and customized products
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14608 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-12 13:22:47 +00:00
mDeflotte 99beaf6ed0 [-] FO : #PSFV-797 - Fix bug with order detail and customized products
[-] BO : #PSFV-797 - Fix bug with order editing  and customized products

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14607 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-12 13:02:18 +00:00
dMetzger 713b9323c6 [-] BO : array_unique added in the cart rules in order to prevent sql error #PSTEST-1094
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14606 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-12 13:00:11 +00:00