Commit Graph

1635 Commits

Author SHA1 Message Date
bMancone 7d533b3189 // Fixed exceptions when saving products
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14693 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-17 15:56:04 +00:00
rMalie e7b7ab9371 // Fix ObjectModel::updateMultishopTable() for Combination
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14690 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-17 15:29:07 +00:00
rMalie 0ed295a94a // Fix id_tax_rules_group assignation on product edtion
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14684 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-17 14:05:29 +00:00
fBrignoli 03b504e06e [-] BO : Bug Fixed #PSFV-339 - Multishop logo
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14683 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-17 13:34:59 +00:00
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
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
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
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 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
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
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
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
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 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
dMetzger 6fddbf55d1 [-] BO : addons display fixed #PSTEST-1110
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14605 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-12 12:54:12 +00:00
vAugagneur 9ca9b3b6d0 [-] BO : fixed bug #PSTEST-1144 - carrier image problem
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14599 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-12 09:47:20 +00:00
tDidierjean 244a2f9102 [*] BO : #PI-123 - toolbar and page title refactoring
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14594 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-12 08:34:38 +00:00
lLefevre 26e1fb7158 [*] BO : fix #PSTEST-1140
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14572 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-11 13:40:47 +00:00
lLefevre 566549d9f7 [*] BO : #PSTEST-1141 : fix bugs in AdminImportController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14568 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-11 11:58:27 +00:00
fBrignoli 6925f7d838 // missing files
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14565 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-11 08:30:02 +00:00
fBrignoli b034d8f1f2 [*] FO : Layout & Template override
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14564 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-11 08:24:59 +00:00
lLefevre 13f16490a7 [*] BO : #PSFV-696 : add attachment when we duplicate a product
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14560 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-10 16:23:37 +00:00
tDidierjean b19b44f376 // Helpers : remove param 'float'
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14553 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-10 13:07:19 +00:00
lLefevre 1b2cce57a3 [-] BO : #PSFV-827 : Fix translations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14551 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-10 09:52:54 +00:00
tDidierjean f5b4f351fa // PI-116 - attribute default refactoring
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14525 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-06 11:59:29 +00:00
lLefevre ef424cadc4 [-] BO : fixed #PSFV-722
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14518 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-06 09:14:22 +00:00
lLefevre 08e7f7abb1 [-] BO : fixed #PSFV-802 : now mail subject are saved
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14513 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-06 07:38:33 +00:00
lLefevre 472607e14e [*] BO : fixed #PSTEST-1100
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14503 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-05 15:40:20 +00:00
lLefevre 89be86ba77 [-] BO : fixed #PSTEST-1134
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14498 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-05 14:58:01 +00:00
bMancone bcf1c9ace8 // Bad default ident options: normalize revision 14492
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14495 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-05 13:58:58 +00:00
lLefevre 9f4dd1a3ea [-] BO : fixed #PSFV-727 (issue #9 to #13)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14493 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-05 13:51:40 +00:00
bMancone 7d8332b146 // Display memcached server status : #PSFV-631
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14492 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-05 13:44:18 +00:00
lLefevre 33ac5b0b33 [-] BO : fixed #PSFV-727 (issue #4)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14481 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-05 10:06:17 +00:00
tDidierjean ec94cb35b9 // refactor parameters
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14454 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-04 13:08:25 +00:00
tDidierjean e1a98ac876 [-] BO : fix #PSTEST-1128 - when saving a pack, a validation error causes pack data loss
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14451 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-04 12:38:42 +00:00
tDidierjean 8b46657cae // More BO product page cleanup
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14436 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-03 16:54:00 +00:00
mDeflotte 69cc3a8563 [-] Project : #PSFV-781 - Profile and access cannot be managed by SHOP
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14432 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-03 15:14:09 +00:00
tDidierjean 5b3159a408 [*] BO : #PI-107 refactoring product page JS - adding ProductTabsManager
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14421 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-03 09:34:56 +00:00
vChabot f183239ad5 // removing bqSQL from a SQL request
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14412 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-02 14:59:15 +00:00