diff --git a/htdocs/cashdesk/affContenu.php b/htdocs/cashdesk/affContenu.php index 9ccfe0a739c..bed6bca8bb3 100644 --- a/htdocs/cashdesk/affContenu.php +++ b/htdocs/cashdesk/affContenu.php @@ -1,6 +1,7 @@ - * Copyright (C) 2008 Laurent Destailleur +/* Copyright (C) 2007-2008 Jeremie Ollivier + * Copyright (C) 2008 Laurent Destailleur + * Copyright (C) 2009 Régis Houssin * * 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 @@ -20,45 +21,40 @@ require ('classes/Facturation.class.php'); // Si nouvelle vente, reinitialisation des donnees (destruction de l'objet et vidage de la table contenant la liste des articles) -if ( $_GET['id'] == 'NOUV' ) { - - unset ($_SESSION['serObjFacturation']); - +if ( $_GET['id'] == 'NOUV' ) +{ + unset($_SESSION['serObjFacturation']); $sql->query ('DELETE FROM '.MAIN_DB_PREFIX.'tmp_caisse'); - } // Recuperation, s'il existe, de l'objet contenant les infos de la vente en cours ... -if ( isset ($_SESSION['serObjFacturation']) ) { - - $obj_facturation = unserialize ($_SESSION['serObjFacturation']); +if ( isset ($_SESSION['serObjFacturation']) ) +{ + $obj_facturation = unserialize($_SESSION['serObjFacturation']); unset ($_SESSION['serObjFacturation']); - +} +else +{ // ... sinon, c'est une nouvelle vente -} else { - $obj_facturation = new Facturation; - } -?> +print '
'; +include('liste_articles.php'); +print '
'; -
- -
'; +if ( $_GET['menu'] ) +{ + include($_GET['menu'].'.php'); +} +else +{ include ('facturation.php'); - } -?>
-'; $_SESSION['serObjFacturation'] = serialize ($obj_facturation); diff --git a/htdocs/cashdesk/affIndex.php b/htdocs/cashdesk/affIndex.php index 1a0c69f6270..45bd234267e 100644 --- a/htdocs/cashdesk/affIndex.php +++ b/htdocs/cashdesk/affIndex.php @@ -1,6 +1,7 @@ - * Copyright (C) 2008 Laurent Destailleur +/* Copyright (C) 2007-2008 Jeremie Ollivier + * Copyright (C) 2008 Laurent Destailleur + * Copyright (C) 2009 Régis Houssin * * 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 @@ -23,56 +24,51 @@ if ( $_SESSION['uid'] <= 0 ) { header ('Location: index.php'); exit; } -?> - - - -Caisse +print ''; - +print ''; +print ''; +print 'Caisse'; - - +print ''; - - +print ''; +print ''; - - +print ''; +print ''; - - - - - - +print ''; +print ''; - +print ''; +print ''; +print ''; +print ''; +print ''; +print ''; -
-
-
+print ''; -

CAISSE

+print '
'; +print '
'; +print '
'; -
+print '

CAISSE

'; -
+print '
'; +include('templates/menu.tpl.php'); +print '
'; -
-
-
+print '
'; +include('affContenu.php'); +print '
'; - +include('affPied.php'); - +print '
'; +print ''; +?> \ No newline at end of file diff --git a/htdocs/cashdesk/classes/Mysql.class.php b/htdocs/cashdesk/classes/Mysql.class.php index dacd6cdef72..eb07c167e58 100644 --- a/htdocs/cashdesk/classes/Mysql.class.php +++ b/htdocs/cashdesk/classes/Mysql.class.php @@ -1,6 +1,6 @@ - * Copyright (C) 2008 Laurent Destailleur +/* Copyright (C) 2007-2008 Jeremie Ollivier + * Copyright (C) 2008 Laurent Destailleur * * 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 diff --git a/htdocs/cashdesk/classes/Sql.interface.php b/htdocs/cashdesk/classes/Sql.interface.php index 718e48a5e4a..b899bb5f26b 100644 --- a/htdocs/cashdesk/classes/Sql.interface.php +++ b/htdocs/cashdesk/classes/Sql.interface.php @@ -1,6 +1,7 @@ - * Copyright (C) 2008 Laurent Destailleur +/* Copyright (C) 2007-2008 Jeremie Ollivier + * Copyright (C) 2008 Laurent Destailleur + * Copyright (C) 2009 Régis Houssin * * 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 @@ -19,16 +20,16 @@ interface intSql { - // Envoie une requ�te et retourne le pointeur vers le r�sultat + // Envoie une requete et retourne le pointeur vers le resultat public function query ($aRequete); - // Renvoie le nombre de r�sultats contenus dans la ressource + // Renvoie le nombre de resultats contenus dans la ressource public function num_rows ($aRes); - // Parcours tous les r�sultats de la ressource et les enregistre dans un tableau � 2 dimensions : $tab[ligne][nom_champ/indice] + // Parcours tous les resultats de la ressource et les enregistre dans un tableau a 2 dimensions : $tab[ligne][nom_champ/indice] public function fetch_array ($aRes); - // Enregistre seulement le premier r�sultat de la ressource dans un tableau � 1 dimension : $tab[nom_champ/indice] + // Enregistre seulement le premier resultat de la ressource dans un tableau a 1 dimension : $tab[nom_champ/indice] public function fetchFirst ($aRes); } diff --git a/htdocs/cashdesk/templates/menu.tpl.php b/htdocs/cashdesk/templates/menu.tpl.php index 6750510fb4b..10bac4dd733 100644 --- a/htdocs/cashdesk/templates/menu.tpl.php +++ b/htdocs/cashdesk/templates/menu.tpl.php @@ -1,33 +1,35 @@ - + * Copyright (C) 2008 Laurent Destailleur + * Copyright (C) 2009 Régis Houssin + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * 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, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + $langs->load("@cashdesk"); $logout=''; -?> -
-
    -
  • Nouvelle vente
    • -
  • Gestion commerciale
    • -
  • Utilisateur : - global->CASHDESK_ID_THIRDPARTY.'">'.$langs->trans("CashDeskThirdParty").' : '.$conf->global->CASHDESK_ID_THIRDPARTY.''; ?> - global->CASHDESK_ID_BANKACCOUNT.'">'.$langs->trans("CashDeskBank").' : '.$conf->global->CASHDESK_ID_BANKACCOUNT.''; ?> - global->CASHDESK_ID_WAREHOUSE.'">'.$langs->trans("CashDeskWarehouse").' : '.$conf->global->CASHDESK_ID_WAREHOUSE.''; ?> -
    • -
-
+print '
'; +print ''; +print '
'; +?> \ No newline at end of file