From c05495eade06bbcba32c5072365506fbfe070ce0 Mon Sep 17 00:00:00 2001 From: bMancone Date: Wed, 25 Jan 2012 19:05:06 +0000 Subject: [PATCH] // Stock : general improvements git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12700 b9a71923-0436-4b27-9f14-aed3839534dd --- classes/pdf/HTMLTemplateSupplyOrderForm.php | 2 +- controllers/admin/AdminStockManagementController.php | 8 +++++++- themes/default/pdf/lang/fr.php | 11 +++++++---- themes/default/pdf/supply-order.tpl | 6 +++--- translations/fr/admin.php | 12 +++++------- 5 files changed, 23 insertions(+), 16 deletions(-) diff --git a/classes/pdf/HTMLTemplateSupplyOrderForm.php b/classes/pdf/HTMLTemplateSupplyOrderForm.php index 27715c317..fe06fe9f4 100644 --- a/classes/pdf/HTMLTemplateSupplyOrderForm.php +++ b/classes/pdf/HTMLTemplateSupplyOrderForm.php @@ -122,7 +122,7 @@ class HTMLTemplateSupplyOrderFormCore extends HTMLTemplate { $this->address = $this->address_warehouse; $free_text = HTMLTemplateSupplyOrderForm::l('DE: Discount excluded '); - $free_text .= ' '; + $free_text .= ' - '; $free_text .= HTMLTemplateSupplyOrderForm::l(' DI: Discount included'); $this->smarty->assign(array( diff --git a/controllers/admin/AdminStockManagementController.php b/controllers/admin/AdminStockManagementController.php index 4e0fbf348..e3eb78e43 100644 --- a/controllers/admin/AdminStockManagementController.php +++ b/controllers/admin/AdminStockManagementController.php @@ -106,7 +106,11 @@ class AdminStockManagementControllerCore extends AdminController $this->displayInformation($this->l('This interface allows you to manage the stocks of each of your products and their variations.').'
'); $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.').'
'); - $this->displayInformation($this->l('Note that if you want to increase quantities of multiple products at once, you can use the supply orders tab.')); + $this->displayInformation($this->l('Note that if you want to increase quantities of multiple products at once, you can use the supply orders tab.').'
'); + + $this->displayInformation($this->l('Finally, you will be asked to specify the state of the quantity you will add : ')); + $this->displayInformation($this->l('usable for sale means that this quantity will be available in shop(s),')); + $this->displayInformation($this->l('otherwise it will be considered reserved (i.e. for other purposes).')); return parent::renderList(); } @@ -150,6 +154,8 @@ class AdminStockManagementControllerCore extends AdminController $last_sm_unit_price_te = Tools::displayPrice((float)$last_sm['price_te'], $last_sm_currency); } + $this->displayInformation($this->l('Note that rolling over the quantity and price fields will give you the details of the last stock movement.')); + // fields in the form $this->fields_form[]['form'] = array( 'legend' => array( diff --git a/themes/default/pdf/lang/fr.php b/themes/default/pdf/lang/fr.php index 24b7027ae..0c3efb2ab 100644 --- a/themes/default/pdf/lang/fr.php +++ b/themes/default/pdf/lang/fr.php @@ -59,17 +59,20 @@ $_LANGPDF['PDF77fd2b4393b379bedd30efcd5df02090'] = 'Remboursement partiel'; $_LANGPDF['PDF66f6e4bbd0a0af1af6b54763871dd280'] = 'Produits commandés :'; $_LANGPDF['PDF63d5049791d9d79d86e9a108b0a999ca'] = 'Référence'; $_LANGPDF['PDFf107f5a9ee4ecea58d0f29ae7959baa8'] = 'Nom'; -$_LANGPDF['PDFc8ba77264f6e923f5ee35abf3108ae7c'] = 'P.U HT'; -$_LANGPDF['PDF9b8362e5321f70746e9cb8f615c28d05'] = 'Prix HT (HR)'; +$_LANGPDF['PDFc8ba77264f6e923f5ee35abf3108ae7c'] = 'Prix unitaire HT'; +$_LANGPDF['PDF3a6a6d37bea2c7567f8599ea88b47930'] = 'Total HT'; +$_LANGPDF['PDF7521172dd37ba56442ea866ac18eb49d'] = 'Avant réduction'; $_LANGPDF['PDF6703aa9936582b4381418f7d523370b4'] = 'Taux de remise'; -$_LANGPDF['PDFa86dc2fff006afd2deb243d7e26b30e7'] = 'Prix HT (RC)'; +$_LANGPDF['PDFa61109b693023aed557445989c517982'] = 'Après réduction'; $_LANGPDF['PDF20a34c4e30c5bbe1d3f870ac55f0d831'] = 'Taux TVA'; $_LANGPDF['PDFfa2ce544158555e8f06c69dd9e681832'] = 'Prix TTC'; $_LANGPDF['PDF716be2c7de31f063369ca297a9928403'] = 'Taxes :'; $_LANGPDF['PDFf4a232c48df10124ee867767a4e7280e'] = 'Base HT'; $_LANGPDF['PDF01a2436b8e3782c1f99e6b26adf901b2'] = 'Montant TVA'; -$_LANGPDF['PDF290612199861c31d1036b185b4e69b75'] = 'Résumé'; +$_LANGPDF['PDF1300f86974cafc2d65eb1f082a26bdf1'] = 'Résumé :'; +$_LANGPDF['PDF9b8362e5321f70746e9cb8f615c28d05'] = 'Prix HT (HR)'; $_LANGPDF['PDF6b9e9f2472786ed1e76005bfc37bc8af'] = 'Remise globale'; +$_LANGPDF['PDFa86dc2fff006afd2deb243d7e26b30e7'] = 'Prix HT (RC)'; $_LANGPDF['PDF699e6bd4690ed3bd5f658052e12aba04'] = 'Montant TVA'; $_LANGPDF['PDF448634536559b1f8aaa975e0aa12b930'] = 'NET A PAYER'; diff --git a/themes/default/pdf/supply-order.tpl b/themes/default/pdf/supply-order.tpl index 3b11915db..86ccbf905 100644 --- a/themes/default/pdf/supply-order.tpl +++ b/themes/default/pdf/supply-order.tpl @@ -85,9 +85,9 @@ {l s='Designation' pdf='true'} {l s='Qty' pdf='true'} {l s='Unit Price TE' pdf='true'} - {l s='Total TE (DE)' pdf='true'} + {l s='Total TE' pdf='true'}
{l s='Before discount' pdf='true'} {l s='Discount Rate' pdf='true'} - {l s='Total TE (DI)' pdf='true'} + {l s='Total TE' pdf='true'}
{l s='After discount' pdf='true'} {l s='Tax rate' pdf='true'} {l s='Total TI' pdf='true'} @@ -137,7 +137,7 @@   - {l s='Summary' pdf='true'} + {l s='Summary:' pdf='true'}
diff --git a/translations/fr/admin.php b/translations/fr/admin.php index c804e15f2..efede7cc6 100644 --- a/translations/fr/admin.php +++ b/translations/fr/admin.php @@ -2321,8 +2321,12 @@ $_LANGADM['AdminStockManagementf548c1f7ba94a7c672abbc78dc236ea8'] = 'Cette inter $_LANGADM['AdminStockManagementff855c1d404cfe05c47734bddd700490'] = 'Via cette interface, vous pouvez ajouter du stock, en retirer, pour un entrepôt donné.'; $_LANGADM['AdminStockManagemente640ce44d221b70af919e80ce80488b7'] = 'Par ailleurs, vous pouvez transférer du stock entre entrepôts, ou au sein d\'un même entrepôt.'; $_LANGADM['AdminStockManagementbeaf85425059adf7675f51b9f0cce075'] = 'Notez que si vous désirez ajouter du stock pour plusieurs produits à la fois, vous pouvez faire une commande fournisseur.'; +$_LANGADM['AdminStockManagement2c74685a249929e916069232de588b4f'] = 'Enfin, il vous sera demandé de spécifier l\'état de la quantité à ajouter :'; +$_LANGADM['AdminStockManagement0ac4fe8defba1ce3edada1f5588f0165'] = '- disponible à la vente'; +$_LANGADM['AdminStockManagementa735244b5bd6fe3c8c5dae3b7307e7f4'] = '- réservée'; $_LANGADM['AdminStockManagement111f0e61a01a90ff0fd023a22c2f7d7d'] = 'Vous devez créer un entrepôt avant d\'ajouter du stock. Voir Stock/Entrepôts.'; $_LANGADM['AdminStockManagement382b0f5185773fa0f67a8ed8056c7759'] = 'N/D'; +$_LANGADM['AdminStockManagementc916bb26289ae7ddf58e2a42f3f4fa2c'] = 'Notez qu\'en survolant les champs quantité et prix, vous aurez les détails du dernier mouvement de stock concernant ce produit, si disponibles.'; $_LANGADM['AdminStockManagementb02c2b70fa9dfb5e023d0d0711da66ee'] = 'Ajouter un produit au stock'; $_LANGADM['AdminStockManagement3dd42bfc8345e82c43b4a40a3426ec49'] = 'Référence : '; $_LANGADM['AdminStockManagement280f1f645a73b062eaa888f0763117d6'] = 'Référence fabriquant : '; @@ -3406,10 +3410,6 @@ $_LANGADM['AdminImport2dc88e28e0f7168a328ddf9cde304444'] = 'Commandes aux fourni $_LANGADM['AdminImport4eb3545dc4d3038f0b8e79e037b17950'] = 'Détails de commandes aux fournisseurs'; $_LANGADM['AdminImportb8495b50f5c172ebad1cc5c615548afa'] = 'Ignorer cette colonne'; $_LANGADM['AdminImport97f08a40f22a625d0cbfe03db3349108'] = 'ID produit'; -$_LANGADM['AdminImportabaebb382cb5980ac3a28e6b7634801f'] = 'Groupe (Nom:Position)'; -$_LANGADM['AdminImport71a336d5333641c567b41a0ea59edb4f'] = 'Position du groupe d\'attribut.'; -$_LANGADM['AdminImport17c9395a749ecae6dfa95e1c899c81ba'] = 'Attribut (Valeur:Position)'; -$_LANGADM['AdminImport6ea61efe688b5afde35e1b11517d0e56'] = 'Position de l\'attribut dans le groupe d\'attribut.'; $_LANGADM['AdminImport63d5049791d9d79d86e9a108b0a999ca'] = 'Référence'; $_LANGADM['AdminImport8284ae5df53e6e7ffc1f2cc67ae68765'] = 'Référence fournisseur'; $_LANGADM['AdminImport52eb5928a34db3e3da7ba52b0644273b'] = 'EAN13'; @@ -3421,7 +3421,6 @@ $_LANGADM['AdminImport694e8d1f2ee056f98ee488bdc4982d73'] = 'Quantité'; $_LANGADM['AdminImport8c489d0946f66d17d73f26366a4bf620'] = 'Poids'; $_LANGADM['AdminImport7a1920d61156abc05a60135aefe8bc67'] = 'Défaut'; $_LANGADM['AdminImport9b93b45649ec5961b8cc84e905964683'] = 'Position de l\'image'; -$_LANGADM['AdminImport9c163d2934fbdd2775356db804d451fc'] = 'Position de l\'image produit à utiliser pour cette déclinaison. Si vous remplissez ce champ, laissez le champ \"URL de l\'image\" vide.'; $_LANGADM['AdminImport427b6d816d7fdd86cabe48d8180a3cc9'] = 'URL de l\'image'; $_LANGADM['AdminImport14913d7e9d486e77b5c8d085e3797f94'] = 'Supprimer les images existantes (0 = non, 1 = oui)'; $_LANGADM['AdminImportb718adec73e04ce3ec720dd11a06a308'] = 'Identifiant'; @@ -3455,11 +3454,9 @@ $_LANGADM['AdminImportb1a2a959c20b1bd847895e73a5fddbc9'] = 'Date d\'ajout d\'un $_LANGADM['AdminImporte1a5e653bc356ed6745d6814d50213eb'] = 'Afficher le prix'; $_LANGADM['AdminImport4d2589e1bcd4263cb99927b59f0f88d2'] = 'URLs des images (x,y,z...)'; $_LANGADM['AdminImportecde3e896afb64e9a48781b8363b9a03'] = 'Caractéristique(Nom:Valeur:Position)'; -$_LANGADM['AdminImport93b145201f52e9210402f4281ff8c188'] = 'Position de la caractéristique'; $_LANGADM['AdminImport71d0ceacdf562024f2d4c3a76d3b63e4'] = 'Uniquement disponible en ligne'; $_LANGADM['AdminImport9e2941b3c81256fac10392aaca4ccfde'] = 'Etat'; $_LANGADM['AdminImportf8a0fa3674c3336359b77bbe8e942a2c'] = 'ID ou nom de la boutique'; -$_LANGADM['AdminImport938159766a881db62185b53e5119b3bd'] = 'Ignorez ce champ si vous n\'utilisez pas la fonction multi-boutique. Si vous laissez ce champ vide, la boutique par défaut sera utilisée'; $_LANGADM['AdminImporta10d0bff85112a2b35f885a38088cd20'] = 'Actif (0/1)'; $_LANGADM['AdminImport3127e7f621d0c85f7db40e56dbec10c3'] = 'ID du Sexe (Mr = 1, Mme = 2, sinon 0)'; $_LANGADM['AdminImportfd90e8dd48a4f75b240cc0f87b1da451'] = 'Email *'; @@ -3469,6 +3466,7 @@ $_LANGADM['AdminImport8340505ddafcba256c7b9b2b8643bffd'] = 'Nom *'; $_LANGADM['AdminImport06f3fb7ee08834bb2e77d55f61c090be'] = 'Prénom *'; $_LANGADM['AdminImportb884d81a33fb67e1d4fe450b3cbde8d6'] = 'Newsletter (0/1)'; $_LANGADM['AdminImport59bb75350cf3a0b65c338572cdc80ef8'] = 'Opt in (0/1)'; +$_LANGADM['AdminImport938159766a881db62185b53e5119b3bd'] = 'Ignorez ce champ si vous n\'utilisez pas la fonction multi-boutique. Si vous laissez ce champ vide, la boutique par défaut sera utilisée'; $_LANGADM['AdminImport01f30cc97564a56c119068478c42c1a6'] = 'Alias *'; $_LANGADM['AdminImportf90e807b74928118048a1a6fa65ebfe5'] = 'Email Client'; $_LANGADM['AdminImport1c76cbfe21c6f44c1d1e59d54f3e4420'] = 'Société';