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

// Fixed #PSTEST-520 and #PSTEST-537

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12594 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
bMancone
2012-01-23 09:52:18 +00:00
parent 988c9483b8
commit 7150ad0ec0
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/stock/Warehouse.php
+1 -1
View File
@@ -68,7 +68,7 @@ class WarehouseCore extends ObjectModel
'fields' => array(
'id_address' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId', 'required' => true),
'reference' => array('type' => self::TYPE_STRING, 'validate' => 'isString', 'required' => true, 'size' => 45),
'name' => array('type' => self::TYPE_STRING, 'validate' => 'isName', 'required' => true, 'size' => 45),
'name' => array('type' => self::TYPE_STRING, 'validate' => 'isString', 'required' => true, 'size' => 45),
'id_employee' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId', 'required' => true),
'management_type' => array('type' => self::TYPE_STRING, 'validate' => 'isStockManagement', 'required' => true),
'id_currency' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId', 'required' => true),
controllers/admin/AdminWarehousesController.php
+4 -4
View File
@@ -114,9 +114,9 @@ class AdminWarehousesControllerCore extends AdminController
$this->displayInformation($this->l('Futhermore, for each warehouse, you have to check :'));
$this->displayInformation($this->l('the management type (according to the law in your country), the valuation currency, its associated carriers and shops.').'<br />');
$this->displayInformation($this->l('Finally, you can see detailed informations on your stock per warehouse, such as its valuation, the number of products and quantities stored, ...').'<br /><br />');
$this->displayInformation($this->l('Be careful, products from different warehouses will need to be shipped in different packages.'));
return parent::renderList();
}
@@ -168,7 +168,7 @@ class AdminWarehousesControllerCore extends AdminController
'maxlength' => 45,
'required' => true,
'desc' => $this->l('Name of this warehouse'),
'hint' => $this->l('Invalid characters:').' 0-9!<>,;?=+()@#"�{}_$%:',
'hint' => $this->l('Invalid characters:').' !<>,;?=+()@#"�{}_$%:',
),
array(
'type' => 'text',
@@ -248,7 +248,7 @@ class AdminWarehousesControllerCore extends AdminController
'type' => 'select',
'label' => $this->l('Carriers:'),
'name' => 'ids_carriers[]',
'required' => true,
'required' => false,
'multiple' => true,
'options' => array(
'query' => Carrier::getCarriers($this->context->language->id, true),