Commit Graph

53 Commits

Author SHA1 Message Date
lLefevre
47402f886a // Fix bug when install fixtures
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15979 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-12 09:30:49 +00:00
mMarinetti
42595bf71c // compatibility fix, #PSCFV-2793
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15975 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-12 07:41:20 +00:00
vChabot
1c03997f30 [-] BO : BugFix : #PSCFV-2639 : The search autocomplete does not work in multi store mod
// norm

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15865 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-06 08:32:59 +00:00
vChabot
ff28a5fdd6 // fix about #PSCFV-2221 : standardize corrections
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15202 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-11 08:11:08 +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
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
tDidierjean
0a1be37069 // copy of bugfix #PSCFI-4956 from 1.4 (search alias)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14484 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-05 12:33:28 +00:00
rMalie
48e9590cf4 // Normalize
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13991 b9a71923-0436-4b27-9f14-aed3839534dd
2012-03-09 09:19:30 +00:00
rGaillard
f9ce0f8fc3 // Fix tax rules group with search
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13672 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-28 10:33:16 +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
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
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
vChabot
b36be68154 // order_by improved
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12868 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-31 15:33:10 +00:00
vChabot
74a1896e9f // little fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12528 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-18 12:32:56 +00:00
vChabot
87fd511314 [*] BO : Adding category management with multishop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12270 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-09 15:13:46 +00:00
tDidierjean
0abdd4269e // fix useless call to array_unique
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12148 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-04 15:53:31 +00:00
rMalie
b3f683ea38 // Fix bug in search
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11550 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 20:21:58 +00:00
vChabot
a089131884 // removing categories assocation with shop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11509 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 16:18:24 +00:00
vChabot
6ef2e2cc50 [*] BO : New category management with multi shop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11437 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-20 17:36:08 +00:00
fGaillard
91cb67a25d [-] BO : BugFix : Search index re-build
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11160 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-13 09:09:54 +00:00
rMalie
5b36a76462 // Revert search
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11077 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-09 14:10:37 +00:00
lLefevre
dc9fb17b01 // Fix bugs in AdminProductsController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11075 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-09 13:37:08 +00:00
rMalie
f55a9e04b9 [*] Classes: Db->execute() now return always a boolean. Use Db->query() instead.
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10999 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 15:41:34 +00:00
dSevere
468ca00519 // Stock Available : Improve BackOffice interfaces with groups of shops management + bugs fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10886 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-02 17:31:16 +00:00
dSevere
8b618652bb // Stock Available : Improve BackOffice interface + Update all SQL requests relative to StockAvailable + code refactoring on Product Class
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10843 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-01 19:09:27 +00:00
rMalie
4e567f3d31 // Report fix of PSCFI-4282 from 1.4 to 1.5
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10833 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-01 14:45:33 +00:00
rMalie
69feff1ee1 // Fix stock for multishop on search
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10568 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 17:07:46 +00:00
mMarinetti
ab1594fb7e [-] BO : fixed bug with Search:indexation when editing product (id_shop was missing)
// end of line style fix


git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9441 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-19 09:29:00 +00:00
rMalie
a7bc16dadd // Replace shop->sqlAsso(), shop->sqlLang() and shop->sqlRestriction() with shop->addSqlAssociation(), shop->addSqlRestrictionOnLang() and shop->addSqlRestriction()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9384 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-17 09:46:08 +00:00
mDeflotte
205e54c31c // Add stock avaibility
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9327 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-13 15:58:29 +00:00
rMalie
577221ff08 // Remove bad _SQL_USE_SLAVE_ uses + normalize Db->executeS(), Db->execute() and Db->numRows() names
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9178 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-10 12:18:56 +00:00
rMalie
14542fea44 // Merge -> revision 9124
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9125 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-07 09:54:43 +00:00
rMalie
b4d436ca21 // Merge -> revision 9061
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9069 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-05 15:21:55 +00:00
rMalie
ae5fc92bf7 // Merge -> revision 8984
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8988 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-03 15:48:07 +00:00
rMalie
ef17d0b7da // Merge -> revision 8952
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8957 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-03 09:14:01 +00:00
rMalie
1977f1d851 // Merge -> revision 8608
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8612 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-15 16:10:59 +00:00
jmCollin
76f895c4d5 // Correct create product
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8361 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-06 11:38:47 +00:00
aFolletete
3eff951265 [+] Project : adding Features detachables in order to improve performance
// clean code

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8328 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-03 17:21:32 +00:00
rMalie
b12bf222a9 git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8179 b9a71923-0436-4b27-9f14-aed3839534dd 2011-08-24 15:57:10 +00:00
rMalie
a875fecb20 // MERGE with 1.4 r7770
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7776 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-28 09:20:57 +00:00
rMalie
e62be3d793 // id_shop on cart product (for links) + change Shop::sqlAsso() + share_order
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7687 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-22 08:57:51 +00:00
rMalie
42da42f827 // Context part 16 (shops)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7664 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-20 12:08:15 +00:00
rMalie
35e5efb530 // Context part 13
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7650 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-19 09:44:10 +00:00
rMalie
10dd3db8d4 // Refactoring of shop class with new context
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7604 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-12 16:28:20 +00:00
rMalie
50f9794383 // Context
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7600 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-12 13:50:15 +00:00
tDidierjean
25b1bceffd // Context part 2
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7598 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-12 12:50:00 +00:00
rGaillard
8a59d0dc41 git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7524 b9a71923-0436-4b27-9f14-aed3839534dd 2011-07-06 10:54:11 +00:00