Commit Graph

115 Commits

Author SHA1 Message Date
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
rMalie
3c79768737 [*] Classes : table prefix is no longer required in Db::getInstance()->delete() method
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13396 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-16 14:54:52 +00:00
aKorczak
de544a8be4 [-] WS : Fix xlink
[*] WS : Add entity tax_rule_groups
[*] WS : Fix ObjectModel issue
[*] WS : Delete sqlId not used
[*] WS : Fix entity configurations
[*] WS : Fix entity translated_configurations


git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13138 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-08 15:42:53 +00:00
rMalie
0d20a7a1db // Fix langMultiShop in ObjectModel
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13132 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-08 14:33:52 +00:00
rMalie
f60b412373 // Improve definition in WS
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13126 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-08 14:04:20 +00:00
aKorczak
b973003e04 [*] WS : Fix, Webservice use definitions property instead of fieldsValidate, fieldsRequired, etc..
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13094 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-07 17:29:04 +00:00
aKorczak
749b2d2f57 [*] WS : Fix, Webservice use definitions property instead of fieldsValidate, fieldsRequired, etc..
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13091 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-07 17:26:39 +00:00
bMancone
78087fee18 // Fixed #PSTEST-598 #PSTEST-599
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12791 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-30 12:24:25 +00:00
mDeflotte
1d7aa16dc4 // Fix bug with object model validation
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12666 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-25 09:11:30 +00:00
rMalie
d920df5f2a // Normalize
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12652 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-24 16:24:01 +00:00
rMalie
b63e0b46c9 // Fix ObjectModel add / update on lang fields when id_lang is set
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12630 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-24 09:05:00 +00:00
rMalie
a4d97911b1 [*] Classes : Db::autoExecute() call are now replaced by Db::insert() or Db::update()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12624 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-23 17:41:02 +00:00
fSerny
0d7b9d119b [-] PROJECT : Adding general hook on ObjectModel and AdminController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12590 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-23 09:04:44 +00:00
rMalie
ef79a74fd6 // Add support of list of values in objects definition and set default value for product->condition
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12570 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-19 17:25:22 +00:00
rMalie
494205d52e // Fix PrestaShopException typo
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12128 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-04 13:53:19 +00:00
rMalie
c6f10b628c // Use property_exists instead of array_key_exists in ObjectModel
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12056 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-03 12:57:16 +00:00
tDidierjean
0d1c6fc8fd // getProductLink fix and optimization
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12028 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-03 09:22:42 +00:00
rGaillard
99eccea21f // little fix validateController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11969 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-02 10:11:18 +00:00
rGaillard
f64d1dfd1a // Small changes on validateController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11967 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-02 10:09:36 +00:00
rMalie
a337f004c1 // Fix null values ...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11726 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-22 23:20:30 +00:00
rMalie
e59f33705a // Fix profiles creation
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11649 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-22 17:40:27 +00:00
mDeflotte
847883c387 // BugFix : Missing params multilang
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11486 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 14:07:42 +00:00
rGaillard
71d878a99c git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11472 b9a71923-0436-4b27-9f14-aed3839534dd 2011-12-21 11:42:30 +00:00
aKorczak
3527399c24 [-] WS: Norm fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11413 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-20 14:38:18 +00:00
rMalie
33b340dcaa // Fix duplication of images
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11395 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-20 09:40:59 +00:00
rMalie
1d2f9e44c4 // Improve collections : where() method reworked (prototype changed) + validation of fields
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11383 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-19 16:57:28 +00:00