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

// Stock : improvements (ergonomy/translations)

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11428 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
bMancone
2011-12-20 16:45:05 +00:00
parent 3fda89d7c4
commit 94e8022772
7 changed files with 105 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminStockManagementController.php
+5 -4
View File
@@ -60,7 +60,8 @@ class AdminStockManagementControllerCore extends AdminController
'title' => $this->l('Name'),
),
'stock' => array(
'title' => $this->l('Total quantities in stock'),
'title' => $this->l('Quantity'),
'hint' => $this->l('Sum of quantities for all warehouses'),
'width' => 100,
'orderby' => false,
'filter' => false,
@@ -99,9 +100,9 @@ class AdminStockManagementControllerCore extends AdminController
$this->_where = 'AND a.cache_is_pack = 0 AND a.is_virtual = 0';
$this->displayInformation($this->l('This interface allows you to manage the stocks of each of your products and their variations.').'<br />');
$this->displayInformation($this->l('Total quantities in stock represent the sum for all warehouses.').'<br />');
$this->displayInformation($this->l('Through this interface, you can add and delete products for a given warehouse.'));
$this->displayInformation($this->l('Also, you can transfer products between warehouses, or within one warehouse.'));
$this->displayInformation($this->l('Through this interface, you can increase quantities (add) and decrease quantities (delete) of products for a given warehouse.'));
$this->displayInformation($this->l('Furthermore, you can move quantities (transfer) of products between warehouses, or within one warehouse.').'<br />');
$this->displayInformation($this->l('Note that if you want to increase quantities of multiple products at once, you can use the supply orders tab.'));
return parent::renderList();
}
controllers/admin/AdminWarehousesController.php
+8 -5
View File
@@ -112,10 +112,10 @@ class AdminWarehousesControllerCore extends AdminController
$this->displayInformation($this->l('This interface allows you to manage your warehouses.').'<br />');
$this->displayInformation($this->l('Before adding stock in your warehouses, you should check the general default currency used.').'<br />');
$this->displayInformation($this->l('Futhermore, for each warehouse, you have to check :
the management type (according to the law in your country), the valuation currency,
the management type (WA/FIFO/LIFO, 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.'));
the number of products and quantities stored, ...'));
return parent::renderList();
}
@@ -179,7 +179,7 @@ class AdminWarehousesControllerCore extends AdminController
),
array(
'type' => 'text',
'label' => $this->l('Adress:'),
'label' => $this->l('Address:'),
'name' => 'address',
'size' => 100,
'maxlength' => 128,
@@ -187,10 +187,11 @@ class AdminWarehousesControllerCore extends AdminController
),
array(
'type' => 'text',
'label' => $this->l('Adress:').' (2)',
'label' => $this->l('Address:').' (2)',
'name' => 'address2',
'size' => 100,
'maxlength' => 128,
'desc' => $this->l('Address of this warehouse (complementary address is optional).'),
),
array(
'type' => 'text',
@@ -277,6 +278,7 @@ class AdminWarehousesControllerCore extends AdminController
$this->fields_form['input'][] = array(
'type' => 'select',
'label' => $this->l('Management type:'),
'hint' => $this->l('Careful ! You won\'t be able to change this value later!'),
'name' => 'management_type',
'required' => true,
'options' => array(
@@ -303,6 +305,7 @@ class AdminWarehousesControllerCore extends AdminController
$this->fields_form['input'][] = array(
'type' => 'select',
'label' => $this->l('Stock valuation currency:'),
'hint' => $this->l('Careful ! You won\'t be able to change this value later!'),
'name' => 'id_currency',
'required' => true,
'options' => array(
@@ -453,7 +456,7 @@ class AdminWarehousesControllerCore extends AdminController
*/
public function renderView()
{
$this->displayInformation($this->l('This interface allows you to display detailed informations on your warehouse.').'<br />');
$this->displayInformation($this->l('This interface allows you to display detailed informations on your warehouse.'));
$id_warehouse = (int)Tools::getValue('id_warehouse');
$warehouse = new Warehouse($id_warehouse);