Commit Graph

5386 Commits

Author SHA1 Message Date
bMancone 4e8fa347f7 // Updated type in definition for product_supplier_reference (Thanks R.)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11226 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-14 16:57:40 +00:00
bMancone 2a888cbd8a // Reverted modifications on product
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11225 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-14 16:55:12 +00:00
bMancone 1f74b8a56e // Fixed bugs when editing Warehouses & Suppliers for a product
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11224 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-14 16:54:02 +00:00
fSerny 313b46212f [-] Project : fix on template
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11223 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-14 16:53:50 +00:00
bMancone 931d79ac7f // Fixed bugs when editing Warehouses & Suppliers for a product
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11222 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-14 16:52:33 +00:00
aKorczak 342f6b58b6 // Merge from 1.4.X
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11221 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-14 16:48:37 +00:00
aKorczak 30b5d4fb82 git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11220 b9a71923-0436-4b27-9f14-aed3839534dd 2011-12-14 16:46:30 +00:00
aFolletete d1fae41a4d // fix bug on product line edition
// put new ressource in getRessources method of Webservice

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11216 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-14 16:24:35 +00:00
mMarinetti abc215a343 // Add missing call of parent::initContent() in all front class (when initContent exists)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11215 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-14 16:22:50 +00:00
mDeflotte b48c20d1d5 // BugFix : Adding warehouse on order edition
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11214 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-14 16:19:05 +00:00
lLefevre 6d99193df7 // added seo.tpl
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11213 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-14 15:59:10 +00:00
lLefevre b73482843a // added tab SEO in AdminProductsController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11212 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-14 15:57:29 +00:00
lLefevre 551bce2ac2 // Fixed bug save warehouse, supplier, and accounting in AdminProductsController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11209 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-14 15:33:43 +00:00
lLefevre f037bf9ac3 // fix bugs save and stay in AdminProductsController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11208 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-14 15:09:05 +00:00
vChabot dc29921f7e [+] BO : You can now have UTF-8 URL Rewriting
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11207 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-14 15:00:47 +00:00
lLefevre 91c95d7146 // fix bug tag image in AdminProductsController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11206 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-14 14:37:28 +00:00
tDidierjean 12386a5b57 // Refactoring AdminProduct postProcess
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11205 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-14 14:29:50 +00:00
lLefevre 940f886fd3 // translation && fixed small bugs in AdminProductsController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11204 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-14 14:01:41 +00:00
rGaillard 10b112483e // Fix localization import
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11203 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-14 13:52:03 +00:00
mMarinetti 26c8f164a9 [*] MO : mailjet is now in advertising_marketing category (instead of front_office_features)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11202 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-14 12:24:42 +00:00
lLefevre 082c1440c7 // fix bug display customization of products in FO
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11201 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-14 10:25:34 +00:00
lLefevre 405265730d // Press "enter" is now blocked for AdminProductsController templates
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11200 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-14 10:05:49 +00:00
sThiebaut 086f71a852 // maj
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11199 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-14 09:49:25 +00:00
sThiebaut 89df86c166 // maj
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11198 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-14 09:48:33 +00:00
sThiebaut d1b2ed88ad // maj
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11197 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-14 09:18:25 +00:00
sThiebaut 668f117382 // maj
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11196 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-14 09:17:50 +00:00
lLefevre e3d0661240 // fixed bug javascript for upload image in AdminProductsController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11195 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-14 09:16:29 +00:00
mBertholino 0a1e6cf127 // improve config.inc.php code, id_shop is inserted in the cookie name. Debug in Carrier class, max_deep is now max_depth
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11194 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-14 08:59:55 +00:00
fSerny d1baa08bf8 [-] PROJECT : Class Hook cleaned
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11187 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-13 17:28:13 +00:00
lLefevre 7661185d2a // added selected categories in AdminProductsController & normalize
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11186 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-13 17:12:45 +00:00
mDeflotte b6b190de65 // BugFix : Problem with delivery otion and opc when user is not connected
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11185 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-13 17:01:40 +00:00
rMalie dff66a14cd // Format definitions
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11184 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-13 16:34:09 +00:00
lLefevre e816494ec2 // adding counter for short description and adding size of image files in AdminProductsController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11183 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-13 15:31:17 +00:00
fBrignoli be2c1e4436 [-] PDF : Logo path
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11182 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-13 15:15:28 +00:00
bMancone 9424a41bea // Improved StockInstantState/StockMvt/SupplyOrders interfaces
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11181 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-13 14:50:57 +00:00
lLefevre 71fcbec454 // adding plugins 'implode' in Smarty tool
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11180 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-13 14:01:16 +00:00
bMancone 39edd1f064 // Supply Orders : Fixed issue #PSFV-214
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11179 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-13 13:57:28 +00:00
lLefevre 7f19043b63 // fix bug in AdminCategoriesController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11178 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-13 13:55:22 +00:00
rGaillard 3f5f0bb897 // Update to Smarty 3.1.6
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11177 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-13 13:53:36 +00:00
rGaillard e4fe3c41a3 // Delete smarty before update
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11176 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-13 13:53:01 +00:00
lLefevre 178eeb8e26 // Fix small bugs in AdminProductsController and adding plugins 'implode' in Smarty tool
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11175 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-13 13:43:41 +00:00
rMalie d30b4bea1b // Format definitions
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11174 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-13 13:43:16 +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
vChabot 659cc9235a // payment module install doesn't need to add entries in module_group table (already done in Module::install())
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11171 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-13 13:31:52 +00:00
fGaillard 4b0123f750 [-] BO : BugFix : Specific prices select menu template edited
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11170 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-13 12:46:08 +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
dSevere 29ad584b5c // Manage SQL upgrade for stock management + bug fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11168 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-13 11:09:37 +00:00
mMarinetti 3c055ccf7a [-] MO : editorial : bugfix on install/uninstall, norm
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11167 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-13 10:54:52 +00:00
vKham 199c3c1990 // fix toolbar button IE7, stylesheet edit product Informations Associations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11166 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-13 10:45:21 +00:00