Commit Graph

1900 Commits

Author SHA1 Message Date
vChabot f4debb57a1 [-] BO : BugFix : #PSCFV-1297 : Multistore: admin cannot delete special price of another shop anymore
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15045 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-03 14:07:34 +00:00
aFolletete bc219b1182 // clean code
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15044 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-03 13:50:34 +00:00
aFolletete 41184a7620 [-] BO : fixed bug #PSCFV-2180 - Not auto height with long name shop
// Clean HTML, JS, CSS code

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15043 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-03 13:48:58 +00:00
tDidierjean 6a9f1510d5 [-] BO : fixed #PSCFV-2176 - missing confirmation when deleting product
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15040 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-03 12:51:09 +00:00
tDidierjean e64b14b292 [-] BO : fix #PSCFV-2120 - no product listed in product return form
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15037 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-03 12:26:21 +00:00
mDeflotte e35c56241f // Fix little bug
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15031 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-03 09:04:51 +00:00
mDeflotte 2169016b87 // If an order contain only virtual products, don't set a carrier to the order
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15029 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-03 08:58:35 +00:00
mDeflotte 51d58ad3be // Revert a line removed by error
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15025 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-03 08:15:03 +00:00
rMalie f5f9ee023d // Rename treeview to treeview-categories
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15022 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-03 08:10:10 +00:00
mDeflotte 513c9be298 [-] FO : #PSCFV-2158 - Add warning message when a product cannot be delivered to an address
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15021 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-03 08:10:09 +00:00
vAugagneur 0c66c60f1d [-] FO : fixed bug #PSCFV-1368 - Password is restricted to 32 characters.
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15020 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-03 08:08:50 +00:00
lLefevre 455167a9d4 // Fix bug translations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15019 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-03 07:49:13 +00:00
fBrignoli 9e9154a843 [-] BO : CSV Import multishop combinations + products
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15018 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-03 07:42:52 +00:00
lLefevre 5c4abb03c2 // Fix sprintf translation for theme and modules
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15015 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-02 16:07:45 +00:00
vChabot 192738ae56 [-] BO : BugFix : #PSCFV-2133 : AdminTracking bug in multishop context (ambigus active field in SQL query)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14990 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-02 08:41:13 +00:00
vChabot 3db31ece5a [-] FO : BugFix #PSCFV-1450 The Alias "My Address" is already used, please chose another one.
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14983 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-30 15:06:07 +00:00
mDeflotte dc3a20251f [-] FO : Fixed bug #PSCFV-1251 & #PSCFV-1727
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14977 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-30 12:51:20 +00:00
vChabot faf9aae275 [-] BO : BugFix #PSCFV-1506 Fatal error when editing e-mail template in BO
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14961 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-27 14:47:05 +00:00
rMalie 5ed0a86ad6 // Fix product quantities in mono shop #PSCFV-2118
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14958 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-27 14:30:44 +00:00
rMalie 3a46ce1a35 [+] BO : Module controllers can now create custom rewrite in SEO page
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14950 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-27 13:36:31 +00:00
rGaillard 6e8d4f587e [-] BO: Fix localization pack url
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14947 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-27 12:48:18 +00:00
lLefevre 18c55f7644 [-] BO : Fix #PSCFV-2113 : replace Tools::file_exists_cache() by file_exists() && normalize
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14945 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-27 09:50:53 +00:00
rMalie f38483a4e0 // Norm
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14912 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-26 14:13:59 +00:00
mDeflotte 5b2e04fc7b // remove undefined function call
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14907 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-26 13:07:19 +00:00
vAugagneur e1ae7b9125 [-] BO : fixed bug #PSCFV-1726 - Meta Title Suppliers not save
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14904 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-26 09:57:05 +00:00
aFolletete 272eb3db22 [-] FO : fixed bug #PSCFI-5454 - Guest tracking should be SSL encrypted
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14901 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-26 09:45:38 +00:00
rMalie 833a5aec27 // Remove shop url from .htaccess after shop deletion #PSCFV-2034
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14899 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-26 09:37:09 +00:00
vAugagneur c8e381993b //fixed bug #PSCFV-642
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14898 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-26 09:35:50 +00:00
rMalie e01a890c01 // Use protected instead of private for classes we can override #PSCFV-1976
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14895 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-26 08:55:55 +00:00
mDeflotte 9b43f43f21 [-] BO : #PSCFV-1669 - Fix bug with customer add form, when an account already exists with the same email adddress
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14894 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-26 08:55:10 +00:00
vAugagneur c116695e74 //fixed bug #PSCFV-475
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14893 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-26 08:51:58 +00:00
mDeflotte 7f2c9fe45e [-] BO : #PSCFV-139 - Partial refund must not be available when order was not paid
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14892 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-26 08:19:41 +00:00
mDeflotte b1f1febc88 [-] BO : #PSCFV-139 - Partial refund must not be available when order was not paid
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14890 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-26 08:16:43 +00:00
vAugagneur 26482b4f4d //fixed bug #PSCFV-55
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14889 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-26 08:00:06 +00:00
rMalie 4cdb580608 // Add all missing duplicated data for shop duplication
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14873 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-25 13:24:09 +00:00
rMalie b0d9af537e // Fix duplication of product_attributes for multishop #PSTEST-1174
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14872 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-25 13:01:28 +00:00
mDeflotte 2659bd8929 [-] BO : #PSTEST-853 - Change field description
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14869 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-25 12:25:19 +00:00
rMalie 64b83ee40e // Add hooks for shop duplication, fix homeslider duplication #PSTEST-1173
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14864 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-25 09:04:38 +00:00
vChabot 4612b511ca [-] BO : BugFix #PSTEST-1137 Customers : Accounting export comment is now improved
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14862 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-25 08:37:14 +00:00
tDidierjean 2a97927eba // #PSTEST-1229 - make sure you cannot select virtual product if you have combinations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14857 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-24 16:45:00 +00:00
vChabot 79e53679b5 // product import improved (image problem because of file_exists PHP function)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14852 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-24 14:39:29 +00:00
lLefevre 336fd07a4e [-] BO : Fix #PSFV-549 : Now two customer with the same mail, isn't possible
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14845 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-24 13:42:43 +00:00
tDidierjean 8f4a8b1b5c // #PSTEST-1229 - remove virtual combinations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14844 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-24 13:23:02 +00:00
lLefevre 142bb01271 [-] BO : Fix #PSTEST-1220 : now position update for attribute value is good && fix JavaScript error in admin-dnd.js
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14843 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-24 12:59:17 +00:00
lLefevre 2fa47bf4b5 [-] BO : Fix #PSTEST-1217 : fatal error when all carrier are free
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14841 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-24 09:51:03 +00:00
rMalie d6f7da35ab // Fix list of adminProducts (was called twice, causing a bug on multishop product lang)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14837 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-24 09:15:19 +00:00
lLefevre f6cf5fdf88 [-] BO : Fix #PSTEST-1185
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14828 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-23 16:17:20 +00:00
tDidierjean efe2c50d4d [-] BO : fix #PSTEST-697 - remove cancel button in category list
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14823 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-23 15:06:32 +00:00
rMalie b9fe1bb36b // Add a multishop restriction on address in BO #PSTEST-1035
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14820 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-23 14:27:08 +00:00
lLefevre 6683903b1a [-] BO : Fix #PSFV-868 : Unity price can be set
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14815 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-23 13:41:36 +00:00