dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap

Browse Source 
# By Jérôme Nadaud (4) and sLorenzini (1)
# Via Jérôme Nadaud
* 'bootstrap' of https://github.com/PrestaShop/PrestaShop:
  [-] BO : BugFix Cancel modification button error
  [+] BO : Product "For" and combination button
  // update order tab
  [+] BO : Product "For"
  [+] BO : Product "For" and new carriers select list

Conflicts:
	admin-dev/themes/default/css/admin-theme.css
This commit is contained in:
Kevin Granger
2013-07-25 19:21:59 +02:00
parent 9308c5c527 07000c1f66
commit 9e5bbac559
11 changed files with 381 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminProductsController.php
+3 -2
View File
@@ -3603,8 +3603,9 @@ class AdminProductsControllerCore extends AdminController
{
$carriers = array();
if (Tools::getValue('carriers'))
$carriers = Tools::getValue('carriers');
if (Tools::getValue('selectedCarriers'))
$carriers = Tools::getValue('selectedCarriers');
$product->setCarriers($carriers);
}
}