Fix: Message for payment forms
This commit is contained in:
Laurent Destailleur
parent
b16f4117ca
commit
8bd1da49bf
@ -1,10 +1,9 @@
|
||||
--------------------------------------------------------------
|
||||
English Dolibarr ChangeLog
|
||||
$Id: ChangeLog,v 1.424 2011/07/13 14:16:39 eldy Exp $
|
||||
$Id: ChangeLog,v 1.423 2011/07/07 16:03:53 simnandez Exp $
|
||||
--------------------------------------------------------------
|
||||
|
||||
***** ChangeLog for 3.1 compared to 3.0 *****
|
||||
WARNING: IE6 browser is no more supported in this version.
|
||||
For users:
|
||||
- New: War against number of clicks:
|
||||
- When adding a free bank transaction, form to add next one is still
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
/**
|
||||
* \file htdocs/admin/system/dolibarr.php
|
||||
* \brief Page to show Dolibarr informations
|
||||
* \version $Id: dolibarr.php,v 1.58 2011/07/13 13:15:17 eldy Exp $
|
||||
* \version $Id$
|
||||
*/
|
||||
|
||||
require("../../main.inc.php");
|
||||
@ -163,7 +163,7 @@ if (function_exists('date_default_timezone_get'))
|
||||
print '<tr '.$bc[$var].'><td width="300">'.$langs->trans("CurrentTimeZone").'</td><td>'; // Timezone server PHP
|
||||
$a=date_default_timezone_get();
|
||||
$a.=' ('.(-dol_mktime(0,0,0,1,1,1970)>0?'+':'').(-dol_mktime(0,0,0,1,1,1970)).')';
|
||||
print $form->textwithtooltip($a,$txt,2,1,img_info(''));
|
||||
print $form->textwithtooltip($a,$txt,2,1,img_info());
|
||||
print '</td></tr>'."\n"; // value defined in http://fr3.php.net/manual/en/timezones.europe.php
|
||||
}
|
||||
else
|
||||
@ -171,7 +171,7 @@ else
|
||||
$var=!$var;
|
||||
print '<tr '.$bc[$var].'><td width="300">'.$langs->trans("PHPServerOffsetWithGreenwich").'</td><td>';
|
||||
$a=(-dol_mktime(0,0,0,1,1,1970)>0?'+':'').(-dol_mktime(0,0,0,1,1,1970));
|
||||
print $form->textwithtooltip($a,$txt,2,1,img_info(''));
|
||||
print $form->textwithtooltip($a,$txt,2,1,img_info());
|
||||
print '</td></tr>'."\n";
|
||||
}
|
||||
$var=!$var;
|
||||
@ -213,5 +213,5 @@ print '<tr '.$bc[$var].'><td width="300">=> '.$langs->trans("File encoding").'</
|
||||
print '</table>';
|
||||
print '<br>';
|
||||
|
||||
llxFooter('$Date: 2011/07/13 13:15:17 $ - $Revision: 1.58 $');
|
||||
llxFooter('$Date$ - $Revision$');
|
||||
?>
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
<?php
|
||||
/* Copyright (C) 2004-2011 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
/* Copyright (C) 2004-2010 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
*
|
||||
* 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,7 +20,7 @@
|
||||
* \file htdocs/compta/paiement_charge.php
|
||||
* \ingroup tax
|
||||
* \brief Page to add payment of a tax
|
||||
* \version $Id: paiement_charge.php,v 1.52 2011/07/13 14:25:49 eldy Exp $
|
||||
* \version $Id$
|
||||
*/
|
||||
|
||||
require('../main.inc.php');
|
||||
@ -42,9 +42,8 @@ if ($user->societe_id > 0)
|
||||
|
||||
|
||||
/*
|
||||
* Actions
|
||||
* Actions add payment
|
||||
*/
|
||||
|
||||
if ($_POST["action"] == 'add_payment')
|
||||
{
|
||||
$error=0;
|
||||
@ -146,7 +145,7 @@ if ($_POST["action"] == 'add_payment')
|
||||
|
||||
|
||||
/*
|
||||
* View
|
||||
* Affichage
|
||||
*/
|
||||
|
||||
llxHeader();
|
||||
@ -154,7 +153,9 @@ llxHeader();
|
||||
$html=new Form($db);
|
||||
|
||||
|
||||
// Formulaire de creation d'un paiement de charge
|
||||
/*
|
||||
* Formulaire de creation d'un paiement de charge
|
||||
*/
|
||||
if ($_GET["action"] == 'create')
|
||||
{
|
||||
|
||||
@ -222,7 +223,7 @@ if ($_GET["action"] == 'create')
|
||||
print '<tr>';
|
||||
print '<td class="fieldrequired">'.$langs->trans('AccountToDebit').'</td>';
|
||||
print '<td>';
|
||||
$html->select_comptes(isset($_POST["accountid"])?$_POST["accountid"]:$charge->accountid, "accountid", 0, '',1); // Show opend bank account list
|
||||
$html->select_comptes(isset($_POST["accountid"])?$_POST["accountid"]:$charge->accountid, "accountid", 0, "courant=1",1); // Affiche liste des comptes courant
|
||||
print '</td></tr>';
|
||||
|
||||
print '<tr><td>'.$langs->trans('Numero');
|
||||
@ -334,5 +335,5 @@ if ($_GET["action"] == 'create')
|
||||
|
||||
$db->close();
|
||||
|
||||
llxFooter('$Date: 2011/07/13 14:25:49 $ - $Revision: 1.52 $');
|
||||
llxFooter('$Date$ - $Revision$');
|
||||
?>
|
||||
|
||||
@ -31,7 +31,7 @@
|
||||
* \file htdocs/core/class/html.form.class.php
|
||||
* \ingroup core
|
||||
* \brief File of class with all html predefined components
|
||||
* \version $Id: html.form.class.php,v 1.189 2011/07/13 14:03:15 eldy Exp $
|
||||
* \version $Id: html.form.class.php,v 1.188 2011/07/10 17:28:09 hregis Exp $
|
||||
*/
|
||||
|
||||
|
||||
@ -1771,14 +1771,12 @@ class Form
|
||||
}
|
||||
|
||||
/**
|
||||
* Return combo list of differents status of a proposal
|
||||
* Values are id of table c_propalst
|
||||
* @param selected etat pre-selectionne
|
||||
* \brief Retourne la liste deroulante des differents etats d'une propal.
|
||||
* Les valeurs de la liste sont les id de la table c_propalst
|
||||
* \param selected etat pre-selectionne
|
||||
*/
|
||||
function select_propal_statut($selected='')
|
||||
{
|
||||
global $langs;
|
||||
|
||||
$sql = "SELECT id, code, label, active FROM ".MAIN_DB_PREFIX."c_propalst";
|
||||
$sql .= " WHERE active = 1";
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<?php
|
||||
/* Copyright (C) 2002-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
|
||||
* Copyright (C) 2004-2011 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
* Copyright (C) 2004-2010 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
* Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
@ -22,7 +22,7 @@
|
||||
* \file htdocs/fourn/facture/index.php
|
||||
* \ingroup fournisseur,facture
|
||||
* \brief List of suppliers invoices
|
||||
* \version $Id: index.php,v 1.84 2011/07/13 13:10:51 eldy Exp $
|
||||
* \version $Id$
|
||||
*/
|
||||
|
||||
require("../../main.inc.php");
|
||||
@ -35,7 +35,6 @@ if (!$user->rights->fournisseur->facture->lire)
|
||||
accessforbidden();
|
||||
|
||||
$langs->load("companies");
|
||||
$langs->load("bills");
|
||||
|
||||
$socid = $_GET["socid"];
|
||||
|
||||
@ -293,5 +292,5 @@ else
|
||||
$db->close();
|
||||
|
||||
|
||||
llxFooter('$Date: 2011/07/13 13:10:51 $ - $Revision: 1.84 $');
|
||||
llxFooter('$Date$ - $Revision$');
|
||||
?>
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
* \file htdocs/includes/modules/fichinter/pdf_soleil.modules.php
|
||||
* \ingroup ficheinter
|
||||
* \brief Fichier de la classe permettant de generer les fiches d'intervention au modele Soleil
|
||||
* \version $Id: pdf_soleil.modules.php,v 1.101 2011/07/13 14:09:35 eldy Exp $
|
||||
* \version $Id$
|
||||
*/
|
||||
require_once(DOL_DOCUMENT_ROOT."/includes/modules/fichinter/modules_fichinter.php");
|
||||
require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php");
|
||||
@ -105,7 +105,7 @@ class pdf_soleil extends ModelePDFFicheinter
|
||||
$result=$fichinter->fetch($id);
|
||||
if ($result < 0)
|
||||
{
|
||||
dol_print_error($this->db,$fichinter->error);
|
||||
dol_print_error($db,$fichinter->error);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user