Commit Graph

602 Commits

Author SHA1 Message Date
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
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
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
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
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
bMancone
c5177871bd // AdminStockCover: missing comments
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11165 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-13 10:20:00 +00:00
bMancone
9329793e65 // Updated OrderHistory / StockManager. Added feature to StockCover: it is now possible to display the number of sales per product / and highlight products which coverage is less than a given threshold
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11163 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-13 09:48:52 +00:00
lLefevre
c426cab2be // fixed small bugs
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11152 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-12 17:43:28 +00:00
aFolletete
0db603d498 // fix bug on Payment addition
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11148 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-12 16:51:47 +00:00
tDidierjean
b1bd3f543d // Changes to product page layout
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11146 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-12 16:19:00 +00:00
bMancone
c1dd6f2a98 // When shipping products: warehouses are now correctly loaded
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11145 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-12 16:18:02 +00:00
fBrignoli
09bdde2d7b [-] BO : Missing display methods in AdminGroup
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11137 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-12 14:39:46 +00:00
bMancone
85dd573402 // Re-stock (Prices fixed/warehouse fixed)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11136 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-12 13:54: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
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
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
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
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
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
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
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
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
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
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
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
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
lLefevre
90aa1af213 // fixed bug in AdminProductsController for display errors
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11046 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-08 12:54:13 +00:00
lLefevre
a61b6a31bc // fixed bug in AdminProductsController for display errors
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11045 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-08 12:53:32 +00:00
rMalie
1c2347ddab // Remove AdminStatsConf controller (conf is already in AdminStatsTab)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11035 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-08 09:25:10 +00:00
vChabot
c6fb7aa4f7 // little fix about advanced stock management
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11034 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-08 09:22:02 +00:00
dSevere
c23c2d983b // Bugs fix on CSV export on supply order interface
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11030 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-07 18:07:38 +00:00
rMalie
814bb7dcc4 // Add again engines in stats
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11024 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-07 13:52:31 +00:00
lLefevre
a972dae0ae // adding customization template in AdminProductsController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11015 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 18:24:08 +00:00
dSevere
1f42bf8d4e // Bugs fix (Collection, SQL optimizations, Backoffice interfaces improvement, ...) + update db_settings_extends.sql for base datas relative to available quantities and suppliers
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11014 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 18:07:06 +00:00
lLefevre
bfcb15b998 // adding attachement template in AdminProductsController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11013 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 18:01:14 +00:00
mDeflotte
85b186a956 // BugFix : Problem with delivery_option calculation
// @TODO : All the undefined index are now fixed but there is not all the available delivery option

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11007 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 17:35:38 +00:00
lLefevre
2b74e1f59a // fix bug in AdminFeaturesController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11004 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 16:37:59 +00:00
fSerny
ef44083253 [-] BO : Upload zip module is repaired
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11002 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 16:00:17 +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
lLefevre
53ffa9dace // fixed bug delete img && update back url
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10997 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 15:21:22 +00:00
bMancone
1886d7ddfc // Fixed bug when updating address
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10996 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 15:20:50 +00:00
bMancone
65f1c44ae6 // Address: added id_warehouse. Supplier: it is now possible to edit the address of a given supplier. Manufacturers: addresses are now correctly displayed. AdminSuppliers: addresses are now editable / when deleting a supplier (if possible <=> no current orders) address is now flaged deleted. AdminWarehouses: when deleting a warehouse, its address is now flagged as deleted.
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10988 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 14:28:40 +00:00
vSchoener
b07dde4585 // Fields aren't set in getPartnersBlock !
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10983 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 14:21:07 +00:00
rMalie
1172e7a8d0 // Improve multishop code
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10982 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 14:08:48 +00:00
dSevere
5b9e12bba1 // Update Stats interface relative to stock available functionnality + retrocompatibility for supplier reference and wholesale_price for a product/product attribute
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10980 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 14:02:50 +00:00
bMancone
ec6dc108a9 // StockManager: fixed. AdminSupplyOrders: fixed price. AdminStockInstantState: added CSV export per warehouse + valuation field is now displayed per warehouse
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10976 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 12:51:10 +00:00