 bMancone
|
885cf422d0
|
// Fixed merge..
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13678 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-28 13:20:24 +00:00 |
|
|
bMancone
|
5d06b01a59
|
// Fixed revision 13573
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13677 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-28 13:13:47 +00:00 |
|
|
vAugagneur
|
bad7d8c586
|
[-] BO : fixed bug in contact message with html
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13673 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-28 11:05:21 +00:00 |
|
|
tDidierjean
|
bb5c2a2922
|
[-] BO : fix image option form not saving
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13670 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-28 09:55:57 +00:00 |
|
|
rMalie
|
dacdb760b1
|
// Add default group in group list on shop page
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13663 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-28 09:41:16 +00:00 |
|
|
vChabot
|
5592c360d9
|
[-] BO : BugFix : #PSFV-561 & #PSFV-574 : Category import is now working fine
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13661 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-28 09:30:46 +00:00 |
|
|
rMalie
|
370be05d49
|
// Add some missing french translations in BO
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13658 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-28 09:18:53 +00:00 |
|
|
vChabot
|
b012c79557
|
[-] BO : BugFix : #PSFV-556 : Category problem - new category not properly assigned to root
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13655 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-28 08:56:56 +00:00 |
|
|
rMalie
|
3c85a7784b
|
// Fix hard coded ID in AdminAccess controller
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13650 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-28 08:49:33 +00:00 |
|
|
rMalie
|
e5b646b0f8
|
// Fix multishop context in BO
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13648 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-27 17:14:33 +00:00 |
|
|
rMalie
|
ac890a4fb1
|
// Fix auth issues for multishop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13647 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-27 17:03:58 +00:00 |
|
|
bMancone
|
8286aa0483
|
// Fixed Supply Orders: prices are now correctly updated
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13644 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-27 16:49:08 +00:00 |
|
|
bMancone
|
17aca59d9f
|
// Improved Supply Orders threshold when creating a template
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13641 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-27 16:16:23 +00:00 |
|
|
bMancone
|
9a205b3665
|
// Improved Supply Orders threshold when creating a template
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13640 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-27 16:15:50 +00:00 |
|
|
bMancone
|
8b35f64f95
|
// Fixed #PSTEST-886
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13639 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-27 16:14:14 +00:00 |
|
|
dMetzger
|
f6b91055d5
|
[+] BO : added a new option for the products : do they appear in the catalog, in the search, both or neither
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13638 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-27 15:55:40 +00:00 |
|
|
bMancone
|
9b254fcafa
|
// Fixed #PSFV-584
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13636 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-27 15:45:44 +00:00 |
|
|
vChabot
|
78334a05a6
|
// id_category_default fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13634 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-27 15:42:48 +00:00 |
|
|
mDeflotte
|
1882cbcf14
|
// Fix bug with supplier ordered
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13633 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-27 15:41:01 +00:00 |
|
|
mDeflotte
|
71a96c09ed
|
// Fix bug with a bad smarty var assignation
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13632 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-27 15:40:38 +00:00 |
|
|
bMancone
|
6a6c4e2e72
|
// Fixed #PSFV-558
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13631 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-27 15:40:06 +00:00 |
|
|
rGaillard
|
4a9e286ec9
|
// Fix bug which allow to create multi specific price with same parameters
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13627 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-27 15:32:57 +00:00 |
|
|
rMalie
|
e422445e65
|
// Display of payment modules per shop #PSTEST-833
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13625 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-27 15:18:51 +00:00 |
|
|
vChabot
|
02d98b237e
|
// id_category_default is now for multishop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13624 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-27 13:53:52 +00:00 |
|
|
rMalie
|
4ee2698992
|
// Replace shop->addSqlAssociation() by static call
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13620 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-27 13:07:51 +00:00 |
|
|
rMalie
|
c2cef61a5a
|
// Replace shop->addSqlRestriction() and shop->addSqlRestrictionOnLang() by static versions
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13618 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-27 12:15:30 +00:00 |
|
|
bMancone
|
2caf013a0f
|
// Share quantities : Hint is now displayed as a description
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13617 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-27 10:11:59 +00:00 |
|
|
rMalie
|
94bbe98433
|
// Fix currencies with multishop #PSTEST-809
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13616 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-27 09:49:43 +00:00 |
|
|
rMalie
|
1c2f174bdb
|
// Improve multishop_context in AdminController and rename shop->getListOfID() by Shop::getContextListShopID()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13615 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-27 09:49:19 +00:00 |
|
|
bMancone
|
275ec90ef0
|
// Fixed #PSTEST-870
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13614 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-27 09:41:08 +00:00 |
|
|
rMalie
|
c9ba6a7214
|
// Commit of file e-e-e-examinator
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13608 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-24 14:56:54 +00:00 |
|
|
lLefevre
|
963df21883
|
// Translation all modules in mode DEV
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13602 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-24 13:08:51 +00:00 |
|
|
rMalie
|
129f8e7be0
|
// Fix multishop_context
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13599 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-24 10:38:24 +00:00 |
|
|
rMalie
|
0cf47063bd
|
// Fix duplication of group shop data #PSTEST-850
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13598 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-24 10:28:14 +00:00 |
|
|
rGaillard
|
81ae741f9e
|
// Add tax rules by shop in product import
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13594 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-24 09:59:27 +00:00 |
|
|
mDeflotte
|
7e5c73c277
|
[-] FO : #PSFV-569 - Fix bug with instant search
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13593 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-24 09:52:37 +00:00 |
|
|
lLefevre
|
12bc5a990c
|
[-] BO : #PSCFI-4873 : Updated of method for translated modules. Now, you can translate only installed modules
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13592 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-24 09:47:58 +00:00 |
|
|
rGaillard
|
2408b4ac5f
|
[+] Core : products and carriers tax rules are associated to shop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13586 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-24 09:26:18 +00:00 |
|
|
rMalie
|
6d87094802
|
// Fix shop association with groups in BO #PSTEST-820
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13585 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-24 09:14:28 +00:00 |
|
|
fBrignoli
|
47be39894f
|
[-] BO : Bug Fixed #PSTEST-822 - You can now set datetime to configure specific price boundaries
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13584 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-24 09:13:03 +00:00 |
|
|
rMalie
|
33edf44ec0
|
// Improve shop associations in BO
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13583 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-24 09:11:18 +00:00 |
|
|
rMalie
|
69e2cf95d6
|
// Restore shop context in shop list and can filter shop pages per group shop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13579 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-24 08:58:21 +00:00 |
|
|
rMalie
|
7b62fef1ee
|
// Fix shop context call
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13578 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-24 08:51:52 +00:00 |
|
|
dMetzger
|
319309528a
|
[-] FO : automatic refresh of the cart when a cart rule is added
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13577 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-23 18:24:23 +00:00 |
|
|
mDeflotte
|
1c7d9a9f26
|
// Change customizable properties form label name
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13576 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-23 17:07:35 +00:00 |
|
|
tDidierjean
|
48a4db2acf
|
[-] BO : fix bug #PSTEST-855 - some translations are not parsed
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13574 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-23 17:03:48 +00:00 |
|
|
rMalie
|
2454cd7863
|
// Welcome 2012²
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13573 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-23 16:33:10 +00:00 |
|
|
mMarinetti
|
642f37f873
|
// #PSCFI-4808 warning message when input_max_vars is too low in AdminTranslationsControllers + optimizations
// now translation files array are ordered by key
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13571 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-23 16:21:12 +00:00 |
|
|
rMalie
|
53e7fe3230
|
// Improve multishop API
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13568 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-23 15:54:10 +00:00 |
|
|
rMalie
|
b24dcffc9c
|
// Improve multishop API
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13566 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-23 15:39:44 +00:00 |
|