diff --git a/htdocs/boutique/index.php b/htdocs/boutique/index.php index 17a59229716..a0d12d3457c 100644 --- a/htdocs/boutique/index.php +++ b/htdocs/boutique/index.php @@ -17,10 +17,10 @@ */ /** - \file htdocs/boutique/index.php - \ingroup boutique - \brief Page accueil zone boutique - \version $Id: index.php,v 1.16 2011/08/03 00:45:46 eldy Exp $ + * \file htdocs/boutique/index.php + * \ingroup boutique + * \brief Page accueil zone boutique + * \version $Id: index.php,v 1.17 2011/08/03 01:17:17 eldy Exp $ */ require("../main.inc.php"); @@ -238,5 +238,5 @@ print ''; $dbosc->close(); -llxFooter('$Date: 2011/08/03 00:45:46 $ - $Revision: 1.16 $'); +llxFooter('$Date: 2011/08/03 01:17:17 $ - $Revision: 1.17 $'); ?> diff --git a/htdocs/cashdesk/tpl/validation1.tpl.php b/htdocs/cashdesk/tpl/validation1.tpl.php index f3a440b4929..b18bf124ae4 100644 --- a/htdocs/cashdesk/tpl/validation1.tpl.php +++ b/htdocs/cashdesk/tpl/validation1.tpl.php @@ -15,8 +15,7 @@ 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. +along with this program. If not, see . -->
trans("Summary"); ?> @@ -40,9 +39,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ?> trans("TotalTTC"); ?> prix_total_ttc(),'MT').' '.$conf->monnaie; ?> trans("PaymentMode"); ?> - mode_reglement()) - { + { case 'ESP': echo $langs->trans("Cash"); $filtre='courant=2'; @@ -53,7 +52,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 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"); @@ -65,16 +64,16 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. echo $langs->trans("Reported"); $filtre='courant=1 OR courant=2'; $selected=''; - break; + break; default: $filtre='courant=1 OR courant=2'; $selected=''; } - + ?> - - mode_reglement() == 'DIF' ) { @@ -100,10 +99,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

- trans("BankToPay"). "
"; $html = new Form($db); - $html->select_comptes($selected,'cashdeskbank',0,$filtre); + $html->select_comptes($selected,'cashdeskbank',0,$filtre); ?>

trans("Notes"); ?>