dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,839 Commits 9 Branches 19 Tags
a9bc87e527d0bf9a69bb6c4e293c5cab68ebe2b9
Commit Graph

52 Commits

Author SHA1 Message Date
vChabot
3114aa6fc8 // correction translation 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15872 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-06-06 09:45:38 +00:00
vChabot
0dc3d1b996 [-] BO : BugFix : #PSCFV-2644 : Unable to remove stock to a product with advanced stock management 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15870 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-06-06 09:37:06 +00:00
mDeflotte
ea7e73ef35 [-] BO : #PSCFV-139 - Improving Retial refund 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15316 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-15 14:58:02 +00:00
bMancone
c04c4be710 // Fixed #PSCFV-2252 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15216 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-11 10:12:36 +00:00
rMalie
0be8cc5693 // Fix left join on product_attribute_shop 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14809 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-23 13:01:02 +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
lLefevre
0e9e23aaae // Fix update english key of translations in all files 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14143 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-14 12:25:51 +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
ed6fb12963 // Updated mailalerts module 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13780 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-01 13:32:16 +00:00
tDidierjean
7a6a998aab // rename $toolbar_fix to $toolbar_scroll part2 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13712 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-28 17:39:40 +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
bMancone
8b35f64f95 // Fixed #PSTEST-886 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13639 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-27 16:14:14 +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
f9d982f2dc // Fixed #PSTEST-737 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13240 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-13 09:28:35 +00:00
tDidierjean
6648b4da8d // Rename template/helper to template/helpers 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13041 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-06 16:35:49 +00:00
bMancone
c05495eade // Stock : general improvements 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12700 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-25 19:05:06 +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
tDidierjean
ad1fd29cea // Refactor AdminController::_errors to errors 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12331 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-11 08:58:12 +00:00
rMalie
744e398a19 // Use smarty->getTemplateDir(0) instead of smarty->template_dir[0] (private property) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12265 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-09 14:02:34 +00:00
bMancone
04455420e0 // #PSTEST-289 : Added a SaveAndStay button when adding stock 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11979 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-02 10:47:00 +00:00
bMancone
b837a7c6c1 // fixed translations problems due to r11899 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11910 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-29 17:26:16 +00:00
bMancone
bf1aa53f67 // StockManagement: added hints with the last unit price and the last quantity of the last stock mvt when adding stock. Quantity is now usable by default when adding stock. 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11876 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-28 18:16:51 +00:00
bMancone
94e8022772 // Stock : improvements (ergonomy/translations) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11428 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-20 16:45:05 +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
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
7fd28f56b6 // Stock - interfaces updated : (reason=>label, state=>status) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10700 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-28 11:12:17 +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
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
tDidierjean
58c35a2152 // HelperForm : 'p' replaced by 'desc' 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10286 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-18 18:27:48 +00:00
lLefevre
1bf46b362c // fix delete var no_back and multiple call method initToolbarTitle 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10277 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-18 16:05:46 +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
45a3f8d33a // StockManagement : updated the warehouse list displayed when {adding, removing, transfering} stock 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10127 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-15 10:48:10 +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
bMancone
1197105373 // Stock : it is not possible to manage stock for a virtual product or a pack anymore 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10084 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-14 10:11:48 +00:00
dSevere
321bca2989 // stock : debug + interfaces optimizations + stockManager update 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10055 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-10 17:30:16 +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
04cf1350fc // #PSFV-94 : Update and bug fix with new toolbar implementation 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9875 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-04 09:48:30 +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
dSevere
fe2abf8bc0 // #PSFV-94 : add state management on orders + bugs fix 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9754 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-31 16:51:49 +00:00
lLefevre
3ad47429c9 // fix bug move helper list action tpl (PSSV-94) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9672 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-27 11:15:10 +00:00
bMancone
9aea3d826d // Stock controllers : added permissions check on employees 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9652 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-26 12:35:28 +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
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
dSevere
59ebf2b7d0 // add forms for add / remove / transfer stock 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9557 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-21 15:06:50 +00:00
dSevere
382f4678bf // Add currency to the warehouse - optimisation of form, list and option init in AdminController - list bug fix on StockManager 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9448 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-19 11:11:30 +00:00