Commit Graph

44 Commits

Author SHA1 Message Date
rMalie
e50fa1ae2a // Fix // Fix left join on product_attribute_shop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14813 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-23 13:29:24 +00:00
rMalie
0c2dd0cd2f // MERGE product_multistore branch : product fields are now editable per shop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14682 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-17 13:32:12 +00:00
tDidierjean
a5dcb4295f // Rename fieldsDisplay to fields_list part3 (timeout)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14378 b9a71923-0436-4b27-9f14-aed3839534dd
2012-03-29 16:31:01 +00:00
bMancone
fbd17ef3bf // norm & translations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13933 b9a71923-0436-4b27-9f14-aed3839534dd
2012-03-07 15:48:54 +00:00
bMancone
0546f91456 // Improved filters
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13886 b9a71923-0436-4b27-9f14-aed3839534dd
2012-03-06 13:35:05 +00:00
bMancone
92a3249e8b // Fixed stock cover
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13859 b9a71923-0436-4b27-9f14-aed3839534dd
2012-03-05 18:17:30 +00:00
rMalie
e5b646b0f8 // Fix multishop context in BO
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13648 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-27 17:14:33 +00:00
rMalie
129f8e7be0 // Fix multishop_context
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13599 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-24 10:38:24 +00:00
rMalie
2454cd7863 // Welcome 2012²
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13573 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-23 16:33:10 +00:00
rMalie
4e6628cbfd // Remove $display_multishop_toolbar and add instead $multishop_context to manage shop context per admin controller
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13530 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-22 14:25:28 +00:00
mMarinetti
10b3e3d8d3 // Welcome 2012
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13520 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-22 09:28:22 +00:00
bMancone
95deb33fa4 // Updated Shop toolbar for advanced stock management controllers
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13355 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-15 14:16:00 +00:00
bMancone
f2920c2775 // code review
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13131 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-08 14:27:20 +00:00
rMalie
6887541bdd [-] Classes : all classes and controllers now use their name in static calls instead of self (improve override) #PSFV-376
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12552 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-19 10:14:10 +00:00
bMancone
5c4e87777d // Fixed bug when associating Suppliers. Fixed StockCover
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11802 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-27 16:25:10 +00:00
bMancone
6840363b9b // Stock : translations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11439 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-20 18:09:22 +00:00
rMalie
b7ae37f6d7 // Change prototype of methods from(), leftJoin(), innerJoin(), leftOuterJoin() and naturalJoin() for DbQuery class
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11351 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-19 11:13:13 +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
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
tDidierjean
f9c4410e8d // Rename AdminController methods initForm() initList() etc. to renderForm() renderList()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10799 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-30 11:06:38 +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
bMancone
50edc71603 // Stock : fixed/improved interfaces
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10169 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-16 13:01:16 +00:00
bMancone
7472b6c466 // AdminStock{Cover,InstantState} : fixed and updated.
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10157 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-16 09:30:45 +00:00
bMancone
8931216544 // Stock : fixed bugs on cover/instant state/warehouse/management
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10150 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-15 18:19:27 +00:00
bMancone
fdab7ebc70 // Warehouse: getWarehouseList is now getWarehouses. Employee: it is not possible to delete an employee if he manages warehouses, anymore.
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10103 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-14 14:28:30 +00:00
bMancone
c92e78ad00 // Stock : updated stock{cover, mvt, instant_state}controllers
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10007 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-09 16:03:51 +00:00
bMancone
5336732032 // AdminStockInstantStateController updated
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9982 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-09 10:02:57 +00:00
dSevere
1ec33f92e2 // stock : bugs fix and update of supplier order add product interface
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9967 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-08 15:45:45 +00:00
bMancone
70ccc98eac // Stock cover : fixed ajax
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9957 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-08 13:41:42 +00:00
bMancone
17c2ddaa12 // Stock Cover : added information when products has combinations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9953 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-08 11:38:38 +00:00
bMancone
29fdd527c8 // Stock : fixed cover
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9950 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-08 10:33:18 +00:00
dSevere
ad8f419186 // #PSFV-94 : bugs fix for add / remove products to a supplier order
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9935 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-07 16:02:38 +00:00
dSevere
be6473f82d // #PSFV-94 : fix toolbar and leadin integration on all stock controllers + bugs fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9932 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-07 15:18:47 +00:00
dSevere
250546f245 // #PSFV-94 : add product management on suppliers order + Submit button integrated to the toolbar on add/edit form view + adaptations after form and list helper update + bugs fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9864 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-03 17:54:55 +00:00
bMancone
d0fd852078 // StockMvtReason : added getStockMvtReasonsWithFilter(). Controllers : updated
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9634 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-25 14:27:21 +00:00
bMancone
dbc54e9737 // StockCover : fixed query
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9612 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-24 16:23:26 +00:00
bMancone
9ab291669f // StockCover : fixed query
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9611 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-24 16:20:24 +00:00
bMancone
0251c800de // Fixed StockCover
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9609 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-24 16:04:33 +00:00
bMancone
d5a56e3b27 // Fixed StockCover
// Removed id_stock_mvt_reason from StockManager::transferBetweenWarehouses()
// It is now allowed to transfer stock within one warehouse if and only if it only changes, for a given quantity, its usable state


git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9586 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-24 12:58:24 +00:00
bMancone
82c611f092 // StockCover : udpated default warehouse
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9582 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-24 10:13:39 +00:00
bMancone
6ca032c3be // StockCover : added warehouse selection & fixed period selection
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9581 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-24 10:10:14 +00:00
dSevere
a498289551 // activate stockCover admin interface + debug and adaptations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9565 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-21 16:14:44 +00:00
bMancone
1777dee8e9 // Stock: added StockCoverController - stock coverage
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9481 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-19 16:39:17 +00:00