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

2154 Commits

Author SHA1 Message Date
rGaillard 14cb2b1ef0 // Miss on last commit 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10293 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-20 16:10:20 +00:00
dMetzger a98752eb22 // Vouchers are shrinkable again (must be tested more thoroughly) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10292 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-20 15:53:31 +00:00
rGaillard e4096bf943 // Constructor of OrderDetail correctly call parent constructor 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10291 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-20 15:51: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
rGaillard 96b9355d9d // Add method method getGlobalValue on Configuration 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10282 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-18 16:46:56 +00:00
mMarinetti d6ef55b5ed // fix adminProducts > images 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10281 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-18 16:42:51 +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
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
lLefevre 716acbaffa // fix delete assign token in AdminController.php, use function smarty {getAdminToken tab=''} 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10273 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-18 15:00:58 +00:00
lLefevre ae4a223509 // fix added toolbar in HelperOptions 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10271 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-18 14:22:53 +00:00
mDeflotte eda71ac8fb // BugFix with carrier module and multishipping 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10267 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-18 14:14:06 +00:00
tDidierjean 174be2bfce // fix module tab dispatch 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10266 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-18 14:10:23 +00:00
mDeflotte 107bd4f779 [-] allow_seperated_package need to be an int and not a boolean on class cart 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10262 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-18 12:49:25 +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
tDidierjean 8a1bd2eb2d // Remove <img> from confirmation messages 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10258 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-18 11:00:37 +00:00
tDidierjean 90a53b4cf1 // Change customer group for unidentified customers when getting carriers 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10254 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-18 10:50:42 +00:00
tDidierjean dd01f32fad // Remove BO themes 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10249 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-18 10:27:07 +00:00
tDidierjean 40339f1add [-] Classes : fix dispatcher for FO 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10246 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-18 10:10:07 +00:00
fBrignoli 7fc0c2330b // additional comment 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10243 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-18 09:32:49 +00:00
mMarinetti b8812a4161 // sql query improvement for $feature->nbFeatures() 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10240 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-17 18:54:17 +00:00
tDidierjean 740ac7c843 // AdminTab compatibility: Dispatcher for BO now search tabs in database, not on the disk. AdminTabs now uses the new BO theme. 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10236 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-17 18:15:07 +00:00
vChabot 1a76c8975f [*] BO : You have now 3 new default groups. Unidentified group, guest group, and customer group. 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10232 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-17 17:22:15 +00:00
fBrignoli e5f3c3ca2a [*] PDF : PDF is now rendered by TCPDF throught HTML template 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10231 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-17 17:15:23 +00:00
lLefevre 4621551acf // fix added form.tpl in AdminWebserviceController 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10224 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-17 16:05:06 +00:00
tDidierjean 9900226eba [-] Classes : fixed bug with displayAsDeprecated functions when not called from a class 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10223 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-17 15:49:40 +00:00
vAugagneur e855e49dfb //fixed small bug 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10219 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-17 15:21:36 +00:00
lBrieu 284c892d4d // Bug fix when deleting a file associated to a virtual product 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10209 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-17 13:24:49 +00:00
lLefevre 4be94127c8 // fix norm and change asso_shop for shop call in initForm() 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10205 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-17 12:27:07 +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
mMarinetti fe5fe7f3db // fix ajax-tab 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10195 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-17 09:03:42 +00:00
vAugagneur 89be6d647c [+] BO : adminTab Groups is now a convert to a AdminController 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10192 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-17 08:21:22 +00:00
vAugagneur 6299e72833 //added condition in processDelete to check list_skip_actions array 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10190 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-17 07:54:14 +00:00
lLefevre e531c74372 // Fix change tab for controller of AdminQuickAccesses 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10187 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-16 21:27:03 +00:00
bMancone bb55277763 // StockManager: updated getProductRealQuantities(). StockAvailable: fixed. 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10186 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-16 17:55:39 +00:00
lLefevre 4cc9dc04bf // fix bug method addGroupsIfNoExist() in class Category 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10185 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-16 17:48:48 +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
mMarinetti 4e159bf6b6 [*] All : new method Controller::redirect and property $controller->redirect_after 
// and added postprocess return value

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10182 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-16 16:25:00 +00:00
mMarinetti 2844627e14 // ajax mode now uses layout-ajax.tpl by default 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10175 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-16 14:48:24 +00:00
tDidierjean 72644e0118 [*] BO : #PSFV-94 - added AdminCMSContentController, AdminCMSController, AdminCMSCategoriesController 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10174 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-16 14:18:36 +00:00
bMancone 41f81bf5ae // Warehouse: it is not possible to delete a warehouse of it has pending supply orders. 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10173 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-16 14:12:58 +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 effd1924f8 // AdminSupplyOrdersController: fixed currency in 'view'. StockManager: added warehouse filter on getProductRealQuantity() 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10161 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-16 09:51:06 +00:00
vAugagneur a48be7ddf3 //fixed css treeview 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10159 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-16 09:45:07 +00:00
bMancone 0552cfb60a // Warehouse: getWarehousesByProducId() 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10151 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-15 18:25: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
vSchoener adae213cec // Update Accounting for the return display html 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10145 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-15 17:11:53 +00:00
mMarinetti 13e4f0d9e5 // Scene constructor bugfix, removed wrong cast 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10141 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-15 16:31:49 +00:00
tDidierjean b3b48cf3b0 // You can now display confirmation messages by adding them to array $confirmations in AdminController 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10140 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-15 16:10:34 +00:00
lLefevre 764ccc45a3 [*] BO #PSFV-94 : Added AdminFeatureController 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10137 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-15 15:37:04 +00:00
vSchoener 04ee777109 // Update Accounting for export 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10132 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-15 14:45:24 +00:00