Cashdesk: Missing translation

htdocs/cashdesk/index_verif.php

@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2007-2008 Jeremie Ollivier    <jeremie.o@laposte.net>
  * Copyright (C) 2008-2010 Laurent Destailleur <eldy@uers.sourceforge.net>
+ * Copyright (C) 2011	   Juanjo Menent	   <jmenent@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -28,12 +29,10 @@ $langs->load("main");
 $langs->load("admin");
 $langs->load("cashdesk");
 
-$username = $_POST['txtUsername'];
+$username = GETPOST("txtUsername");
-$password = $_POST['pwdPassword'];
+$password = GETPOST("pwdPassword");
-$thirdpartyid = isset($_POST['socid'])?$_POST['socid']:$conf->global->CASHDESK_ID_THIRDPARTY;
+$thirdpartyid = (GETPOST("socid")!='')?GETPOST("socid"):$conf->global->CASHDESK_ID_THIRDPARTY;
-$warehouseid = isset($_POST['warehouseid'])?$_POST['warehouseid']:$conf->global->CASHDESK_ID_WAREHOUSE;
+$warehouseid = (GETPOST("warehouseid")!='')?GETPOST("warehouseid"):$conf->global->CASHDESK_ID_WAREHOUSE;
-
-$error = '';
 
 // Check username
 if (empty($username))
@@ -51,17 +50,18 @@ if (! ($thirdpartyid > 0))
 }
 
 // If we setup stock module to ask movement on invoices, we must not allow access if required setup not finished.
-if ($conf->stock->enabled && $conf->global->STOCK_CALCULATE_ON_BILL && ! ($warehouseid > 0))
+if ($conf->stock->enabled && $conf->global->STOCK_CALCULATE_ON_BILL &&  ! ($warehouseid > 0))
 {
-	$retour=$langs->trans("You ask to decrease stock on invoice creation but warehouse for this is was not defined (Change stock module setup, or choose a warehouse).");
+	$retour=$langs->trans("CashDeskSetupStock");
 	header ('Location: '.DOL_URL_ROOT.'/cashdesk/index.php?err='.urlencode($retour).'&user='.$username);
 	exit;
 }
 
 if (! empty($_POST['txtUsername']) && $conf->banque->enabled && (empty($conf_fkaccount_cash) || empty($conf_fkaccount_cheque) || empty($conf_fkaccount_cb)))
 {
-//  $error.= '<div class="error"></div>';
+	$langs->load("errors");
-    header("Location: index.php?err=".urlencode('Setup of Point of Sale module not complete. Bank account not defined').'&user='.$username);
+	$retour=$langs->trans("ErrorModuleSetupNotComplete");
+    header ('Location: '.DOL_URL_ROOT.'/cashdesk/index.php?err='.urlencode($retour).'&user='.$username);
     exit;
 }
 

htdocs/cashdesk/tpl/facturation1.tpl.php

@@ -64,7 +64,7 @@ $Id$
 								$label = $tab_designations[$i]['label'];
 
 								print '<option '.$selected.' value="'.$tab_designations[$i]['rowid'].'">'.$tab_designations[$i]['ref'].' - '.dol_trunc($label,28,'middle');
-								if ($conf->stock->enabled && !empty($conf_fkentrepot)) print ' ('.$langs->trans("CashDeskWarehouse").': '.$tab_designations[$i]['reel'].')';
+								if ($conf->stock->enabled && !empty($conf_fkentrepot)) print ' ('.$langs->trans("CashDeskStock").': '.$tab_designations[$i]['reel'].')';
 								print '</option>'."\n				";
 
 							}
@@ -82,7 +82,7 @@ $Id$
 								$label = $tab_designations[$i]['label'];
 
 								print '<option '.$selected.' value="'.$tab_designations[$i]['rowid'].'">'.$tab_designations[$i]['ref'].' - '.dol_trunc($label,28,'middle');
-								if ($conf->stock->enabled && !empty($conf_fkentrepot)) print ' ('.$langs->trans("CashDeskWarehouse").': '.(empty($tab_designations[$i]['reel'])?0:$tab_designations[$i]['reel']).')';
+								if ($conf->stock->enabled && !empty($conf_fkentrepot)) print ' ('.$langs->trans("CashDeskStock").': '.(empty($tab_designations[$i]['reel'])?0:$tab_designations[$i]['reel']).')';
 								print '</option>'."\n				";
 
 							}

htdocs/langs/ca_ES/cashdesk.lang

@@ -9,6 +9,7 @@ CashDeskBankCB=Compte bancari (targetes)
 CashDeskBankCheque=Compte bancari (xecs)
 CashDeskWarehouse=Magatzem
 CashDeskProducts=Productes
+CashDeskStock=Estoc
 CashDeskOn=de
 CashDeskThirdParty=Tercer
 ShoppingCart=Cistella
@@ -28,4 +29,5 @@ Article=Article
 Difference=Diferència
 TotalTicket=Total ticket
 Change=Canvi
-CalTip=Feu clic per veure el calendari
+CalTip=Feu clic per veure el calendari
+CashDeskSetupStock=La configuració decrementa l'estoc en la creació de factures, però no ha indicat magatzem.<br>Canvieu la configuració del mòdul estoc, o esculli un magatzem

htdocs/langs/en_US/cashdesk.lang

@@ -9,6 +9,7 @@ CashDeskBankCB=Bank account (card)
 CashDeskBankCheque=Bank account (cheque)
 CashDeskWarehouse=Warehouse
 CashDeskProducts=Products
+CashDeskStock=Stock
 CashDeskOn=on
 CashDeskThirdParty=Third party
 ShoppingCart=Shopping cart
@@ -28,4 +29,5 @@ Article=Article
 Difference=Difference
 TotalTicket=Total ticket
 Change=Excess received
-CalTip=Click to view the calendar
+CalTip=Click to view the calendar
+CashDeskSetupStock=You ask to decrease stock on invoice creation but warehouse for this is was not defined<br>Change stock module setup, or choose a warehouse

htdocs/langs/es_ES/cashdesk.lang

@@ -9,6 +9,7 @@ CashDeskBankCB=Cuenta bancaria (tarjetas)
 CashDeskBankCheque=Cuenta bancaria (cheques)
 CashDeskWarehouse=Almacén
 CashDeskProducts=Productos
+CashDeskStock=Stock
 CashDeskOn=de
 CashDeskThirdParty=Tercero
 ShoppingCart=Cesta
@@ -28,4 +29,5 @@ Article=Artículo
 Difference=Diferencia
 TotalTicket=Total ticket
 Change=Cambio
-CalTip=Haga clic para ver el calendario
+CalTip=Haga clic para ver el calendario
+CashDeskSetupStock=La configuración decrementa el stock en la creación de facturas, pero no ha indicado almacén.<br>Cambie la configuración del módulo stock, o escoja un almacén

htdocs/langs/fr_FR/cashdesk.lang

@@ -9,6 +9,7 @@ CashDeskBankCB=Compte bancaire (cartes)
 CashDeskBankCheque=Compte bancaire (chèques)
 CashDeskWarehouse=Entrepôt
 CashDeskProducts=Produits
+CashDeskStock=Stock
 CashDeskOn=de
 CashDeskThirdParty=Tiers
 ShoppingCart=Panier
@@ -28,4 +29,5 @@ Article=Article
 Difference=Difference
 TotalTicket=Total ticket
 Change=Trop perçu
-CalTip=Cliquez pour afficher le calendrier
+CalTip=Cliquez pour afficher le calendrier
+CashDeskSetupStock=Le conf. diminue le stock lors la création de factures, mais vous ne spécifiez pas entrepôt .<br>Vous devez modifier la conf. du module de stock, ou vous choisissez un entrepôt