 lLefevre
|
13c2b91ff6
|
// Now translation in validateRules() method uses sprintf
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14832 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-04-24 08:28:10 +00:00 |
|
|
rMalie
|
80f238df73
|
// Fix helper translations for shops #PSTEST-1121
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14822 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-04-23 14:59:42 +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 |
|
|
vChabot
|
ba8049264f
|
[-] BO : BugFix : #PSTEST-1190 : email customer verification improved
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14817 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-04-23 13:45:23 +00:00 |
|
|
rMalie
|
fb45b9d71e
|
// Add a redirection in Tools::switchLanguage() to prevent problems with friendly url #PSFV-705
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14816 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-04-23 13:44:47 +00:00 |
|
|
rMalie
|
e50fa1ae2a
|
// Fix // Fix left join on product_attribute_shop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14813 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-04-23 13:29:24 +00:00 |
|
|
rMalie
|
278ec73d66
|
// Fix BO connection bug with employees auth
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14807 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-04-23 12:07:26 +00:00 |
|
|
rMalie
|
60a140c91f
|
// Fix bug on auths for sub employees #PSFV-849
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14804 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-04-23 09:38:24 +00:00 |
|
|
lLefevre
|
b5d6b66f24
|
// Refacto AdminTranslationsController : now you can translated your files by themes
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14799 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-04-23 08:11:54 +00:00 |
|
|
fBrignoli
|
d22fde6176
|
[*] Project : Jquery 1.7.2
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14792 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-04-20 15:45:43 +00:00 |
|
|
vChabot
|
5f8c6bdec4
|
// product categories now handle the multiple category trees
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14789 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-04-20 15:13:08 +00:00 |
|
|
mDeflotte
|
d4274b6054
|
[-] FO : #PSFV-803 - Fix bugs with customization and cart summary
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14788 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-04-20 14:55:21 +00:00 |
|
|
rMalie
|
33d8a79b0b
|
// Combination multishop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14786 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-04-20 10:01:05 +00:00 |
|
|
mDeflotte
|
3eeb6640fa
|
// Order::getHistory() Fix cache problem
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14783 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-04-20 08:47:29 +00:00 |
|
|
bMancone
|
66acfbe74c
|
// Fixed WebserviceRequest - Compatibility with PS 1.5.x Shops & GroupShops
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14779 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-04-19 16:43:00 +00:00 |
|
|
bMancone
|
58fb6c703a
|
// Fixed WebserviceRequest::saveEntityFromXml() - Compatibility with PS 1.5.x
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14778 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-04-19 16:23:19 +00:00 |
|
|
tDidierjean
|
8bb5cd701f
|
// Fix errors on product combinations edition page
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14776 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-04-19 15:41:52 +00:00 |
|
|
rMalie
|
c6ac41fd05
|
// Fix combination edition
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14773 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-04-19 14:50:14 +00:00 |
|
|
aNiassy
|
e48476bee2
|
[-] FO : #PSCFI-5343 : Fixed a problem of E-mail subject encoding
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14771 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-04-19 13:43:54 +00:00 |
|
|
tDidierjean
|
a32a003b5c
|
[-] Classes : fix bug #PSTEST-1191 - wrong carrier positions
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14768 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-04-19 13:35:37 +00:00 |
|
|
mDeflotte
|
59c24a14cb
|
[-] Project : #PSFV-816 - Allow to attach multiple files to an email with the function Mail::send
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14765 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-04-19 13:00:41 +00:00 |
|
|
tDidierjean
|
c0a6bfaf9c
|
[-] BO : fix #PSTEST-1176 - Modules positions drag and drop - ajax process is broken, page JS too
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14764 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-04-19 12:20:47 +00:00 |
|
|
mDeflotte
|
1cb4c8a6bb
|
[-] FO : #PSFV-815 - Moving an SQL request on the controller to the model
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14762 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-04-19 09:55:13 +00:00 |
|
|
rMalie
|
264885203d
|
// Remove Shop::getTotalShopWhoExists (rofl ...)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14761 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-04-19 09:42:26 +00:00 |
|
|
mDeflotte
|
19961a5438
|
[-] Project : #PSFV-820 - Cartrules are now reapplied each time we add/remove a product on/from the cart
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14760 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-04-19 09:39:14 +00:00 |
|
|
tDidierjean
|
dac784f83e
|
[-] BO : fix #PSTEST-1175 - duplicate text in toolbar in AdminAttributesGroups
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14755 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-04-19 08:40:13 +00:00 |
|
|
tDidierjean
|
ce95918ff0
|
[-] BO : fix #PSTEST-1184 - bug with product combinations generator
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14753 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-04-19 08:22:30 +00:00 |
|
|
bMancone
|
a0a103e961
|
// WS: Fixed shopExists() for 1.5.x compatibility
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14747 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-04-18 17:45:04 +00:00 |
|
|
bMancone
|
f912ae8496
|
// Fixed writePostedImageOnDisk()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14744 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-04-18 16:14:55 +00:00 |
|
|
tDidierjean
|
41d8630e97
|
[*] BO : #PSFV-865 - it is now possible to use drag and drop positions in custom controllers using HelperList
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14740 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-04-18 15:48:38 +00:00 |
|
|
lLefevre
|
b33b8642b6
|
// Fix error path image tab
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14736 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-04-18 15:11:32 +00:00 |
|
|
rMalie
|
bb17c175d6
|
// Optimize Hook::exec()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14730 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-04-18 13:15:39 +00:00 |
|
|
rMalie
|
ba4c5dbb18
|
// Some optimization #PI-121
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14723 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-04-18 09:57:19 +00:00 |
|
|
lLefevre
|
2ae5cf56ab
|
// Fix small bug
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14722 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-04-18 09:50:48 +00:00 |
|
|
lLefevre
|
5b912196b0
|
// Fix file_exists errors on the retrocompatibility image tab
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14716 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-04-18 09:26:31 +00:00 |
|
|
rMalie
|
eeeb925420
|
// Shop::$asso_table is now public (for modules) #PSFV-551
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14712 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-04-18 08:38:30 +00:00 |
|
|
rMalie
|
94a7037013
|
// Add DESC keyword to executeS() filter #PSFV-791
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14706 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-04-18 07:52:40 +00:00 |
|
|
rMalie
|
360407f52b
|
// Fix Product::priceCalculation() for multishop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14705 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-04-18 07:47:02 +00:00 |
|
|
rMalie
|
04a7580a98
|
// Fix join between product_attribute and product_attribute_shop on getproducts methods
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14700 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-04-17 16:10:51 +00:00 |
|
|
jBreux
|
72eb7b253e
|
// Fix page link (for W3C)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14698 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-04-17 16:05:52 +00:00 |
|
|
tDidierjean
|
03afca360c
|
[-] BO : fix #PSTEST-1170 - broken suppliers edition in product page
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14696 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-04-17 16:00:31 +00:00 |
|
|
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
|
14c20002e4
|
// Fix ObjectModel::updateMultishopTable() for Combination
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14691 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-04-17 15:45:47 +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 |
|
|
tDidierjean
|
a71704fb4e
|
[-] BO : fix #PSTEST-1169 broken processing of list filters
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14688 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-04-17 15:08:36 +00:00 |
|
|
rMalie
|
dacf032092
|
// Fix ObjectModel with multishop flag to false
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14685 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-04-17 14:56:53 +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 |
|
|
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
|
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 |
|
|
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 |
|