Commit Graph

41 Commits

Author SHA1 Message Date
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
mMarinetti 9ac97aac36 // better message for Theme edition + french translation
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11982 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-02 10:56:44 +00:00
fGaillard 9ff33d65cf [-] Classes : #PSTEST-214 : BugFix : TopMenu for shops and groups
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11973 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-02 10:15:49 +00:00
rGaillard 288e84cc64 // Improve backoffice order
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11890 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-29 14:35:03 +00:00
rMalie b335cb196f // Fix deprecated method Shop::getCurrentShop() #PSFV-279
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11878 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-29 08:49:09 +00:00
mMarinetti 0051788824 // add theme add/remove function
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11831 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-28 11:39:14 +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
mMarinetti b74c003c39 // class Shop optimization in sql request
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11443 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-20 22:39:11 +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
bMancone 8af781e449 // Webservice: Stock
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11390 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-19 18:34:31 +00:00
mMarinetti 1346ca3e46 // when upgrade process (INSTALL_VERSION defined), initialize return now an empty shop object (+ die2Exception)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11287 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-15 17:42:24 +00:00
rMalie 03bd438c7d // Format definitions
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11173 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-13 13:41:54 +00:00
mBertholino 225c8523e9 // improve multishop code, id_shop has an id different than 0 even if share_customer or share_order is true
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11172 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-13 13:37:59 +00:00
mBertholino 5f4972701c // improve multishop code with id_shop = 0 when share_customer or share_order is true
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11169 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-13 11:59:41 +00:00
rMalie fddf4fb89b [*] Classes: Remove $fieldsRequired, $fieldsSize and $fieldsValidate (and lang properties) properties, use $definition instead
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11155 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-12 18:10:38 +00:00
dSevere a75ca6c40a // Update and fix some bugs on front and admin itnerfaces relative to available quantities functionnality
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10925 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-05 15:11:21 +00:00
rMalie 86683a963e // Remove $table and $identifier property from all classes, and add static $definition instead
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10912 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-05 13:56:03 +00:00
rGaillard b7c28b8c48 // Fix shop import stock available
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10621 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 22:19:48 +00:00
rMalie 0f87f86203 // Fix some bug on multishop + improve display of shop pages
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10518 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 13:09:23 +00:00
rGaillard ddcdcd571d // Warning is now displayed for shop without url
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10512 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 11:11:45 +00:00
rMalie faa6dda362 // Multishop: redirect 301 to main URL with request uri when a non main URL is triggered
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10504 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 10:18:42 +00:00
lLefevre 4be94127c8 // fix norm and change asso_shop for shop call in initForm()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10205 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-17 12:27:07 +00:00
lLefevre 764ccc45a3 [*] BO #PSFV-94 : Added AdminFeatureController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10137 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-15 15:37:04 +00:00
bMancone faef9495ea // Added two tables affected when deleting a shop : stock_available and warehouse_shop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10119 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-14 17:45:44 +00:00
rMalie d38bbc2ea5 // Fix during language install (now support table with uppercase prefix on windows)
// Add is_native to hook table in db.sql file

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9989 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-09 15:01:12 +00:00
lLefevre fc8b5cda7c [*] BO #PSFV-94 : Added AdminImportController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9974 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-08 17:54:08 +00:00
vSchoener 66fa6c64af [+] BO : Add Accounting Management
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9961 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-08 14:20:24 +00:00
dMetzger 17a8dbc05b // Retro compatibility and updater improved for Discount/CartRules
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9798 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-02 14:23:44 +00:00
hAitmansour cff9554dda [+] MO : multi-shop allow the removal of a shop if it has no order and no customer
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9722 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-28 14:19:13 +00:00
dSevere e6dfc34e68 // stocks : debug and optimisations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9644 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-25 16:31:26 +00:00
hAitmansour d8509b2829 [*] FO BO MO : rename function isMultiShopActivated by isFeatureActive
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9444 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-19 09:36:12 +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
rMalie 4d91a31031 // Add exceptions in db classes + normalize some files + split defines.inc file
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9216 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-11 10:04:23 +00:00
lLefevre a8a11c0ece [*] BO : Rights verification for multi-shop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9198 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-10 16:10:57 +00:00
aNiassy 31815febc5 [-] FO-BO: #PSFV-95 : deleted some treatments for avoid code repeated
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9187 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-10 13:19:40 +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
lLefevre 791dd3e6a6 [-][-] FO : not check if Object employee is Load
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9173 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-10 09:18:11 +00:00
lLefevre 19a86d0a8f [-] FO : not check if context employee exist
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9168 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-10 08:34:25 +00:00
lLefevre c781f25760 [*] BO : added right of multi-shop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9157 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-07 15:39:55 +00:00
tDidierjean b45dd02452 // remove deprecated PS_ADMIN_DIR by _PS_ADMIN_DIR_
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8666 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-20 15:53:57 +00:00
rMalie 781d92ccd4 // Move shop classes in classes/shop/ directory
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8616 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-16 08:49:50 +00:00