diff --git a/htdocs/cashdesk/affIndex.php b/htdocs/cashdesk/affIndex.php index ea0f27ae0e0..8c2f16e6400 100644 --- a/htdocs/cashdesk/affIndex.php +++ b/htdocs/cashdesk/affIndex.php @@ -58,7 +58,7 @@ print '
'."\n"; print '
'."\n"; print '
'."\n"; -print '

CAISSE

'."\n"; +print '

POINT OF SALE

'."\n"; print '
'."\n"; include_once('templates/menu.tpl.php'); diff --git a/htdocs/cashdesk/include/environnement.php b/htdocs/cashdesk/include/environnement.php index 71b922551a4..873c283a38b 100644 --- a/htdocs/cashdesk/include/environnement.php +++ b/htdocs/cashdesk/include/environnement.php @@ -57,13 +57,12 @@ if ($conf->banque->enabled && (empty($conf_fkaccount_cash) || empty($conf_fkacco { $error.= '
Setup of CashDesk module not complete. Bank account not defined
'; } -// TODO: ajouter gestion entrepot -/* -if ($conf->stock->enabled && empty($conf_fkentrepot)) +// If we setup stock module to ask movement on invoices, with must not work if required setup not finished. +if ($conf->stock->enabled && $conf->global->STOCK_CALCULATE_ON_BILL && empty($conf_fkentrepot)) { - $error.= '
Setup of CashDesk module not complete. Warehouse not defined
'; + $error.= '
Setup of CashDesk module not complete. Warehouse (for stock decrease on invoice) is not defined
'; } -*/ + // Parametres d'affichage $conf_taille_listes = 200; // Nombre max de lignes a afficher dans les listes $conf_nbr_car_listes = 60; // Nombre max de caracteres par ligne dans les listes diff --git a/htdocs/cashdesk/templates/menu.tpl.php b/htdocs/cashdesk/templates/menu.tpl.php index 002d477ddfd..eaacb3283ab 100644 --- a/htdocs/cashdesk/templates/menu.tpl.php +++ b/htdocs/cashdesk/templates/menu.tpl.php @@ -1,6 +1,6 @@ - * Copyright (C) 2008 Laurent Destailleur + * Copyright (C) 2008-2009 Laurent Destailleur * Copyright (C) 2009 Regis Houssin * * This program is free software; you can redistribute it and/or modify @@ -46,15 +46,13 @@ if (!empty($conf->global->CASHDESK_ID_BANKACCOUNT_CHEQUE)) $bankcheque->fetch($conf->global->CASHDESK_ID_BANKACCOUNT_CHEQUE); $bankchequeLink = $bankcheque->getNomUrl(1); } -// TODO: ajouter gestion entrepot -/* -if (!empty($conf->global->CASHDESK_ID_WAREHOUSE)) +if (!empty($conf->global->CASHDESK_ID_WAREHOUSE) && $conf->stock->enabled) { $warehouse=new Entrepot($db); $warehouse->fetch($conf->global->CASHDESK_ID_WAREHOUSE); $warehouseLink = $warehouse->getNomUrl(1); } -*/ + $langs->load("@cashdesk"); $langs->load("main"); @@ -67,14 +65,14 @@ print '
  • < print '
  • '.$langs->trans("BackOffice").'
    • '; -print '
  • '.$langs->trans("User").' : '.$_SESSION['prenom'].' '.$_SESSION['nom'].' '.$logout.'
    '; -print $langs->trans("CashDeskThirdParty").' : '.$companyLink.'
    '; -print $langs->trans("CashDeskBankCash").' : '.$bankcashLink.'
    '; -print $langs->trans("CashDeskBankCB").' : '.$bankcbLink.'
    '; -print $langs->trans("CashDeskBankCheque").' : '.$bankchequeLink.'
    '; -if ($conf->stock->enabled && $warehouse->id) // Disabled because warehouse->fetch disabled before +print '
  • '.$langs->trans("User").': '.$_SESSION['prenom'].' '.$_SESSION['nom'].' '.$logout.'
    '; +print $langs->trans("CashDeskThirdParty").': '.$companyLink.'
    '; +print $langs->trans("CashDeskBankCash").': '.$bankcashLink.'
    '; +print $langs->trans("CashDeskBankCB").': '.$bankcbLink.'
    '; +print $langs->trans("CashDeskBankCheque").': '.$bankchequeLink.'
    '; +if (!empty($conf->global->CASHDESK_ID_WAREHOUSE) && $conf->stock->enabled) { - print $langs->trans("CashDeskWarehouse").' : '.$warehouseLink; + print $langs->trans("CashDeskWarehouse").': '.$warehouseLink; } print '
    • '; print '
    '; diff --git a/htdocs/cashdesk/templates/validation2.tpl.php b/htdocs/cashdesk/templates/validation2.tpl.php index be488cc8c57..339626c45f9 100644 --- a/htdocs/cashdesk/templates/validation2.tpl.php +++ b/htdocs/cashdesk/templates/validation2.tpl.php @@ -37,6 +37,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

    trans("ShowInvoice"); ?>

    +

    trans("PrintTicket"); ?>

    diff --git a/htdocs/cashdesk/validation_verif.php b/htdocs/cashdesk/validation_verif.php index 7c526d3bd87..5a07df57773 100644 --- a/htdocs/cashdesk/validation_verif.php +++ b/htdocs/cashdesk/validation_verif.php @@ -81,10 +81,12 @@ switch ( $_GET['action'] ) case 'valide_facture': - + + $now=dol_now('tzserver'); + // Recuperation de la date et de l'heure - $date = date ('Y-m-d'); - $heure = date ('H:i:s'); + $date = dol_print_date($now,'day'); + $heure = dol_print_date($now,'hour'); $note = ''; if (! is_object($obj_facturation)) @@ -125,7 +127,6 @@ switch ( $_GET['action'] ) $error=0; - $now=dol_now('tzserver'); $db->begin(); @@ -183,7 +184,8 @@ switch ( $_GET['action'] ) $invoiceline=new FactureLigne($db); $invoiceline->fk_product=$tab_liste[$i]['fk_article']; $invoiceline->desc=$tab_article['label']; - $invoiceline->tva_tx=$tab_tva['taux']; + $invoiceline->tva_tx=empty($tab_tva['taux'])?0:$tab_tva['taux']; // works even if vat_rate is '' + //$invoiceline->tva_tx=$tab_tva['taux']; $invoiceline->qty=$tab_liste[$i]['qte']; $invoiceline->remise_percent=$tab_liste[$i]['remise_percent']; $invoiceline->price=$tab_article['price']; @@ -209,93 +211,107 @@ switch ( $_GET['action'] ) // Si paiement differe ... if ( $obj_facturation->mode_reglement() == 'DIF' ) { - $result=$invoice->create($user,0,dol_stringtotime($obj_facturation->paiement_le())); - $result=$invoice->set_valid($user,$conf_fksoc,$obj_facturation->num_facture()); - + $resultcreate=$invoice->create($user,0,dol_stringtotime($obj_facturation->paiement_le())); + if ($resultcreate > 0) + { + $resultvalid=$invoice->set_valid($user,$conf_fksoc,$obj_facturation->num_facture()); + } + else + { + $error++; + } + $id = $invoice->id; } else { - $result=$invoice->create($user,0,0); - $result=$invoice->set_valid($user,$conf_fksoc,$obj_facturation->num_facture()); - - $id = $invoice->id; - - // Add the payment - $payment=new Paiement($db); - $payment->datepaye=$now; - $payment->bank_account=$conf_fkaccount; - $payment->amounts[$invoice->id]=$obj_facturation->prix_total_ttc(); - $payment->note=$langs->trans("Payment").' '.$langs->trans("Invoice").' '.$obj_facturation->num_facture(); - $payment->paiementid=$invoice->mode_reglement_id; - $payment->num_paiement=''; - - $paiement_id = $payment->create($user); - if ($paiement_id > 0) + $resultcreate=$invoice->create($user,0,0); + if ($resultcreate > 0) { - // Ajout d'une ecriture sur le compte bancaire - if ($conf->banque->enabled) + $resultvalid=$invoice->set_valid($user,$conf_fksoc,$obj_facturation->num_facture()); + + $id = $invoice->id; + + // Add the payment + $payment=new Paiement($db); + $payment->datepaye=$now; + $payment->bank_account=$conf_fkaccount; + $payment->amounts[$invoice->id]=$obj_facturation->prix_total_ttc(); + $payment->note=$langs->trans("Payment").' '.$langs->trans("Invoice").' '.$obj_facturation->num_facture(); + $payment->paiementid=$invoice->mode_reglement_id; + $payment->num_paiement=''; + + $paiement_id = $payment->create($user); + if ($paiement_id > 0) { - $bankaccountid=0; - if ( $obj_facturation->mode_reglement() == 'ESP' ) + // Ajout d'une ecriture sur le compte bancaire + if ($conf->banque->enabled) { - $bankaccountid=$conf_fkaccount_cash; - } - if ( $obj_facturation->mode_reglement() == 'CHQ' ) - { - $bankaccountid=$conf_fkaccount_cheque; - } - if ( $obj_facturation->mode_reglement() == 'CB' ) - { - $bankaccountid=$conf_fkaccount_cb; - } - - if ($bankaccountid > 0) - { - // Insertion dans llx_bank - $label = "(CustomerInvoicePayment)"; - $acc = new Account($db, $bankaccountid); - - $bank_line_id = $acc->addline($payment->datepaye, - $payment->paiementid, // Payment mode id or code ("CHQ or VIR for example") - $label, - $obj_facturation->prix_total_ttc(), - $payment->num_paiement, - '', - $user, - '', - ''); - - // Mise a jour fk_bank dans llx_paiement. - // On connait ainsi le paiement qui a genere l'ecriture bancaire - if ($bank_line_id > 0) + $bankaccountid=0; + if ( $obj_facturation->mode_reglement() == 'ESP' ) { - $payment->update_fk_bank($bank_line_id); - // Mise a jour liens (pour chaque facture concernees par le paiement) - foreach ($payment->amounts as $key => $value) + $bankaccountid=$conf_fkaccount_cash; + } + if ( $obj_facturation->mode_reglement() == 'CHQ' ) + { + $bankaccountid=$conf_fkaccount_cheque; + } + if ( $obj_facturation->mode_reglement() == 'CB' ) + { + $bankaccountid=$conf_fkaccount_cb; + } + + if ($bankaccountid > 0) + { + // Insertion dans llx_bank + $label = "(CustomerInvoicePayment)"; + $acc = new Account($db, $bankaccountid); + + $bank_line_id = $acc->addline($payment->datepaye, + $payment->paiementid, // Payment mode id or code ("CHQ or VIR for example") + $label, + $obj_facturation->prix_total_ttc(), + $payment->num_paiement, + '', + $user, + '', + ''); + + // Mise a jour fk_bank dans llx_paiement. + // On connait ainsi le paiement qui a genere l'ecriture bancaire + if ($bank_line_id > 0) { - $facid = $key; - $fac = new Facture($db); - $fac->fetch($facid); - $fac->fetch_client(); - $acc->add_url_line($bank_line_id, - $paiement_id, - DOL_URL_ROOT.'/compta/paiement/fiche.php?id=', - '(paiement)', - 'payment'); - $acc->add_url_line($bank_line_id, - $fac->client->id, - DOL_URL_ROOT.'/compta/fiche.php?socid=', - $fac->client->nom, - 'company'); + $payment->update_fk_bank($bank_line_id); + // Mise a jour liens (pour chaque facture concernees par le paiement) + foreach ($payment->amounts as $key => $value) + { + $facid = $key; + $fac = new Facture($db); + $fac->fetch($facid); + $fac->fetch_client(); + $acc->add_url_line($bank_line_id, + $paiement_id, + DOL_URL_ROOT.'/compta/paiement/fiche.php?id=', + '(paiement)', + 'payment'); + $acc->add_url_line($bank_line_id, + $fac->client->id, + DOL_URL_ROOT.'/compta/fiche.php?socid=', + $fac->client->nom, + 'company'); + } + } + else + { + $error++; } } - else - { - $error++; - } } } + else + { + $error++; + } } else { @@ -311,7 +327,7 @@ switch ( $_GET['action'] ) else { $db->rollback(); - $redirection = 'affIndex.php?facid='.$id; // Ajout de l'id de la facture, pour l'inclure dans un lien pointant directement vers celle-ci dans Dolibarr + $redirection = 'affIndex.php?facid='.$id.'&mesg=ErrorFailedToCreateInvoice'; // Ajout de l'id de la facture, pour l'inclure dans un lien pointant directement vers celle-ci dans Dolibarr } break; diff --git a/htdocs/includes/modules/modCashDesk.class.php b/htdocs/includes/modules/modCashDesk.class.php index ae99afdb0e9..ef216679a0d 100644 --- a/htdocs/includes/modules/modCashDesk.class.php +++ b/htdocs/includes/modules/modCashDesk.class.php @@ -20,7 +20,7 @@ * \defgroup pos Module points of sale * \brief Module to manage points of sale * \version $Id$ -*/ + */ /** * \file htdocs/includes/modules/modCashDesk.class.php @@ -72,7 +72,7 @@ class modCashDesk extends DolibarrModules $this->config_page_url = array("cashdesk.php"); // Dependencies - $this->depends = array("modBanque","modFacture","modProduit","modStock"); // List of modules id that must be enabled if this module is enabled + $this->depends = array("modBanque","modFacture","modProduit"); // List of modules id that must be enabled if this module is enabled $this->requiredby = array(); // List of modules id to disable if this one is disabled $this->phpmin = array(4,1); // Minimum version of PHP required by module $this->need_dolibarr_version = array(2,4); // Minimum version of Dolibarr required by module