From 516a619103766be7450decca12a9f47e25425e1a Mon Sep 17 00:00:00 2001
From: Juanjo Menent <jmenent@2byte.es>
Date: Fri, 29 Jul 2011 10:49:58 +0000
Subject: [PATCH] task #10501: Can use point of sale with different bank
 accounts

---
 htdocs/cashdesk/tpl/menu.tpl.php        | 13 ++++++-------
 htdocs/cashdesk/tpl/validation1.tpl.php | 21 +++++++++++----------
 htdocs/langs/ca_ES/cashdesk.lang        |  4 +---
 htdocs/langs/en_US/cashdesk.lang        |  4 +---
 htdocs/langs/es_ES/cashdesk.lang        |  4 +---
 htdocs/langs/fr_FR/cashdesk.lang        |  4 +---
 6 files changed, 21 insertions(+), 29 deletions(-)

diff --git a/htdocs/cashdesk/tpl/menu.tpl.php b/htdocs/cashdesk/tpl/menu.tpl.php
index 8b82c9f8249..2ab0515e6ab 100644
--- a/htdocs/cashdesk/tpl/menu.tpl.php
+++ b/htdocs/cashdesk/tpl/menu.tpl.php
@@ -15,7 +15,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 include_once(DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php');
@@ -62,13 +63,11 @@ $logout='<img class="login" border="0" src="'.DOL_URL_ROOT.'/theme/'.$conf->them
 
 print '<div class="menu_bloc">';
 print '<ul class="menu">';
-// Link to new sell
 print '<li class="menu_choix1"><a href="affIndex.php?menu=facturation&id=NOUV"><span>'.$langs->trans("NewSell").'</span></a></li>';
-// Open new tab on backoffice (this is not a disconnect from POS)
-print '<li class="menu_choix2"><a href=".." target="backoffice"><span>'.$langs->trans("BackOffice").'</span></a></li>';
-// Disconnect
-print '<li class="menu_choix0">'.$langs->trans("User").': '.$_SESSION['prenom'].' '.$_SESSION['nom'];
-print ' <a href="deconnexion.php">'.$logout.'</a><br>';
+
+print '<li class="menu_choix2"><a href=".."><span>'.$langs->trans("BackOffice").'</span></a></li>';
+
+print '<li class="menu_choix0">'.$langs->trans("User").': '.$_SESSION['prenom'].' '.$_SESSION['nom'].' <a href="deconnexion.php">'.$logout.'</a><br>';
 print $langs->trans("CashDeskThirdParty").': '.$companyLink.'<br>';
 /*print $langs->trans("CashDeskBankCash").': '.$bankcashLink.'<br>';
 print $langs->trans("CashDeskBankCB").': '.$bankcbLink.'<br>';
diff --git a/htdocs/cashdesk/tpl/validation1.tpl.php b/htdocs/cashdesk/tpl/validation1.tpl.php
index b18bf124ae4..f3a440b4929 100644
--- a/htdocs/cashdesk/tpl/validation1.tpl.php
+++ b/htdocs/cashdesk/tpl/validation1.tpl.php
@@ -15,7 +15,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 -->
 <fieldset class="cadre_facturation"><legend class="titre1"><?php echo $langs->trans("Summary"); ?></legend>
 
@@ -39,9 +40,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 		?>
 		<tr><td class="resume_label"><?php echo $langs->trans("TotalTTC"); ?> </td><td><?php echo price2num($obj_facturation->prix_total_ttc(),'MT').' '.$conf->monnaie; ?></td></tr>
 		<tr><td class="resume_label"><?php echo $langs->trans("PaymentMode"); ?> </td><td>
-		<?php
+		<?php 
 		switch ($obj_facturation->mode_reglement())
-		{
+		{	
 			case 'ESP':
 				echo $langs->trans("Cash");
 				$filtre='courant=2';
@@ -52,7 +53,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 				echo $langs->trans("CreditCard");
 				$filtre='courant=1';
 				if (!empty($conf->global->CASHDESK_ID_BANKACCOUNT_CB))
-					$selected = $conf->global->CASHDESK_ID_BANKACCOUNT_CB;
+					$selected = $conf->global->CASHDESK_ID_BANKACCOUNT_CB;		
 				break;
 			case 'CHQ':
 				echo $langs->trans("Cheque");
@@ -64,16 +65,16 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 				echo $langs->trans("Reported");
 				$filtre='courant=1 OR courant=2';
 				$selected='';
-				break;
+				break;	
 			default:
 				$filtre='courant=1 OR courant=2';
 				$selected='';
 		}
-
+			
 		?>
 		</td></tr>
-
-		<?php
+		
+		<?php 	
 			// Affichage des infos en fonction du mode de paiement
 			if ( $obj_facturation->mode_reglement() == 'DIF' ) {
 
@@ -99,10 +100,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 	<form id="frmValidation" class="formulaire2" method="post" action="validation_verif.php?action=valide_facture">
 		<input type="hidden" name="token" value="<?php echo $_SESSION['newtoken']; ?>" />
 		<p class="note_label">
-			<?php
+			<?php	
 				echo $langs->trans("BankToPay"). "<br>";
 				$html = new Form($db);
-				$html->select_comptes($selected,'cashdeskbank',0,$filtre);
+				$html->select_comptes($selected,'cashdeskbank',0,$filtre);		
 			?>
 		</p>
 		<p class="note_label"><?php echo $langs->trans("Notes"); ?><br><textarea class="textarea_note" name="txtaNotes"></textarea></p>
diff --git a/htdocs/langs/ca_ES/cashdesk.lang b/htdocs/langs/ca_ES/cashdesk.lang
index 961d8193949..362ac317408 100755
--- a/htdocs/langs/ca_ES/cashdesk.lang
+++ b/htdocs/langs/ca_ES/cashdesk.lang
@@ -32,6 +32,4 @@ NoVAT=Sense IVA per aquesta venda
 Change=Canvi
 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
-BankToPay=Compte de cobrament
-ShowCompany=Veure empresa
-ShowStock=Veure magatzem
\ No newline at end of file
+BankToPay=Compte de cobrament
\ No newline at end of file
diff --git a/htdocs/langs/en_US/cashdesk.lang b/htdocs/langs/en_US/cashdesk.lang
index e335b0f7941..1b764a3aeda 100755
--- a/htdocs/langs/en_US/cashdesk.lang
+++ b/htdocs/langs/en_US/cashdesk.lang
@@ -32,6 +32,4 @@ NoVAT=No VAT for this sale
 Change=Excess received
 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
-BankToPay=Charge Account
-ShowCompany=Show company
-ShowStock=Show warehouse
\ No newline at end of file
+BankToPay=Charge Account
\ No newline at end of file
diff --git a/htdocs/langs/es_ES/cashdesk.lang b/htdocs/langs/es_ES/cashdesk.lang
index 0e2d2bcf390..e1ade767e8f 100755
--- a/htdocs/langs/es_ES/cashdesk.lang
+++ b/htdocs/langs/es_ES/cashdesk.lang
@@ -32,6 +32,4 @@ NoVAT=Sin IVA en esta venta
 Change=Cambio
 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
-BankToPay=Cuenta de cobro
-ShowCompany=Ver empresa
-ShowStock=Ver almacén
\ No newline at end of file
+BankToPay=Cuenta de cobro
\ No newline at end of file
diff --git a/htdocs/langs/fr_FR/cashdesk.lang b/htdocs/langs/fr_FR/cashdesk.lang
index 6e03cc886eb..692fb7ad834 100755
--- a/htdocs/langs/fr_FR/cashdesk.lang
+++ b/htdocs/langs/fr_FR/cashdesk.lang
@@ -32,6 +32,4 @@ NoVAT=Pas de TVA pour cette vente
 Change=Rendu
 CalTip=Cliquez pour afficher le calendrier
 CashDeskSetupStock=La configuration du module stock demande une réduction du stock sur facturation, mais vous n'avez pas spécifiez d'entrepôt. Vous devez modifier la configuration du module stock ou choisir un entrepôt.
-BankToPay=Compte à créditer
-ShowCompany=Voir société
-ShowStock=Voir entrepôt
\ No newline at end of file
+BankToPay=Compte à créditer
\ No newline at end of file