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

New: Add cancel button on note edit

Browse Source
This commit is contained in:
Laurent Destailleur 2011-07-13 16:24:57 +00:00
parent 945d951ef1
commit 4742db3f23
9 changed files with 76 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,9 +1,10 @@
-------------------------------------------------------------- --------------------------------------------------------------
English Dolibarr ChangeLog English Dolibarr ChangeLog
$Id: ChangeLog,v 1.423 2011/07/07 16:03:53 simnandez Exp $ $Id: ChangeLog,v 1.424 2011/07/13 14:16:39 eldy Exp $
-------------------------------------------------------------- --------------------------------------------------------------
***** ChangeLog for 3.1 compared to 3.0 ***** ***** ChangeLog for 3.1 compared to 3.0 *****
WARNING: IE6 browser is no more supported in this version.
For users: For users:
- New: War against number of clicks: - New: War against number of clicks:
- When adding a free bank transaction, form to add next one is still - When adding a free bank transaction, form to add next one is still

13
README
View File

@ -53,20 +53,13 @@ To upgrade Dolibarr from an old version to this one:
- If you came from a beta version or from any version x.y.z to any - If you came from a beta version or from any version x.y.z to any
other where x or y number differs, you must call the Dolibarr "install/" other where x or y number differs, you must call the Dolibarr "install/"
page in your browser. page in your browser (this should be done automatically at first dolibarr
Url might be for example: access).
This URL should looks like:
http://localhost/dolibarr/htdocs/install/ http://localhost/dolibarr/htdocs/install/
or or
http://yourdolibarrhost/install/index.php http://yourdolibarrhost/install/index.php
To know what is exactly correct URL for "install/" page, take URL you use
to go on login page. It it ends with "index.php", remove it. Then add
"install/" at the end.
For example, if your login page is:
http://yourdolibarrhost/something/index.php
Then, your "install/" pages will be
http://yourdolibarrhost/something/install/
Then choose the "update" option according to your case. Then choose the "update" option according to your case.
Note: Migrate process can be ran safely several times. Note: Migrate process can be ran safely several times.

12
README-FR
View File

@ -53,19 +53,13 @@ Pour mettre a jour Dolibarr depuis une vieille version vers celle ci:
il n'y a pas besoin de migration de données. il n'y a pas besoin de migration de données.
- Si vous venez d'une beta ou d'un version x.y.z vers une autre ou les numeros x - Si vous venez d'une beta ou d'un version x.y.z vers une autre ou les numeros x
ou y varient, vous devez appelez la page de migration dans votre navigateur: ou y varient, vous devez appelez la page "install/" de migration dans votre
navigateur (ceci doit se faire automatiquement au premier accès de l'application).
Ce sera une URL du genre:
http://localhost/dolibarr/htdocs/install/index.php http://localhost/dolibarr/htdocs/install/index.php
ou ou
http://yourdolibarrhost/install/index.php http://yourdolibarrhost/install/index.php
Pour savoir quelle est l'URL exactement de la page "install/", prenez l'URL que
vous utilisez pour vous loguer. Si elle se termine par "index.php", enlevez le.
Dans tous les cas, ajouter ensuite "install/" à la fin.
Par exemple, si votre page de connexion est:
http://yourdolibarrhost/something/index.php
Alors la page "install/" sera
http://yourdolibarrhost/something/install/
Ensuite, choisir l'option de "mise a jour" en rapport avec votre cas. Ensuite, choisir l'option de "mise a jour" en rapport avec votre cas.
Note: Le processus de migration peut etre lance plusieurs fois sans risque. Note: Le processus de migration peut etre lance plusieurs fois sans risque.

12
htdocs/compta/facture/impayees.php
View File

@ -1,7 +1,7 @@
<?php <?php
/* Copyright (C) 2002-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2002-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004 Eric Seigne <eric.seigne@ryxeo.com> * Copyright (C) 2004 Eric Seigne <eric.seigne@ryxeo.com>
* Copyright (C) 2004-2009 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2011 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr> * Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@ -23,7 +23,7 @@
* \file htdocs/compta/facture/impayees.php * \file htdocs/compta/facture/impayees.php
* \ingroup facture * \ingroup facture
* \brief Page to list and build liste of unpaid invoices * \brief Page to list and build liste of unpaid invoices
* \version $Revision$ * \version $Revision: 1.83 $
*/ */
require("../../main.inc.php"); require("../../main.inc.php");
@ -268,7 +268,7 @@ if ($result)
print_fiche_titre($titre,$link); print_fiche_titre($titre,$link);
//print_barre_liste($titre,$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',0); // We don't want pagination on this page //print_barre_liste($titre,$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',0); // We don't want pagination on this page
if ($mesg) print $mesg; dol_htmloutput_mesg($mesg);
$i = 0; $i = 0;
print '<table class="liste" width="100%">'; print '<table class="liste" width="100%">';
@ -351,10 +351,10 @@ if ($result)
// PDF Picto // PDF Picto
print '<td width="16" align="right" class="nobordernopadding">'; print '<td width="16" align="right" class="nobordernopadding">';
$filename=dol_sanitizeFileName($objp->facnumber); $filename=dol_sanitizeFileName($objp->facnumber);
$filedir=$conf->facture->dir_output . '/' . dol_sanitizeFileName($objp->facnumber); $filedir=$conf->facture->dir_output . '/' . dol_sanitizeFileName($objp->facnumber);
$foundpdf=$formfile->show_documents('facture',$filename,$filedir,$urlsource,'','','',1,'',1,$param); $foundpdf=$formfile->show_documents('facture',$filename,$filedir,$urlsource,'','','',1,'',1,$param);
print '</td>'; print '</td>';
print '</tr></table>'; print '</tr></table>';
@ -425,5 +425,5 @@ if ($result)
$db->close(); $db->close();
llxFooter('$Date$ - $Revision$'); llxFooter('$Date: 2011/07/13 14:41:02 $ - $Revision: 1.83 $');
?> ?>

17
htdocs/compta/paiement_charge.php
View File

@ -1,5 +1,5 @@
<?php <?php
/* Copyright (C) 2004-2010 Laurent Destailleur <eldy@users.sourceforge.net> /* Copyright (C) 2004-2011 Laurent Destailleur <eldy@users.sourceforge.net>
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -20,7 +20,7 @@
* \file htdocs/compta/paiement_charge.php * \file htdocs/compta/paiement_charge.php
* \ingroup tax * \ingroup tax
* \brief Page to add payment of a tax * \brief Page to add payment of a tax
* \version $Id$ * \version $Id: paiement_charge.php,v 1.52 2011/07/13 14:25:49 eldy Exp $
*/ */
require('../main.inc.php'); require('../main.inc.php');
@ -42,8 +42,9 @@ if ($user->societe_id > 0)
/* /*
* Actions add payment * Actions
*/ */
if ($_POST["action"] == 'add_payment') if ($_POST["action"] == 'add_payment')
{ {
$error=0; $error=0;
@ -145,7 +146,7 @@ if ($_POST["action"] == 'add_payment')
/* /*
* Affichage * View
*/ */
llxHeader(); llxHeader();
@ -153,9 +154,7 @@ llxHeader();
$html=new Form($db); $html=new Form($db);
/* // Formulaire de creation d'un paiement de charge
* Formulaire de creation d'un paiement de charge
*/
if ($_GET["action"] == 'create') if ($_GET["action"] == 'create')
{ {
@ -223,7 +222,7 @@ if ($_GET["action"] == 'create')
print '<tr>'; print '<tr>';
print '<td class="fieldrequired">'.$langs->trans('AccountToDebit').'</td>'; print '<td class="fieldrequired">'.$langs->trans('AccountToDebit').'</td>';
print '<td>'; print '<td>';
$html->select_comptes(isset($_POST["accountid"])?$_POST["accountid"]:$charge->accountid, "accountid", 0, "courant=1",1); // Affiche liste des comptes courant $html->select_comptes(isset($_POST["accountid"])?$_POST["accountid"]:$charge->accountid, "accountid", 0, '',1); // Show opend bank account list
print '</td></tr>'; print '</td></tr>';
print '<tr><td>'.$langs->trans('Numero'); print '<tr><td>'.$langs->trans('Numero');
@ -335,5 +334,5 @@ if ($_GET["action"] == 'create')
$db->close(); $db->close();
llxFooter('$Date$ - $Revision$'); llxFooter('$Date: 2011/07/13 14:25:49 $ - $Revision: 1.52 $');
?> ?>

9
htdocs/core/class/html.formfile.class.php
View File

@ -22,7 +22,7 @@
* \file htdocs/core/class/html.formfile.class.php * \file htdocs/core/class/html.formfile.class.php
* \ingroup core * \ingroup core
* \brief File of class to offer components to list and upload files * \brief File of class to offer components to list and upload files
* \version $Id: html.formfile.class.php,v 1.48 2011/07/13 07:38:11 hregis Exp $ * \version $Id: html.formfile.class.php,v 1.49 2011/07/13 14:41:03 eldy Exp $
*/ */
@ -152,6 +152,7 @@ class FormFile
*/ */
function show_documents($modulepart,$filename,$filedir,$urlsource,$genallowed,$delallowed=0,$modelselected='',$allowgenifempty=1,$forcenomultilang=0,$iconPDF=0,$maxfilenamelength=28,$noform=0,$param='',$title='',$buttonlabel='',$codelang='',$hooks='') function show_documents($modulepart,$filename,$filedir,$urlsource,$genallowed,$delallowed=0,$modelselected='',$allowgenifempty=1,$forcenomultilang=0,$iconPDF=0,$maxfilenamelength=28,$noform=0,$param='',$title='',$buttonlabel='',$codelang='',$hooks='')
{ {
$this->numoffiles=0;
print $this->showdocuments($modulepart,$filename,$filedir,$urlsource,$genallowed,$delallowed,$modelselected,$allowgenifempty,$forcenomultilang,$iconPDF,$maxfilenamelength,$noform,$param,$title,$buttonlabel,$codelang,$hooks); print $this->showdocuments($modulepart,$filename,$filedir,$urlsource,$genallowed,$delallowed,$modelselected,$allowgenifempty,$forcenomultilang,$iconPDF,$maxfilenamelength,$noform,$param,$title,$buttonlabel,$codelang,$hooks);
return $this->numoffiles; return $this->numoffiles;
} }
@ -845,12 +846,12 @@ class FormFile
print '<button type="submit" class="start">'.$langs->trans('StartUpload').'</button>'; print '<button type="submit" class="start">'.$langs->trans('StartUpload').'</button>';
print '<button type="reset" class="cancel">'.$langs->trans('CancelUpload').'</button>'; print '<button type="reset" class="cancel">'.$langs->trans('CancelUpload').'</button>';
print '</div></form>'; print '</div></form>';
print '</div><!-- end div fileupload -->'; print '</div><!-- end div fileupload -->';
print '<div id="fileupload-view">'; print '<div id="fileupload-view">';
print '<div class="fileupload-content">'; print '<div class="fileupload-content">';
print '<table width="100%" class="files">'; print '<table width="100%" class="files">';
/*print '<tr>'; /*print '<tr>';
print '<td>'.$langs->trans("Documents2").'</td>'; print '<td>'.$langs->trans("Documents2").'</td>';

4
htdocs/includes/modules/fichinter/pdf_soleil.modules.php
View File

@ -23,7 +23,7 @@
* \file htdocs/includes/modules/fichinter/pdf_soleil.modules.php * \file htdocs/includes/modules/fichinter/pdf_soleil.modules.php
* \ingroup ficheinter * \ingroup ficheinter
* \brief Fichier de la classe permettant de generer les fiches d'intervention au modele Soleil * \brief Fichier de la classe permettant de generer les fiches d'intervention au modele Soleil
* \version $Id$ * \version $Id: pdf_soleil.modules.php,v 1.101 2011/07/13 14:09:35 eldy Exp $
*/ */
require_once(DOL_DOCUMENT_ROOT."/includes/modules/fichinter/modules_fichinter.php"); require_once(DOL_DOCUMENT_ROOT."/includes/modules/fichinter/modules_fichinter.php");
require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php");
@ -105,7 +105,7 @@ class pdf_soleil extends ModelePDFFicheinter
$result=$fichinter->fetch($id); $result=$fichinter->fetch($id);
if ($result < 0) if ($result < 0)
{ {
dol_print_error($db,$fichinter->error); dol_print_error($this->db,$fichinter->error);
} }
} }

4
htdocs/langs/zh_CN/main.lang
View File

@ -9,8 +9,8 @@
// Reference language: en_US // Reference language: en_US
CHARSET=UTF-8 CHARSET=UTF-8
DIRECTION=ltr DIRECTION=ltr
FONTFORPDF=chinese #FONTFORPDF=chinese
#FONTFORPDF=stsongstdlight FONTFORPDF=stsongstdlight
#FONTSIZEFORPDF=9 #FONTSIZEFORPDF=9
SeparatorDecimal=. SeparatorDecimal=.
SeparatorThousand=None SeparatorThousand=None

86
htdocs/societe/socnote.php
View File

@ -23,7 +23,7 @@
* \file htdocs/societe/socnote.php * \file htdocs/societe/socnote.php
* \brief Tab for notes on third party * \brief Tab for notes on third party
* \ingroup societe * \ingroup societe
* \version $Id$ * \version $Id: socnote.php,v 1.22 2011/07/13 16:24:57 eldy Exp $
*/ */
require("../main.inc.php"); require("../main.inc.php");
@ -44,13 +44,13 @@ $result = restrictedArea($user, 'societe', $socid);
* Actions * Actions
*/ */
if ($action == 'add') if ($action == 'add' && ! GETPOST('cancel'))
{ {
$sql = "UPDATE ".MAIN_DB_PREFIX."societe SET note='".$db->escape($_POST["note"])."' WHERE rowid=".$_POST["socid"]; $sql = "UPDATE ".MAIN_DB_PREFIX."societe SET note='".$db->escape($_POST["note"])."' WHERE rowid=".$_POST["socid"];
$result = $db->query($sql); $result = $db->query($sql);
$_GET["socid"]=$_POST["socid"]; // Pour retour sur fiche $_GET["socid"]=$_POST["socid"]; // Pour retour sur fiche
$socid = $_GET["socid"]; $socid = $_GET["socid"];
} }
@ -70,25 +70,25 @@ if ($socid > 0)
$societe = new Societe($db, $socid); $societe = new Societe($db, $socid);
$societe->fetch($socid); $societe->fetch($socid);
/* /*
* Affichage onglets * Affichage onglets
*/ */
if ($conf->notification->enabled) $langs->load("mails"); if ($conf->notification->enabled) $langs->load("mails");
$head = societe_prepare_head($societe); $head = societe_prepare_head($societe);
dol_fiche_head($head, 'note', $langs->trans("ThirdParty"),0,'company'); dol_fiche_head($head, 'note', $langs->trans("ThirdParty"),0,'company');
print "<form method=\"post\" action=\"".DOL_URL_ROOT."/societe/socnote.php\">"; print "<form method=\"post\" action=\"".DOL_URL_ROOT."/societe/socnote.php\">";
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
print '<tr><td width="20%">'.$langs->trans('ThirdPartyName').'</td>'; print '<tr><td width="20%">'.$langs->trans('ThirdPartyName').'</td>';
print '<td colspan="3">'; print '<td colspan="3">';
print $form->showrefnav($societe,'socid','',($user->societe_id?0:1),'rowid','nom'); print $form->showrefnav($societe,'socid','',($user->societe_id?0:1),'rowid','nom');
print '</td></tr>'; print '</td></tr>';
if (! empty($conf->global->SOCIETE_USEPREFIX)) // Old not used prefix field if (! empty($conf->global->SOCIETE_USEPREFIX)) // Old not used prefix field
{ {
@ -113,32 +113,36 @@ if ($socid > 0)
print '</td></tr>'; print '</td></tr>';
} }
print '<tr><td valign="top">'.$langs->trans("Note").'</td>'; print '<tr><td valign="top">'.$langs->trans("Note").'</td>';
print '<td valign="top">'; print '<td valign="top">';
if ($action == 'edit' && $user->rights->societe->creer) if ($action == 'edit' && $user->rights->societe->creer)
{ {
print "<input type=\"hidden\" name=\"action\" value=\"add\">"; print "<input type=\"hidden\" name=\"action\" value=\"add\">";
print "<input type=\"hidden\" name=\"socid\" value=\"".$societe->id."\">"; print "<input type=\"hidden\" name=\"socid\" value=\"".$societe->id."\">";
// Editeur wysiwyg // Editeur wysiwyg
require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
$doleditor=new DolEditor('note',$societe->note,'',360,'dolibarr_notes','In',true,false,$conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_SOCIETE,20,70); $doleditor=new DolEditor('note',$societe->note,'',360,'dolibarr_notes','In',true,false,$conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_SOCIETE,20,70);
$doleditor->Create(); $doleditor->Create();
} }
else else
{ {
print dol_textishtml($societe->note)?$societe->note:dol_nl2br($societe->note,1,true); print dol_textishtml($societe->note)?$societe->note:dol_nl2br($societe->note,1,true);
} }
print "</td></tr>"; print "</td></tr>";
if ($action == 'edit') if ($action == 'edit')
{ {
print '<tr><td colspan="2" align="center"><input type="submit" class="button" value="'.$langs->trans("Save").'"></td></tr>'; print '<tr><td colspan="2" align="center">';
} print '<input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
print ' &nbsp; ';
print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
print '</td></tr>';
}
print "</table>"; print "</table>";
print '</form>'; print '</form>';
} }
print '</div>'; print '</div>';
@ -163,5 +167,5 @@ if ($action != 'edit')
$db->close(); $db->close();
llxFooter('$Date$ - $Revision$'); llxFooter('$Date: 2011/07/13 16:24:57 $ - $Revision: 1.22 $');
?> ?>