Commit Graph

138 Commits

Author SHA1 Message Date
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
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
7873905bb5 // fix norm && added PDO::FETCH_ASSOC in method fetch() for PDO
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11029 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-07 17:30:32 +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
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
6cefe4465d // Remove $langMultiShop from all classes, and add 'multishop' in $definition instead
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10922 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-05 15:04:09 +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
lLefevre
efc5ff8390 // update tab "attributes" in smarty template + update action in list in ajax
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10891 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-04 10:42:05 +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
43654ffba1 // StockManager : bugs fix + improvement of StockManager utilisation in fucntion of global configuration
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10861 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-02 15:23:01 +00:00
dSevere
16cf709d52 // Improve StockAvailable requests + code refactoring
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10855 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-02 11:36:04 +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
dSevere
577aa781bc // Stock Available : Add shared management for group of shops
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10812 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-30 16:28:06 +00:00
rMalie
900e9e8148 // Fix stock for multishop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10661 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-25 13:12:02 +00:00
dMetzger
f670f7573f [+] BO : add new feature, Order edition
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10579 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 17:45:52 +00:00
tDidierjean
2d3db2e15d // Add actions to product list and fix product duplication
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10560 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 16:45:14 +00:00
dSevere
2d238bbac7 // Stock Management : Show stock interfaces only if the option is active in the configuration + debug
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10554 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 16:07:57 +00:00
mMarinetti
67ba2e5df5 // phpdoc fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10550 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 15:37:50 +00:00
mMarinetti
99e90d5492 // fix required fields
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10415 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 13:29:07 +00:00
bMancone
7b394c6cbd // Product names are now correctly displayed in AdminStockManagement & AdminStockCover
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10398 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 12:40:56 +00:00
dSevere
d0c1167d6c // Stock Available : bug fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10395 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 12:39:30 +00:00
rMalie
9d10de0848 // Merge -> 10309
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10333 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 11:05:10 +00:00
bMancone
276f493dd7 // StockAvailable: updated synchronize() and updated its usage within the different stock controllers when necessary
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10331 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 11:01:33 +00:00
rGaillard
a25cc16f28 // Module configuration is now displayed
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10289 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-19 15:03:20 +00:00
dSevere
a24764b9b3 // Suppliers : Manage multiple suppliers for a product / product attribute + integration with supply orders
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10279 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-18 16:29:50 +00:00
mDeflotte
5e6ab08a00 // Merging multishipping branche on 1.5
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10259 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-18 11:13:31 +00:00
lBrieu
74a00eab8a // bug fix when trying to add files to combinations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10199 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-17 09:53:59 +00:00
dSevere
c58d04acc9 // Product : Update stock and quantities of current product for compatibility with new stock management system
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10184 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-16 17:31:45 +00:00
bMancone
35150997c7 // Product: added a method to get the name of a given product, product_attribute, in a given language
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10120 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-14 18:44:38 +00:00
bMancone
18e709aec4 // When removing a product, its stock available is now properly removed
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10111 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-14 16:21:44 +00:00
bMancone
c11c30deca // It is not possible to delete a product if there are currently physical stock/supply order(s) for this product, anymore
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10100 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-14 13:36:33 +00:00
vChabot
568327849c [*] FO : combination link from product page are now the same as the combination link from blocklayered
// Cart is now accepting the combination link

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10028 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-10 10:45:19 +00:00
tDidierjean
81e5f72142 [*] BO : #PSFV-94 - added AdminAttributeGeneratorController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9949 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-08 10:09:57 +00:00
rGaillard
77a66c64fd [*] Core : Specific prices can now be applied to combinations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9897 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-04 15:53:53 +00:00
fBrignoli
17b7d300b7 // removeTax => removeTaxes
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9861 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-03 17:20:49 +00:00
mMarinetti
43c32d61c0 // bugfix retrocompatibility addProductAttributes and addProductCombination (quantity problem)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9845 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-03 14:54:50 +00:00
fSerny
0ba4fe9c7e [*] PROJECT : New Module API (part 1)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9790 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-02 10:49:01 +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
mDeflotte
7a6364bfa7 // BugFix : Porblem during adding product to cart
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9601 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-24 15:04:29 +00:00
mDeflotte
78ddaa120c // Stock decrementation when order is shipped
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9486 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-20 09:08:59 +00:00
rGaillard
2a22c9a502 [*] Core: Upgrade smarty to version 3.1.3
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9469 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-19 15:16:52 +00:00
mDeflotte
886fcda18e // Decrement stock available on order
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9430 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-18 15:43:28 +00:00
vChabot
6517b06539 [+] FO : you can access to a product combination with its own url (e.g: http://www.myshop.com/index.php?controller=product&id_product=1#disk-space=16go&color=yellow)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9425 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-18 14:03:02 +00:00
bMancone
e5ae345855 // Stock : fixed Pack & Product
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9406 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-18 08:59:31 +00:00
bMancone
23a24b58e2 // Removed occurences of setStock / getStock
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9395 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-17 15:03:15 +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
2ea57df6cb // Add stock avaibility
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9339 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-13 16:37:07 +00:00
dSevere
f1c26377a5 // stock: add warehouse tab
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9334 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-13 16:19:10 +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
jmCollin
c4391df038 // fix bug with virtual product
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9325 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-13 15:44:33 +00:00