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

// BO - carriers / multishipping - Add descriptions

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12556 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
mDeflotte
2012-01-19 13:48:10 +00:00
parent 5e7d168e5e
commit 6dfdc62f4d
3 changed files with 577 additions and 572 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/products/shipping.tpl
+1
View File
@@ -84,6 +84,7 @@
<option value="{$carrier.id_reference}" {if isset($carrier.selected) && $carrier.selected}selected="selected"{/if}>{$carrier.name}</option> <option value="{$carrier.id_reference}" {if isset($carrier.selected) && $carrier.selected}selected="selected"{/if}>{$carrier.name}</option>
{/foreach} {/foreach}
</select> </select>
<p class="preference_description">{l s='If no carrier selected, all carriers could be used to ship this product.'}</p>
</td> </td>
</tr> </tr>
</table> </table>
controllers/admin/AdminWarehousesController.php
+4 -2
View File
@@ -113,8 +113,10 @@ class AdminWarehousesControllerCore extends AdminController
$this->displayInformation($this->l('Before adding stock in your warehouses, you should check the general default currency used.').'<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 :')); $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('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, ...')); $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(); return parent::renderList();
} }
translations/fr/admin.php
+572 -570
View File
File diff suppressed because it is too large Load Diff