task #10501: Can use point of sale with different bank accounts
This commit is contained in:
Juanjo Menent
parent
de78d2fb04
commit
f1169e906e
@ -1,6 +1,6 @@
|
||||
--------------------------------------------------------------
|
||||
English Dolibarr ChangeLog
|
||||
$Id: ChangeLog,v 1.424 2011/07/13 14:16:39 eldy Exp $
|
||||
$Id: ChangeLog,v 1.425 2011/07/29 10:55:22 simnandez Exp $
|
||||
--------------------------------------------------------------
|
||||
|
||||
***** ChangeLog for 3.1 compared to 3.0 *****
|
||||
@ -74,6 +74,7 @@ For users:
|
||||
- New: Look: Minor enhancements into agenda view.
|
||||
- New: Look: Nicer tooltips with transparency and shadow.
|
||||
- New: task #11004: Create invoice from intervention.
|
||||
- New: task #10501: Can use point of sale with different bank accounts.
|
||||
- Fix: Better Postgresql compatibility.
|
||||
- Fix: Numbering module for invoices use same number for invoice
|
||||
and credit note if mask is same.
|
||||
|
||||
@ -2,6 +2,7 @@
|
||||
/* Copyright (C) 2007-2008 Jeremie Ollivier <jeremie.o@laposte.net>
|
||||
* Copyright (C) 2008-2010 Laurent Destailleur <eldy@uers.sourceforge.net>
|
||||
* Copyright (C) 2009 Regis Houssin <regis@dolibarr.fr>
|
||||
* 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
|
||||
@ -68,9 +69,9 @@ print '<li class="menu_choix2"><a href=".."><span>'.$langs->trans("BackOffice").
|
||||
|
||||
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("CashDeskBankCash").': '.$bankcashLink.'<br>';
|
||||
print $langs->trans("CashDeskBankCB").': '.$bankcbLink.'<br>';
|
||||
print $langs->trans("CashDeskBankCheque").': '.$bankchequeLink.'<br>';
|
||||
print $langs->trans("CashDeskBankCheque").': '.$bankchequeLink.'<br>';*/
|
||||
if (!empty($_SESSION["CASHDESK_ID_WAREHOUSE"]) && $conf->stock->enabled)
|
||||
{
|
||||
print $langs->trans("CashDeskWarehouse").': '.$warehouseLink;
|
||||
|
||||
@ -2,6 +2,7 @@
|
||||
$langs->load("main");
|
||||
?>
|
||||
<!--Copyright (C) 2007-2008 Jeremie Ollivier <jeremie.o@laposte.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
|
||||
@ -38,10 +39,42 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
}
|
||||
?>
|
||||
<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 echo $obj_facturation->mode_reglement(); ?></td></tr>
|
||||
|
||||
<?php
|
||||
|
||||
<tr><td class="resume_label"><?php echo $langs->trans("PaymentMode"); ?> </td><td>
|
||||
<?php
|
||||
switch ($obj_facturation->mode_reglement())
|
||||
{
|
||||
case 'ESP':
|
||||
echo $langs->trans("Cash");
|
||||
$filtre='courant=2';
|
||||
if (!empty($conf->global->CASHDESK_ID_BANKACCOUNT_CASH))
|
||||
$selected = $conf->global->CASHDESK_ID_BANKACCOUNT_CASH;
|
||||
break;
|
||||
case 'CB':
|
||||
echo $langs->trans("CreditCard");
|
||||
$filtre='courant=1';
|
||||
if (!empty($conf->global->CASHDESK_ID_BANKACCOUNT_CB))
|
||||
$selected = $conf->global->CASHDESK_ID_BANKACCOUNT_CB;
|
||||
break;
|
||||
case 'CHQ':
|
||||
echo $langs->trans("Cheque");
|
||||
$filtre='courant=1';
|
||||
if (!empty($conf->global->CASHDESK_ID_BANKACCOUNT_CHEQUE))
|
||||
$selected = $conf->global->CASHDESK_ID_BANKACCOUNT_CHEQUE;
|
||||
break;
|
||||
case 'DIF':
|
||||
echo $langs->trans("Reported");
|
||||
$filtre='courant=1 OR courant=2';
|
||||
$selected='';
|
||||
break;
|
||||
default:
|
||||
$filtre='courant=1 OR courant=2';
|
||||
$selected='';
|
||||
}
|
||||
|
||||
?>
|
||||
</td></tr>
|
||||
|
||||
<?php
|
||||
// Affichage des infos en fonction du mode de paiement
|
||||
if ( $obj_facturation->mode_reglement() == 'DIF' ) {
|
||||
|
||||
@ -66,7 +99,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
|
||||
<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
|
||||
echo $langs->trans("BankToPay"). "<br>";
|
||||
$html = new Form($db);
|
||||
$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>
|
||||
|
||||
<span><input class="bouton_validation" type="submit" name="btnValider" value="<?php echo $langs->trans("ValidateInvoice"); ?>" /></span>
|
||||
|
||||
@ -1246,9 +1246,9 @@ ClickToDialDesc=Aquest mòdul permet afegir una icona després del número de te
|
||||
CashDesk=TPV
|
||||
CashDeskSetup=Mòdul de configuració Terminal Punt de Venda
|
||||
CashDeskThirdPartyForSell=Tercer genéric a utilitzar per a les vendes
|
||||
CashDeskBankAccountForSell=Compte a utilitzar per als cobraments en efectiu (caixa)
|
||||
CashDeskBankAccountForCheque=Compte a utilitzar per als cobraments amb xecs
|
||||
CashDeskBankAccountForCB=Compte a utilitzar per als cobraments amb targeta de crèdit
|
||||
CashDeskBankAccountForSell=Compte per defecte a utilitzar per als cobraments en efectiu (caixa)
|
||||
CashDeskBankAccountForCheque=Compte per defecte a utilitzar per als cobraments amb xecs
|
||||
CashDeskBankAccountForCB=Compte per defecte a utilitzar per als cobraments amb targeta de crèdit
|
||||
CashDeskIdWareHouse=Magatzem a ultilitzar per a les vendes
|
||||
##### Bookmark #####
|
||||
BookmarkSetup=Configuració del mòdul Bookmark
|
||||
|
||||
@ -355,7 +355,7 @@ ShowUnpaidAll=Mostrar tots els pendents
|
||||
ShowUnpaidLateOnly=Mostrar els pendents en retard només
|
||||
PaymentInvoiceRef=Pagament factura %s
|
||||
ValidateInvoice=Validar factura
|
||||
Cash=Líquid
|
||||
Cash=Efectiu
|
||||
Reported=Ajornat
|
||||
InvoiceDeposit=Factura de bestreta
|
||||
InvoiceDepositAsk=Factura de bestreta
|
||||
|
||||
@ -31,4 +31,5 @@ TotalTicket=Total ticket
|
||||
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
|
||||
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
|
||||
@ -1236,9 +1236,9 @@ ClickToDialDesc=This module allows to add an icon after phone numbers. A click o
|
||||
CashDesk=Point of sales
|
||||
CashDeskSetup=Point of sales module setup
|
||||
CashDeskThirdPartyForSell=Generic third party to use for sells
|
||||
CashDeskBankAccountForSell=Account to use to receive cash payments
|
||||
CashDeskBankAccountForCheque= Account to use to receive payments by cheque
|
||||
CashDeskBankAccountForCB= Account to use to receive cash payments by credit cards
|
||||
CashDeskBankAccountForSell=Default account to use to receive cash payments
|
||||
CashDeskBankAccountForCheque= Default account to use to receive payments by cheque
|
||||
CashDeskBankAccountForCB= Default account to use to receive cash payments by credit cards
|
||||
CashDeskIdWareHouse=Warehouse to use for sells
|
||||
##### Bookmark #####
|
||||
BookmarkSetup=Bookmark module setup
|
||||
|
||||
@ -31,4 +31,5 @@ TotalTicket=Total ticket
|
||||
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
|
||||
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
|
||||
@ -1246,9 +1246,9 @@ ClickToDialDesc=Este módulo permite agregar un icono después del número de te
|
||||
CashDesk=TPV
|
||||
CashDeskSetup=Configuración del módulo Terminal Punto de Venta
|
||||
CashDeskThirdPartyForSell=Tercero genérico a usar para la venta
|
||||
CashDeskBankAccountForSell=Cuenta a utilizar para los cobros en efectivo (caja)
|
||||
CashDeskBankAccountForCheque=Cuenta a utilizar para los cobros con cheques
|
||||
CashDeskBankAccountForCB=Cuenta a utilizar para los cobros con tarjeta de crédito
|
||||
CashDeskBankAccountForSell=Cuenta por defecto a utilizar para los cobros en efectivo (caja)
|
||||
CashDeskBankAccountForCheque=Cuenta por defecto a utilizar para los cobros con cheques
|
||||
CashDeskBankAccountForCB=Cuenta por defecto a utilizar para los cobros con tarjeta de crédito
|
||||
CashDeskIdWareHouse=Almacén a utilizar para las ventas
|
||||
##### Bookmark #####
|
||||
BookmarkSetup=Configuración del módulo Marcadores
|
||||
|
||||
@ -355,7 +355,7 @@ ShowUnpaidAll=Mostrar todos los pendientes
|
||||
ShowUnpaidLateOnly=Mostrar los pendientes en retraso solamente
|
||||
PaymentInvoiceRef=Pago factura %s
|
||||
ValidateInvoice=Validar factura
|
||||
Cash=Líquido
|
||||
Cash=Efectivo
|
||||
Reported=Aplazado
|
||||
InvoiceDeposit=Factura de anticipo
|
||||
InvoiceDepositAsk=Factura de anticipo
|
||||
|
||||
@ -31,4 +31,5 @@ TotalTicket=Total ticket
|
||||
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
|
||||
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
|
||||
@ -1248,9 +1248,9 @@ ClickToDialDesc= Ce module permet d'ajouter un petit picto à côté des numéro
|
||||
CashDesk=Caisse enregistreuse
|
||||
CashDeskSetup= Configuration du module Point de vente/caisse enregistreuse
|
||||
CashDeskThirdPartyForSell= Tiers générique à utiliser pour les ventes
|
||||
CashDeskBankAccountForSell= Compte à utiliser pour l'encaissement en liquide (cash)
|
||||
CashDeskBankAccountForCheque= Compte à utiliser pour l'encaissement en chèque
|
||||
CashDeskBankAccountForCB= Compte à utiliser pour l'encaissement par carte de crédit
|
||||
CashDeskBankAccountForSell= Compte par défaut à utiliser pour l'encaissement en liquide (cash)
|
||||
CashDeskBankAccountForCheque= Compte par défaut à utiliser pour l'encaissement en chèque
|
||||
CashDeskBankAccountForCB= Compte par défaut à utiliser pour l'encaissement par carte de crédit
|
||||
CashDeskIdWareHouse= Entrepôt à utiliser pour les ventes
|
||||
##### Bookmark #####
|
||||
BookmarkSetup= Configuration du module Bookmark
|
||||
|
||||
@ -31,4 +31,5 @@ TotalTicket=Total ticket
|
||||
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.
|
||||
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
|
||||
Loading…
Reference in New Issue
Block a user