Cashdesk: Missing translation
This commit is contained in:
parent
de3d328036
commit
5c60df6b2a
@ -1,6 +1,7 @@
|
|||||||
<?php
|
<?php
|
||||||
/* Copyright (C) 2007-2008 Jeremie Ollivier <jeremie.o@laposte.net>
|
/* Copyright (C) 2007-2008 Jeremie Ollivier <jeremie.o@laposte.net>
|
||||||
* Copyright (C) 2008-2010 Laurent Destailleur <eldy@uers.sourceforge.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
|
* 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
|
* 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("admin");
|
||||||
$langs->load("cashdesk");
|
$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
|
// Check username
|
||||||
if (empty($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 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);
|
header ('Location: '.DOL_URL_ROOT.'/cashdesk/index.php?err='.urlencode($retour).'&user='.$username);
|
||||||
exit;
|
exit;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (! empty($_POST['txtUsername']) && $conf->banque->enabled && (empty($conf_fkaccount_cash) || empty($conf_fkaccount_cheque) || empty($conf_fkaccount_cb)))
|
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;
|
exit;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -64,7 +64,7 @@ $Id$
|
|||||||
$label = $tab_designations[$i]['label'];
|
$label = $tab_designations[$i]['label'];
|
||||||
|
|
||||||
print '<option '.$selected.' value="'.$tab_designations[$i]['rowid'].'">'.$tab_designations[$i]['ref'].' - '.dol_trunc($label,28,'middle');
|
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 ";
|
print '</option>'."\n ";
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -82,7 +82,7 @@ $Id$
|
|||||||
$label = $tab_designations[$i]['label'];
|
$label = $tab_designations[$i]['label'];
|
||||||
|
|
||||||
print '<option '.$selected.' value="'.$tab_designations[$i]['rowid'].'">'.$tab_designations[$i]['ref'].' - '.dol_trunc($label,28,'middle');
|
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 ";
|
print '</option>'."\n ";
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -9,6 +9,7 @@ CashDeskBankCB=Compte bancari (targetes)
|
|||||||
CashDeskBankCheque=Compte bancari (xecs)
|
CashDeskBankCheque=Compte bancari (xecs)
|
||||||
CashDeskWarehouse=Magatzem
|
CashDeskWarehouse=Magatzem
|
||||||
CashDeskProducts=Productes
|
CashDeskProducts=Productes
|
||||||
|
CashDeskStock=Estoc
|
||||||
CashDeskOn=de
|
CashDeskOn=de
|
||||||
CashDeskThirdParty=Tercer
|
CashDeskThirdParty=Tercer
|
||||||
ShoppingCart=Cistella
|
ShoppingCart=Cistella
|
||||||
@ -29,3 +30,4 @@ Difference=Diferència
|
|||||||
TotalTicket=Total ticket
|
TotalTicket=Total ticket
|
||||||
Change=Canvi
|
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
|
||||||
@ -9,6 +9,7 @@ CashDeskBankCB=Bank account (card)
|
|||||||
CashDeskBankCheque=Bank account (cheque)
|
CashDeskBankCheque=Bank account (cheque)
|
||||||
CashDeskWarehouse=Warehouse
|
CashDeskWarehouse=Warehouse
|
||||||
CashDeskProducts=Products
|
CashDeskProducts=Products
|
||||||
|
CashDeskStock=Stock
|
||||||
CashDeskOn=on
|
CashDeskOn=on
|
||||||
CashDeskThirdParty=Third party
|
CashDeskThirdParty=Third party
|
||||||
ShoppingCart=Shopping cart
|
ShoppingCart=Shopping cart
|
||||||
@ -29,3 +30,4 @@ Difference=Difference
|
|||||||
TotalTicket=Total ticket
|
TotalTicket=Total ticket
|
||||||
Change=Excess received
|
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
|
||||||
@ -9,6 +9,7 @@ CashDeskBankCB=Cuenta bancaria (tarjetas)
|
|||||||
CashDeskBankCheque=Cuenta bancaria (cheques)
|
CashDeskBankCheque=Cuenta bancaria (cheques)
|
||||||
CashDeskWarehouse=Almacén
|
CashDeskWarehouse=Almacén
|
||||||
CashDeskProducts=Productos
|
CashDeskProducts=Productos
|
||||||
|
CashDeskStock=Stock
|
||||||
CashDeskOn=de
|
CashDeskOn=de
|
||||||
CashDeskThirdParty=Tercero
|
CashDeskThirdParty=Tercero
|
||||||
ShoppingCart=Cesta
|
ShoppingCart=Cesta
|
||||||
@ -29,3 +30,4 @@ Difference=Diferencia
|
|||||||
TotalTicket=Total ticket
|
TotalTicket=Total ticket
|
||||||
Change=Cambio
|
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
|
||||||
@ -9,6 +9,7 @@ CashDeskBankCB=Compte bancaire (cartes)
|
|||||||
CashDeskBankCheque=Compte bancaire (chèques)
|
CashDeskBankCheque=Compte bancaire (chèques)
|
||||||
CashDeskWarehouse=Entrepôt
|
CashDeskWarehouse=Entrepôt
|
||||||
CashDeskProducts=Produits
|
CashDeskProducts=Produits
|
||||||
|
CashDeskStock=Stock
|
||||||
CashDeskOn=de
|
CashDeskOn=de
|
||||||
CashDeskThirdParty=Tiers
|
CashDeskThirdParty=Tiers
|
||||||
ShoppingCart=Panier
|
ShoppingCart=Panier
|
||||||
@ -29,3 +30,4 @@ Difference=Difference
|
|||||||
TotalTicket=Total ticket
|
TotalTicket=Total ticket
|
||||||
Change=Trop perçu
|
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
|
||||||
Loading…
Reference in New Issue
Block a user