dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,308 Commits 9 Branches 19 Tags
e924469a707aa08591c0bb805d87b0959d1b0ae7
Commit Graph

140 Commits

Author SHA1 Message Date
lLefevre
e924469a70 // #PSCFV-5017 : update bad licenses in all files 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17884 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-10-17 06:18:59 +00:00
rGaillard
d132549d32 // Fix #PSCFV-4561 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17705 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-10-03 09:20:12 +00:00
lLefevre
976ffc3455 [-] BO : fix #PSCFV-4596 : added an option for to force the id during CSV import 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17684 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-10-02 12:08:41 +00:00
rGaillard
4f6de85447 // Fix #PSCFV-4569 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17662 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-10-01 16:16:54 +00:00
dMetzger
26b1d30ef6 [-] BO : fixed size management in objectmodel #PSCFV-4537 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17627 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-10-01 07:44:29 +00:00
vAugagneur
f7ac3955e1 [-] FO : fixed bug #PSCFV-4137 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17449 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-09-21 08:36:31 +00:00
aKorczak
2ffab71fc2 [-] WS : Fix 1.5 compatibility 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17140 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-08-31 16:04:18 +00:00
aKorczak
693096d497 [-] WS : Multiple fix on Web Services 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17124 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-08-31 09:41:22 +00:00
lLefevre
292266ed40 [*] BO : #PSCFV-3831 : check each field which are required in databases 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17107 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-08-30 16:06:09 +00:00
rGaillard
3054f8ead1 // Fix on product association deletion 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17083 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-08-29 16:42:45 +00:00
dMetzger
6cdc8aa6da [*] BO : Changed the default list view for products and categories when multistore is activated 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16972 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-08-23 14:36:52 +00:00
dMetzger
224c24a2fd // Fixed warning on WS #PSCFV-3689 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16915 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-08-20 16:27:17 +00:00
dMetzger
2e78d28ec6 [-] BO : status image was not saved #PSCFV-3654 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16882 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-08-17 12:42:29 +00:00
dMetzger
ae9f0b46c7 [-] FO : ObjectModel/Db tried to add entities with a primary key pre-filled #PSCFV-3652 #PSCFV-3651 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16879 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-08-17 09:35:05 +00:00
dMetzger
00045a755b // Fixed strict standard warning #PSCFV-3582 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16793 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-08-10 12:29:03 +00:00
dMetzger
83d14fae1d [-] BO : null values ignored in objectmodel::update #PSCFV-3591 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16790 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-08-10 09:56:48 +00:00
rGaillard
608ab040b8 // Another fix for multishop and webservices 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16781 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-08-09 15:27:10 +00:00
rGaillard
39c2a58307 [-] WS: Fix webservices on some entities with multishop #PSCFV-3460 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16780 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-08-09 15:15:59 +00:00
dMetzger
8479ef58ee [-] Installer : fixed errors at the installation with insertion of null values in the database #PSCFV-3544 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16758 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-08-08 09:23:31 +00:00
vAugagneur
04be7149e5 [-] BO : fixed bug #PSCFV-3439 part2 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16714 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-08-06 10:14:41 +00:00
vAugagneur
0cca874c81 [-] BO : fixed bug #PSCFV-3439 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16702 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-08-06 08:13:40 +00:00
dMetzger
e930b5d08f // Perfs improved 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16629 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-07-31 16:32:44 +00:00
vAugagneur
9e54583319 [-] BO : fixed bug #PSCFV-3336 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16573 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-07-25 15:44:09 +00:00
vAugagneur
7eec6c7294 //fixed multishop CRUD bug 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16555 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-07-24 16:45:52 +00:00
dMetzger
744a221075 // Changed the way the multistore associations are loaded, far from perfect, but still better and overridable 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16295 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-07-10 07:11:16 +00:00
dMetzger
649cb9af43 // Changed the name of a multishop variable to multishop_specific, in order to avoid confusion 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16293 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-07-09 15:48:22 +00:00
rGaillard
b2b29c4270 // Performance optimizations 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16024 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-06-14 14:11:11 +00:00
dMetzger
654b7069c5 // Translations 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15600 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-22 09:20:26 +00:00
rMalie
cb4527a95b // Fix multishop in objectModel (langs were not correctly generated when an employee has not all auths on shops) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15582 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-21 19:12:35 +00:00
rMalie
a75cf1475d // Fix multishop management in ObjectModel 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15530 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-21 15:29:28 +00:00
rGaillard
ac08ba378b // Product is now correctly inserted in product_shop for existant products 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15484 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-21 09:46:53 +00:00
rMalie
f2e68e1253 // Multishop entities are not created anymore in ObjectModel->update(), they are only updated 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15446 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-19 13:39:39 +00:00
rMalie
a37dbc1e44 // Fix lot of multishop bugs (updateAssoShop reworked, remove multishop property for country / zone / currency / carrier, getList()) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15386 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-18 14:54:37 +00:00
vChabot
bb1fa8fd52 [-] BO : BugFix : #PSCFV-2373 : Problem on country creation 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15336 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-16 13:17:07 +00:00
tDidierjean
86bf178c51 // objectmodel fix 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15286 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-14 15:21:52 +00:00
fBrignoli
820ebe40ad // fix 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15276 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-14 14:15:08 +00:00
fBrignoli
0bcc55a096 [-] BO : Bug fixed #PSCFV-1975 - Combination import + multishop 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15268 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-14 12:55:07 +00:00
lLefevre
897c6acb82 [-] FO : #PSCFV-2151 : Translations of errors are connected width sprintf() 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15265 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-14 11:45:41 +00:00
vAugagneur
392c0f51d3 [-] BO : fixed bug #PSCFV-2285 - Unable to activate/deactivate a product from list 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15248 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-14 08:10:19 +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
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
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
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
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
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
rMalie
d7f60335e4 // Clean copy_from_front data 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13675 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-28 12:45:36 +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
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
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