lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

task #10501: Can use point of sale with different bank accounts

Browse Source
This commit is contained in:
Juanjo Menent 2011-07-29 10:49:58 +00:00
parent 7c2d6d646a
commit 4f444c1ea6
6 changed files with 16 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/cashdesk/tpl/menu.tpl.php
View File

@ -65,7 +65,7 @@ print '<div class="menu_bloc">';
print '<ul class="menu">';
print '<li class="menu_choix1"><a href="affIndex.php?menu=facturation&id=NOUV"><span>'.$langs->trans("NewSell").'</span></a></li>';
print '<li class="menu_choix2"><a href="deconnexion.php"><span>'.$langs->trans("BackOffice").'</span></a></li>';
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>';

21
htdocs/cashdesk/tpl/validation1.tpl.php
View File

@ -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>

4
htdocs/langs/ca_ES/cashdesk.lang
View File

@ -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
BankToPay=Compte de cobrament

4
htdocs/langs/en_US/cashdesk.lang
View File

@ -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
BankToPay=Charge Account

4
htdocs/langs/es_ES/cashdesk.lang
View File

@ -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
BankToPay=Cuenta de cobro

4
htdocs/langs/fr_FR/cashdesk.lang
View File

@ -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
BankToPay=Compte à créditer