Commit Graph

2105 Commits

Author SHA1 Message Date
sThiebaut 7b10cf02a2 // maj
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11125 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-12 11:15:30 +00:00
lLefevre c0fae8aa5c // adding the dynamic loading of tabs in products
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11124 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-12 11:15:17 +00:00
tDidierjean 345ad40e3c // Copy from trunk: #PSCFI-4401 - linebreaks in product return message cause fatal error in BO
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11122 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-12 11:07:46 +00:00
sThiebaut f5496845b6 // maj
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11121 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-12 11:07:07 +00:00
sThiebaut 9fef2d5713 // maj
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11120 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-12 11:06:54 +00:00
tDidierjean f006cfa526 // Fix missing id_address in demo supplier
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11119 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-12 11:06:22 +00:00
bMancone 9dcb132625 // StockInstantState: fixed bug on names. AdminOrders: fixed bug on return
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11118 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-12 10:54:59 +00:00
mDeflotte aaf0127906 // BlockLayered : Adding product shop restriction
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11116 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-12 10:46:19 +00:00
mMarinetti d93415cfad // module editorial hooks name
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11114 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-12 10:35:18 +00:00
sThiebaut 1120a5e2f3 // maj
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11113 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-12 10:28:47 +00:00
mDeflotte d843b14ac6 // BugFix : Display errors when no carriers available
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11112 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-12 10:21:56 +00:00
tDidierjean b2c36c562b // Copy fix from trunk: #PSCFI-4397 - Missing unique index on PREFIX_category_product
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11106 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-12 09:41:44 +00:00
mDeflotte 2df30b8f8e // BugFix : empty errors message on adding products
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11104 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-12 09:00:22 +00:00
aKorczak f75bfca1f4 [-] WS : Fixed norm on WebserviceRequest
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11100 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-09 19:30:35 +00:00
bMancone a749dc7ff1 // Controllers: improvement on CSV
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11097 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-09 16:47:16 +00:00
mMarinetti bd402c3514 // cleanning code
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11095 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-09 16:33:32 +00:00
bMancone 41585414aa // Fixed AdminOrdersController when returning..
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11094 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-09 16:14:02 +00:00
mDeflotte 128c5e20a6 // Removing form_shop.tpl
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11093 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-09 16:11:35 +00:00
bMancone 0ea53c672f // Stock : product can now be returned
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11091 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-09 16:08:27 +00:00
rGaillard f76baf34e6 // Add submit button on webservice controller options
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11089 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-09 15:54:07 +00:00
mMarinetti a551a424b6 // new modules hooked for default theme, fixed hook names
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11087 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-09 15:52:37 +00:00
rMalie 319e623727 // Retrocompatibility in ObjectModel
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11085 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-09 15:50:12 +00:00
mDeflotte de2e800ebd // Blocklayered : Filter templates could be associated to shops now
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11083 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-09 15:47:15 +00:00
mDeflotte eb40bcf854 // Shop association area use tpl file
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11082 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-09 15:40:02 +00:00
rGaillard fa4a59884c // Fix little bug
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11081 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-09 15:14:58 +00:00
tDidierjean 80ecb65475 // Commit new tabs in product edition
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11079 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-09 14:22:46 +00:00
rGaillard 43ff904c57 // Fix little bug
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11078 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-09 14:18:13 +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
rMalie d0c1239c17 // Remove $this->table and $this->identifier from objectModels + normalize
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11076 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-09 14:05:24 +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
mDeflotte 71b6047692 // Stock decrementation
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11074 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-09 13:09:32 +00:00
rMalie a9670d0f85 // Little fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11073 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-09 10:32:49 +00:00
fBrignoli 67643cfc29 [-] FO : Unable to checkout
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11072 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-09 10:24:56 +00:00
rMalie b56d98b66a // Remove unused $tables property from ObjectModel + improve Cache
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11071 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-09 10:24:48 +00:00
lLefevre 901def1d12 // Fix bug button add image in AdminProductsController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11069 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-08 17:42:15 +00:00
dSevere f34e06c20f // Bug on Prefix fix in db_settings.sql
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11068 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-08 17:17:50 +00:00
sThiebaut 53246d0fcc // maj
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11067 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-08 17:08:13 +00:00
sThiebaut 085f64c85f // maj
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11066 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-08 17:07:55 +00:00
vKham e9ee2e68ca // fix bug page commande facture
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11064 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-08 16:50:34 +00:00
rMalie c5b7e15eb8 // Fix DbQuery for PHP < 5.2
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11060 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-08 16:32:59 +00:00
dSevere 774533dc94 // Improve stock managemetn and advanced stock management options and tab display on product admin interface
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11059 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-08 16:26:07 +00:00
rGaillard 48b1d3b983 // delete console.log
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11058 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-08 16:05:37 +00:00
rGaillard aaea29d1b0 // Miss file on last commit
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11057 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-08 16:03:49 +00:00
rGaillard 86b65ef6df [+] BO: Add Specific prices bulk generator
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11056 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-08 16:01:10 +00:00
lLefevre 884e7492c1 // adding ovverride method initProcess for display Informations Tab
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11055 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-08 15:41:12 +00:00
dSevere 12ea52f4f7 // Multiple bugs fix on stock interfaces during tests
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11053 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-08 15:22:31 +00:00
vChabot 56c6105c56 // norm
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11052 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-08 15:14:40 +00:00
vChabot af70df72ce // Adding the OrderCarrier class to handle carriers in an order
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11051 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-08 15:12:23 +00:00
tDidierjean 4b1e7e1082 // Change description class in form.tpl
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11050 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-08 14:18:23 +00:00
rMalie edc0b2c6ca // Improve ObjectModel + normalize
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11049 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-08 14:13:22 +00:00