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

Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Regis Houssin 2012-03-28 16:16:51 +02:00
commit 973146ee46
56 changed files with 273 additions and 220 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -9,6 +9,7 @@ to make a backup of your database before making upgrade.
For users:
- New: Each user can remove/add its own boxes.
- New: Add signature at end of predefined email text.
- New: Can use personalized fields of products/services.
- New: Can attach files on social contributions.
- New: Show payments terms and conditions onto muscadet template.

2
build/debian/dolibarr.postinst
View File

@ -83,7 +83,7 @@ case "$1" in
chown -R root:www-data $installconfig
chmod -R 660 $installconfig
if [ ! -f $config ]
if [ ! -s $config ]
then
# Create an empty conf.php with permission to web server
echo Create empty file $config

20
build/launchpad/README
View File

@ -61,5 +61,25 @@ DEBEMAIL="<Your email address>"
sudo pbuilder build <working-dir>/<project>_<version>.dsc
# To get/download package:
Add signing key of the Launchpad repository:
> gpg --keyserver keyserver.ubuntu.com --recv-key A38BF8FD
> sudo apt-key add ~/.gnupg/pubring.gpg
Add Dolibarr Launchpad repository to your system setup by adding the two lines to /etc/apt/sources.list
For the development snapshot version:
deb http://ppa.launchpad.net/eldy/dolibarr-dev/ubuntu precise main
deb-src http://ppa.launchpad.net/eldy/dolibarr-dev/ubuntu precise main
For the stable version:
deb http://ppa.launchpad.net/eldy/dolibarr-stable/ubuntu precise main
deb-src http://ppa.launchpad.net/eldy/dolibarr-stable/ubuntu precise main
Update your package cache:
> apt-get update
Install Dolibarr:
> apt-get install dolibarr

BIN
doc/images/dolibarr_120x90.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.1 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

BIN
doc/images/dolibarr_124x124.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.3 KiB

BIN
doc/images/dolibarr_125x125.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 6.8 KiB

BIN
doc/images/dolibarr_192x192.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 14 KiB

BIN
doc/images/dolibarr_256x256.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.7 KiB

BIN
doc/images/dolibarr_48x48.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
doc/images/dolibarr_73x73.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
doc/images/dolibarr_logo.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 17 KiB

BIN
doc/images/dolibarr_logo.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 77 KiB

After

Width:  |  Height:  |  Size: 41 KiB

BIN
doc/images/dolibarr_logo1.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 9.0 KiB

BIN
doc/images/dolibarr_logo1.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 27 KiB

BIN
doc/images/dolibarr_logo2.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 6.7 KiB

19
htdocs/admin/boxes.php
View File

@ -169,14 +169,25 @@ if ($action == 'switch')
$objto=new ModeleBoxes($db);
$objto->fetch($_GET["switchto"]);
$resultupdatefrom=0;
$resultupdateto=0;
if (is_object($objfrom) && is_object($objto))
{
$sql="UPDATE ".MAIN_DB_PREFIX."boxes set box_order='".$objto->box_order."' WHERE rowid=".$objfrom->rowid;
//print "xx".$sql;
$newfirst=$objto->box_order;
$newsecond=$objfrom->box_order;
if ($newfirst == $newsecond)
{
$newsecondchar=preg_replace('/[0-9]+/','',$newsecond);
$newsecondnum=preg_replace('/[a-zA-Z]+/','',$newsecond);
$newsecond=sprintf("%s%02d",$newsecondchar?$newsecondchar:'A',$newsecondnum+1);
}
$sql="UPDATE ".MAIN_DB_PREFIX."boxes set box_order='".$newfirst."' WHERE rowid=".$objfrom->rowid;
dol_syslog($sql);
$resultupdatefrom = $db->query($sql);
if (! $resultupdatefrom) { dol_print_error($db); }
$sql="UPDATE ".MAIN_DB_PREFIX."boxes set box_order='".$objfrom->box_order."' WHERE rowid=".$objto->rowid;
//print "xx".$sql;
$sql="UPDATE ".MAIN_DB_PREFIX."boxes set box_order='".$newsecond."' WHERE rowid=".$objto->rowid;
dol_syslog($sql);
$resultupdateto = $db->query($sql);
if (! $resultupdateto) { dol_print_error($db); }
}

18
htdocs/admin/mails.php
View File

@ -162,8 +162,7 @@ if (! empty($_POST['removedfile']) || ! empty($_POST['removedfilehtml']))
/*
* Send mail
*/
if (($action == 'send' || $action == 'sendhtml')
&& ! $_POST['addfile'] && ! $_POST['addfilehtml'] && ! $_POST["removedfile"] && ! $_POST['cancel'])
if (($action == 'send' || $action == 'sendhtml') && ! $_POST['addfile'] && ! $_POST['addfilehtml'] && ! $_POST["removedfile"] && ! $_POST['cancel'])
{
$error=0;
@ -212,9 +211,18 @@ if (($action == 'send' || $action == 'sendhtml')
require_once(DOL_DOCUMENT_ROOT."/core/class/CMailFile.class.php");
$mailfile = new CMailFile(
$subject, $sendto, $email_from, $body,
$filepath, $mimetype, $filename,
$sendtocc, $sendtoccc, $deliveryreceipt, $msgishtml, $errors_to
$subject,
$sendto,
$email_from,
$body,
$filepath,
$mimetype,
$filename,
$sendtocc,
$sendtoccc,
$deliveryreceipt,
$msgishtml,
$errors_to
);
$result=$mailfile->sendfile();

18
htdocs/admin/propal.php
View File

@ -46,8 +46,8 @@ $value = GETPOST('value','alpha');
if ($action == 'updateMask')
{
$maskconstpropal=GETPOST("maskconstpropal");
$maskpropal=GETPOST("maskpropal");
$maskconstpropal=GETPOST('maskconstpropal','alpha');
$maskpropal=GETPOST('maskpropal','alpha');
if ($maskconstpropal) $res = dolibarr_set_const($db,$maskconstpropal,$maskpropal,'chaine',0,'',$conf->entity);
if (! $res > 0) $error++;
@ -64,7 +64,7 @@ if ($action == 'updateMask')
if ($action == 'specimen')
{
$modele=GETPOST("module");
$modele=GETPOST('module','alpha');
$propal = new Propal($db);
$propal->initAsSpecimen();
@ -109,7 +109,7 @@ if ($action == 'specimen')
if ($action == 'set_PROPALE_DRAFT_WATERMARK')
{
$draft = GETPOST("PROPALE_DRAFT_WATERMARK");
$draft = GETPOST('PROPALE_DRAFT_WATERMARK','alpha');
$res = dolibarr_set_const($db, "PROPALE_DRAFT_WATERMARK",trim($draft),'chaine',0,'',$conf->entity);
if (! $res > 0) $error++;
@ -126,7 +126,7 @@ if ($action == 'set_PROPALE_DRAFT_WATERMARK')
if ($action == 'set_PROPALE_FREE_TEXT')
{
$freetext = GETPOST("PROPALE_FREE_TEXT");
$freetext = GETPOST('PROPALE_FREE_TEXT','alpha');
$res = dolibarr_set_const($db, "PROPALE_FREE_TEXT",$freetext,'chaine',0,'',$conf->entity);
@ -183,8 +183,8 @@ if ($action == 'setclassifiedinvoiced')
if ($action == 'set')
{
$label = GETPOST("label");
$scandir = GETPOST("scandir");
$label = GETPOST('label','alpha');
$scandir = GETPOST('scandir','alpha');
$type='propal';
$sql = "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity, libelle, description)";
@ -210,8 +210,8 @@ else if ($action == 'del')
else if ($action == 'setdoc')
{
$label = GETPOST("label");
$scandir = GETPOST("scandir");
$label = GETPOST('label','alpha');
$scandir = GETPOST('scandir','alpha');
$db->begin();

52
htdocs/admin/tools/export.php
View File

@ -102,7 +102,7 @@ $time_start = time();
// MYSQL
if ($what == 'mysql')
{
$cmddump=$_POST["mysqldump"];
$cmddump=GETPOST("mysqldump"); // Do not sanitize here with 'alpha', will be sanitize later by escapeshellarg
if ($cmddump)
{
dolibarr_set_const($db, 'SYSTEMTOOLS_MYSQLDUMP', $cmddump,'chaine',0,'',$conf->entity);
@ -111,7 +111,7 @@ if ($what == 'mysql')
$outputdir = $conf->admin->dir_output.'/backup';
$outputfile = $outputdir.'/'.$file;
// for compression format, we add extension
$compression=isset($_POST['compression']) ? $_POST['compression'] : 'none';
$compression=GETPOST('compression') ? GETPOST('compression','alpha') : 'none';
if ($compression == 'gz') $outputfile.='.gz';
if ($compression == 'bz') $outputfile.='.bz2';
$outputerror = $outputfile.'.err';
@ -125,28 +125,28 @@ if ($what == 'mysql')
$param=$dolibarr_main_db_name." -h ".$dolibarr_main_db_host;
$param.=" -u ".$dolibarr_main_db_user;
if (! empty($dolibarr_main_db_port)) $param.=" -P ".$dolibarr_main_db_port;
if (! $_POST["use_transaction"]) $param.=" -l --single-transaction";
if ($_POST["disable_fk"]) $param.=" -K";
if ($_POST["sql_compat"] && $_POST["sql_compat"] != 'NONE') $param.=" --compatible=".$_POST["sql_compat"];
if ($_POST["drop_database"]) $param.=" --add-drop-database";
if ($_POST["sql_structure"])
if (! GETPOST("use_transaction")) $param.=" -l --single-transaction";
if (GETPOST("disable_fk")) $param.=" -K";
if (GETPOST("sql_compat") && GETPOST("sql_compat") != 'NONE') $param.=" --compatible=".GETPOST("sql_compat","alpha");
if (GETPOST("drop_database")) $param.=" --add-drop-database";
if (GETPOST("sql_structure"))
{
if ($_POST["drop"]) $param.=" --add-drop-table";
if (GETPOST("drop")) $param.=" --add-drop-table";
}
else
{
$param.=" -t";
}
if ($_POST["disable-add-locks"]) $param.=" --add-locks=FALSE";
if ($_POST["sql_data"])
if (GETPOST("disable-add-locks")) $param.=" --add-locks=FALSE";
if (GETPOST("sql_data"))
{
$param.=" --tables";
if ($_POST["showcolumns"]) $param.=" -c";
if ($_POST["extended_ins"]) $param.=" -e";
if (GETPOST("showcolumns")) $param.=" -c";
if (GETPOST("extended_ins")) $param.=" -e";
else $param.=" --skip-extended-insert";
if ($_POST["delayed"]) $param.=" --delayed-insert";
if ($_POST["sql_ignore"]) $param.=" --insert-ignore";
if ($_POST["hexforbinary"]) $param.=" --hex-blob";
if (GETPOST("delayed")) $param.=" --delayed-insert";
if (GETPOST("sql_ignore")) $param.=" --insert-ignore";
if (GETPOST("hexforbinary")) $param.=" --hex-blob";
}
else
{
@ -244,7 +244,7 @@ if ($what == 'mysqlnobin')
$outputfile = $outputdir.'/'.$file;
$outputfiletemp = $outputfile.'-TMP.sql';
// for compression format, we add extension
$compression=isset($_POST['compression']) ? $_POST['compression'] : 'none';
$compression=GETPOST('compression') ? GETPOST('compression','alpha') : 'none';
if ($compression == 'gz') $outputfile.='.gz';
if ($compression == 'bz') $outputfile.='.bz2';
$outputerror = $outputfile.'.err';
@ -265,7 +265,7 @@ if ($what == 'mysqlnobin')
// POSTGRESQL
if ($what == 'postgresql')
{
$cmddump=$_POST["postgresqldump"];
$cmddump=GETPOST("postgresqldump"); // Do not sanitize here with 'alpha', will be sanitize later by escapeshellarg
if ($cmddump)
{
dolibarr_set_const($db, 'SYSTEMTOOLS_POSTGRESQLDUMP', $cmddump,'chaine',0,'',$conf->entity);
@ -274,7 +274,7 @@ if ($what == 'postgresql')
$outputdir = $conf->admin->dir_output.'/backup';
$outputfile = $outputdir.'/'.$file;
// for compression format, we add extension
$compression=isset($_POST['compression']) ? $_POST['compression'] : 'none';
$compression=GETPOST('compression') ? GETPOST('compression','alpha') : 'none';
if ($compression == 'gz') $outputfile.='.gz';
if ($compression == 'bz') $outputfile.='.bz2';
$outputerror = $outputfile.'.err';
@ -288,17 +288,17 @@ if ($what == 'postgresql')
$param=" --no-tablespaces --inserts -h ".$dolibarr_main_db_host;
$param.=" -U ".$dolibarr_main_db_user;
if (! empty($dolibarr_main_db_port)) $param.=" -p ".$dolibarr_main_db_port;
if ($_POST["sql_compat"] && $_POST["sql_compat"] == 'ANSI') $param.=" --disable-dollar-quoting";
if ($_POST["drop_database"]) $param.=" -c -C";
if ($_POST["sql_structure"])
if (GETPOST("sql_compat") && GETPOST("sql_compat") == 'ANSI') $param.=" --disable-dollar-quoting";
if (GETPOST("drop_database")) $param.=" -c -C";
if (GETPOST("sql_structure"))
{
if ($_POST["drop"]) $param.=" --add-drop-table";
if (empty($_POST["sql_data"])) $param.=" -s";
if (GETPOST("drop")) $param.=" --add-drop-table";
if (! GETPOST("sql_data")) $param.=" -s";
}
if ($_POST["sql_data"])
if (GETPOST("sql_data"))
{
if (empty($_POST["sql_structure"])) $param.=" -a";
if ($_POST["showcolumns"]) $param.=" -c";
if (! GETPOST("sql_structure")) $param.=" -a";
if (GETPOST("showcolumns")) $param.=" -c";
}
$param.=' -f "'.$outputfile.'"';
//if ($compression == 'none')

4
htdocs/cashdesk/affContenu.php
View File

@ -47,8 +47,8 @@ print '<div class="liste_articles">';
require ('tpl/liste_articles.tpl.php');
$obj_facturation->prix_total_ht($lst_total_ht);
$obj_facturation->prix_total_ttc($lst_total_ttc);
$obj_facturation->prixTotalHt($lst_total_ht);
$obj_facturation->prixTotalTtc($lst_total_ttc);
print '</div>';

12
htdocs/cashdesk/class/Facturation.class.php
View File

@ -253,9 +253,9 @@ class Facturation
$this->montantRendu('RESET');
$this->paiementLe('RESET');
$this->prix_total_ht('RESET');
$this->montant_tva('RESET');
$this->prix_total_ttc('RESET');
$this->prixTotalHt('RESET');
$this->montantTva('RESET');
$this->prixTotalTtc('RESET');
}
@ -588,7 +588,7 @@ class Facturation
* @param int $aTotalHt Total amount
* @return int Total amount
*/
public function prix_total_ht( $aTotalHt=null )
public function prixTotalHt( $aTotalHt=null )
{
if ( !$aTotalHt ) {
@ -611,7 +611,7 @@ class Facturation
* @param int $aMontantTva Amount vat
* @return int Amount vat
*/
public function montant_tva( $aMontantTva=null )
public function montantTva( $aMontantTva=null )
{
if ( !$aMontantTva ) {
@ -635,7 +635,7 @@ class Facturation
* @param int $aTotalTtc Amount ttc
* @return int Amount ttc
*/
public function prix_total_ttc( $aTotalTtc=null )
public function prixTotalTtc( $aTotalTtc=null )
{
if ( !$aTotalTtc )
{

2
htdocs/cashdesk/tpl/facturation1.tpl.php
View File

@ -169,7 +169,7 @@ $langs->load("cashdesk");
<tr><th class="label1"><?php echo $langs->trans("TotalTicket"); ?></th><th class="label1"><?php echo $langs->trans("Received"); ?></th><th class="label1"><?php echo $langs->trans("Change"); ?></th></tr>
<tr>
<!-- Affichage du montant du -->
<td><input class="texte2_off" type="text" name="txtDu" value="<?php echo price2num($obj_facturation->prix_total_ttc(), 'MT'); ?>" disabled="disabled" /></td>
<td><input class="texte2_off" type="text" name="txtDu" value="<?php echo price2num($obj_facturation->prixTotalTtc(), 'MT'); ?>" disabled="disabled" /></td>
<!-- Choix du montant encaisse -->
<td><input class="texte2" type="text" name="txtEncaisse" value="" onkeyup="javascript: verifDifference();" onfocus="javascript: this.select();" /></td>
<!-- Affichage du montant rendu -->

2
htdocs/cashdesk/tpl/liste_articles.tpl.php
View File

@ -68,7 +68,7 @@ else
}
$obj_facturation->calculTotaux();
$total_ttc = $obj_facturation->prix_total_ttc();
$total_ttc = $obj_facturation->prixTotalTtc();
echo ('<p class="cadre_prix_total">'.$langs->trans("Total").' : '.price2num($total_ttc, 'MT').' '.$conf->currency.'<br></p>'."\n");
?></div>

6
htdocs/cashdesk/tpl/ticket.tpl.php
View File

@ -138,9 +138,9 @@ print $object->ref;
<table class="totaux">
<?php
echo '<tr><th nowrap="nowrap">'.$langs->trans("TotalHT").'</th><td nowrap="nowrap">'.price2num($obj_facturation->prix_total_ht(),'MT')." ".$conf->currency."</td></tr>\n";
echo '<tr><th nowrap="nowrap">'.$langs->trans("TotalVAT").'</th><td nowrap="nowrap">'.price2num($obj_facturation->montant_tva(),'MT')." ".$conf->currency."</td></tr>\n";
echo '<tr><th nowrap="nowrap">'.$langs->trans("TotalTTC").'</th><td nowrap="nowrap">'.price2num($obj_facturation->prix_total_ttc(),'MT')." ".$conf->currency."</td></tr>\n";
echo '<tr><th nowrap="nowrap">'.$langs->trans("TotalHT").'</th><td nowrap="nowrap">'.price2num($obj_facturation->prixTotalHt(),'MT')." ".$conf->currency."</td></tr>\n";
echo '<tr><th nowrap="nowrap">'.$langs->trans("TotalVAT").'</th><td nowrap="nowrap">'.price2num($obj_facturation->montantTva(),'MT')." ".$conf->currency."</td></tr>\n";
echo '<tr><th nowrap="nowrap">'.$langs->trans("TotalTTC").'</th><td nowrap="nowrap">'.price2num($obj_facturation->prixTotalTtc(),'MT')." ".$conf->currency."</td></tr>\n";
?>
</table>

8
htdocs/cashdesk/tpl/validation1.tpl.php
View File

@ -26,12 +26,12 @@ $langs->load("main");
<table class="table_resume">
<tr><td class="resume_label"><?php echo $langs->trans("Invoice"); ?></td><td><?php echo $obj_facturation->numInvoice(); ?></td></tr>
<tr><td class="resume_label"><?php echo $langs->trans("TotalHT"); ?></td><td><?php echo price2num($obj_facturation->prix_total_ht(),'MT').' '.$conf->currency; ?></td></tr>
<tr><td class="resume_label"><?php echo $langs->trans("TotalHT"); ?></td><td><?php echo price2num($obj_facturation->prixTotalHt(),'MT').' '.$conf->currency; ?></td></tr>
<?php
// Affichage de la tva par taux
if ( $obj_facturation->montant_tva() ) {
if ( $obj_facturation->montantTva() ) {
echo ('<tr><td class="resume_label">'.$langs->trans("VAT").'</td><td>'.price2num($obj_facturation->montant_tva(),'MT').' '.$conf->currency.'</td></tr>');
echo ('<tr><td class="resume_label">'.$langs->trans("VAT").'</td><td>'.price2num($obj_facturation->montantTva(),'MT').' '.$conf->currency.'</td></tr>');
}
else
@ -41,7 +41,7 @@ $langs->load("main");
}
?>
<tr><td class="resume_label"><?php echo $langs->trans("TotalTTC"); ?> </td><td><?php echo price2num($obj_facturation->prix_total_ttc(),'MT').' '.$conf->currency; ?></td></tr>
<tr><td class="resume_label"><?php echo $langs->trans("TotalTTC"); ?> </td><td><?php echo price2num($obj_facturation->prixTotalTtc(),'MT').' '.$conf->currency; ?></td></tr>
<tr><td class="resume_label"><?php echo $langs->trans("PaymentMode"); ?> </td><td>
<?php
switch ($obj_facturation->getSetPaymentMode())

14
htdocs/cashdesk/validation_verif.php
View File

@ -57,7 +57,7 @@ switch ($action)
// Si paiement autre qu'en especes, montant encaisse = prix total
$mode_reglement = $obj_facturation->getSetPaymentMode();
if ( $mode_reglement != 'ESP' ) {
$montant = $obj_facturation->prix_total_ttc();
$montant = $obj_facturation->prixTotalTtc();
} else {
$montant = $_POST['txtEncaisse'];
}
@ -66,7 +66,7 @@ switch ($action)
$obj_facturation->montantEncaisse($montant);
//Determination de la somme rendue
$total = $obj_facturation->prix_total_ttc();
$total = $obj_facturation->prixTotalTtc();
$encaisse = $obj_facturation->montantEncaisse();
$obj_facturation->montantRendu($encaisse - $total);
@ -198,9 +198,9 @@ switch ($action)
$invoice->date_creation=$now;
$invoice->date=$now;
$invoice->date_lim_reglement=0;
$invoice->total_ht=$obj_facturation->prix_total_ht();
$invoice->total_tva=$obj_facturation->montant_tva();
$invoice->total_ttc=$obj_facturation->prix_total_ttc();
$invoice->total_ht=$obj_facturation->prixTotalHt();
$invoice->total_tva=$obj_facturation->montantTva();
$invoice->total_ttc=$obj_facturation->prixTotalTtc();
$invoice->note=$note;
$invoice->cond_reglement_id=$cond_reglement_id;
$invoice->mode_reglement_id=$mode_reglement_id;
@ -234,7 +234,7 @@ switch ($action)
$payment=new Paiement($db);
$payment->datepaye=$now;
$payment->bank_account=$conf_fkaccount;
$payment->amounts[$invoice->id]=$obj_facturation->prix_total_ttc();
$payment->amounts[$invoice->id]=$obj_facturation->prixTotalTtc();
$payment->note=$langs->trans("Payment").' '.$langs->trans("Invoice").' '.$obj_facturation->numInvoice();
$payment->paiementid=$invoice->mode_reglement_id;
$payment->num_paiement='';
@ -254,7 +254,7 @@ switch ($action)
if (! $error)
{
if ($invoice->total_ttc == $obj_facturation->prix_total_ttc()
if ($invoice->total_ttc == $obj_facturation->prixTotalTtc()
&& $obj_facturation->getSetPaymentMode() != 'DIFF')
{
// We set status to payed

2
htdocs/comm/propal.php
View File

@ -1823,7 +1823,7 @@ if ($id > 0 || ! empty($ref))
// Tableau des substitutions
$formmail->substit['__PROPREF__']=$object->ref;
$formmail->substit['__SIGNATURE__']='';
$formmail->substit['__SIGNATURE__']=$user->signature;
$formmail->substit['__PERSONALIZED__']='';
// Tableau des parametres complementaires
$formmail->param['action']='send';

2
htdocs/commande/fiche.php
View File

@ -2282,7 +2282,7 @@ else
$formmail->withcancel=1;
// Tableau des substitutions
$formmail->substit['__ORDERREF__']=$object->ref;
$formmail->substit['__SIGNATURE__']='';
$formmail->substit['__SIGNATURE__']=$user->signature;
$formmail->substit['__PERSONALIZED__']='';
// Tableau des parametres complementaires
$formmail->param['action']='send';

61
htdocs/compta/deplacement/fiche.php
View File

@ -2,6 +2,7 @@
/* Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2012 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2012 Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2012 Juanjo Menent <jmenent@2byte.es>
*
* 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
@ -40,8 +41,8 @@ $id = GETPOST('id','int');
if ($user->societe_id) $socid=$user->societe_id;
$result = restrictedArea($user, 'deplacement', $id,'');
$action = GETPOST('action');
$confirm = GETPOST('confirm');
$action = GETPOST('action','alpha');
$confirm = GETPOST('confirm','alpha');
$mesg = '';
@ -115,17 +116,17 @@ else if ($action == 'confirm_delete' && $confirm == "yes" && $user->rights->depl
else if ($action == 'add' && $user->rights->deplacement->creer)
{
if (! $_POST["cancel"])
if (! GETPOST('cancel','alpha'))
{
$error=0;
$object->date = dol_mktime(12, 0, 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]);
$object->km = $_POST["km"];
$object->type = $_POST["type"];
$object->socid = $_POST["socid"];
$object->fk_user = $_POST["fk_user"];
$object->note_private = $_POST["note_private"];
$object->note_public = $_POST["note_public"];
$object->date = dol_mktime(12, 0, 0, GETPOST('remonth','int'), GETPOST('reday','int'), GETPOST('reyear','int'));
$object->km = GETPOST('km','int');
$object->type = GETPOST('type','alpha');
$object->socid = GETPOST('socid','int');
$object->fk_user = GETPOST('fk_user','int');
$object->note_private = GETPOST('note_private','alpha');
$object->note_public = GETPOST('note_public','alpha');
$object->statut = 0;
if (! $object->date)
@ -174,17 +175,17 @@ else if ($action == 'add' && $user->rights->deplacement->creer)
// Update record
else if ($action == 'update' && $user->rights->deplacement->creer)
{
if (empty($_POST["cancel"]))
if (! GETPOST('cancel','alpha'))
{
$result = $object->fetch($id);
$object->date = dol_mktime(12, 0, 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]);
$object->km = $_POST["km"];
$object->type = $_POST["type"];
$object->fk_user = $_POST["fk_user"];
$object->socid = $_POST["socid"];
$object->note_private = $_POST["note_private"];
$object->note_public = $_POST["note_public"];
$object->date = dol_mktime(12, 0, 0, GETPOST('remonth','int'), GETPOST('reday','int'), GETPOST('reyear','int'));
$object->km = GETPOST('km','int');
$object->type = GETPOST('type','alpha');
$object->socid = GETPOST('socid','int');
$object->fk_user = GETPOST('fk_user','int');
$object->note_private = GETPOST('note_private','alpha');
$object->note_public = GETPOST('note_public','alpha');
$result = $object->update($user);
@ -209,14 +210,14 @@ else if ($action == 'update' && $user->rights->deplacement->creer)
else if ($action == 'classin' && $user->rights->deplacement->creer)
{
$object->fetch($id);
$result=$object->setProject($_POST['projectid']);
$result=$object->setProject(GETPOST('projectid','int'));
if ($result < 0) dol_print_error($db, $object->error);
}
// Set fields
else if ($action == 'setdated' && $user->rights->deplacement->creer)
{
$dated=dol_mktime($_POST['datedhour'], $_POST['datedmin'], $_POST['datedsec'], $_POST['datedmonth'], $_POST['datedday'], $_POST['datedyear']);
$dated=dol_mktime(GETPOST('datedhour','int'), GETPOST('datedmin','int'), GETPOST('datedsec','int'), GETPOST('datedmonth','int'), GETPOST('datedday','int'), GETPOST('datedyear','int'));
$object->fetch($id);
$result=$object->setValueFrom('dated',$dated,'','','date');
if ($result < 0) dol_print_error($db, $object->error);
@ -224,19 +225,19 @@ else if ($action == 'setdated' && $user->rights->deplacement->creer)
else if ($action == 'setkm' && $user->rights->deplacement->creer)
{
$object->fetch($id);
$result=$object->setValueFrom('km',GETPOST('km'));
$result=$object->setValueFrom('km',GETPOST('km','int'));
if ($result < 0) dol_print_error($db, $object->error);
}
else if ($action == 'setnote_public' && $user->rights->deplacement->creer)
{
$object->fetch($id);
$result=$object->setValueFrom('note_public',GETPOST('note_public'));
$result=$object->setValueFrom('note_public',GETPOST('note_public','alpha'));
if ($result < 0) dol_print_error($db, $object->error);
}
else if ($action == 'setnote' && $user->rights->deplacement->creer)
{
$object->fetch($id);
$result=$object->setValueFrom('note',GETPOST('note'));
$result=$object->setValueFrom('note',GETPOST('note','alpha'));
if ($result < 0) dol_print_error($db, $object->error);
}
@ -258,7 +259,7 @@ if ($action == 'create')
dol_htmloutput_errors($mesg);
$datec = dol_mktime(12, 0, 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]);
$datec = dol_mktime(12, 0, 0, GETPOST('remonth','int'), GETPOST('reday','int'), GETPOST('reyear','int'));
print '<form name="add" action="' . $_SERVER["PHP_SELF"] . '" method="POST">' . "\n";
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@ -268,12 +269,12 @@ if ($action == 'create')
print "<tr>";
print '<td width="25%" class="fieldrequired">'.$langs->trans("Type").'</td><td>';
print $form->select_type_fees(GETPOST("type"),'type',1);
print $form->select_type_fees(GETPOST('type','int'),'type',1);
print '</td></tr>';
print "<tr>";
print '<td class="fieldrequired">'.$langs->trans("Person").'</td><td>';
print $form->select_users(GETPOST("fk_user"),'fk_user',1);
print $form->select_users(GETPOST('fk_user','int'),'fk_user',1);
print '</td></tr>';
print "<tr>";
@ -295,7 +296,7 @@ if ($action == 'create')
print '<td class="border" valign="top">'.$langs->trans('NotePublic').'</td>';
print '<td valign="top" colspan="2">';
require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php");
$doleditor=new DolEditor('note_public',GETPOST('note_public'),600,200,'dolibarr_notes','In',false,true,true,ROWS_8,100);
$doleditor=new DolEditor('note_public',GETPOST('note_public','alpha'),600,200,'dolibarr_notes','In',false,true,true,ROWS_8,100);
print $doleditor->Create(1);
print '</td></tr>';
@ -306,7 +307,7 @@ if ($action == 'create')
print '<td class="border" valign="top">'.$langs->trans('NotePrivate').'</td>';
print '<td valign="top" colspan="2">';
require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php");
$doleditor=new DolEditor('note_private',GETPOST('note_private'),600,200,'dolibarr_notes','In',false,true,true,ROWS_8,100);
$doleditor=new DolEditor('note_private',GETPOST('note_private','alpha'),600,200,'dolibarr_notes','In',false,true,true,ROWS_8,100);
print $doleditor->Create(1);
print '</td></tr>';
}
@ -353,13 +354,13 @@ else if ($id)
// Type
print "<tr>";
print '<td class="fieldrequired">'.$langs->trans("Type").'</td><td>';
print $form->select_type_fees($_POST["type"]?$_POST["type"]:$object->type,'type',0);
print $form->select_type_fees(GETPOST('type','int')?GETPOST('type','int'):$object->type,'type',0);
print '</td></tr>';
// Who
print "<tr>";
print '<td class="fieldrequired">'.$langs->trans("Person").'</td><td>';
print $form->select_users($_POST["fk_user"]?$_POST["fk_user"]:$object->fk_user,'fk_user',0);
print $form->select_users(GETPOST('fk_user','int')?GETPOST('fk_user','int'):$object->fk_user,'fk_user',0);
print '</td></tr>';
// Date

3
htdocs/compta/deplacement/list.php
View File

@ -3,6 +3,7 @@
* Copyright (C) 2004-2012 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2004 Eric Seigne <eric.seigne@ryxeo.com>
* Copyright (C) 2005-2011 Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2012 Juanjo Menent <jmenent@2byte.es>
*
* 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
@ -47,7 +48,7 @@ if (! $sortorder) $sortorder="DESC";
if (! $sortfield) $sortfield="d.dated";
$limit = $conf->liste_limit;
$search_ref=GETPOST('search_ref');
$search_ref=GETPOST('search_ref','alpha');
/*

2
htdocs/compta/facture.php
View File

@ -3182,7 +3182,7 @@ else
$formmail->withcancel=1;
// Tableau des substitutions
$formmail->substit['__FACREF__']=$object->ref;
$formmail->substit['__SIGNATURE__']='';
$formmail->substit['__SIGNATURE__']=$user->signature;
$formmail->substit['__PERSONALIZED__']='';
// Tableau des parametres complementaires du post
$formmail->param['action']=$action;

5
htdocs/core/ajax/ajaxdirpreview.php
View File

@ -141,9 +141,10 @@ $type='directory';
// This test if file exists should be useless. We keep it to find bug more easily
if (! dol_is_dir($upload_dir))
{
$langs->load("install");
// dol_mkdir($upload_dir);
/* $langs->load("install");
dol_print_error(0,$langs->trans("ErrorDirDoesNotExists",$upload_dir));
exit;
exit;*/
}
print '<!-- TYPE='.$type.' -->'."\n";

2
htdocs/core/ajax/ajaxdirtree.php
View File

@ -152,7 +152,7 @@ if( file_exists($fullpathselecteddir) )
print '</td>';
// Edit link
print '<td align="right" width="18"><a href="'.DOL_URL_ROOT.'/ecm/docmine.php?section='.$val['id'].'&relativedir='.urlencode($val['fullrelativename']).'">'.img_view().'</a></td>';
print '<td align="right" width="18"><a href="'.DOL_URL_ROOT.'/ecm/docmine.php?section='.$val['id'].'&relativedir='.urlencode($val['fullrelativename']).'">'.img_view('',$langs->trans("Edit").' - '.$langs->trans("View")).'</a></td>';
// Add link
//print '<td align="right"><a href="'.DOL_URL_ROOT.'/ecm/docdir.php?action=create&amp;catParent='.$val['id'].'">'.img_edit_add().'</a></td>';

1
htdocs/core/menus/smartphone/smartphone_frontoffice.php
View File

@ -48,6 +48,7 @@ class MenuSmart
* Show menu
*
* @param string $limitmenuto To limit menu to a top or left menu value
* @return void
*/
function showmenu($limitmenuto)
{

18
htdocs/core/modules/facture/modules_facture.php
View File

@ -147,15 +147,15 @@ abstract class ModeleNumRefFactures
/**
* Create a document onto disk according to template module.
*
* @param DoliDB $db Database handler
* @param Object $object Object invoice
* @param string $modele Force template to use ('' to not force)
* @param Translate $outputlangs objet lang a utiliser pour traduction
* @param int $hidedetails Hide details of lines
* @param int $hidedesc Hide description
* @param int $hideref Hide ref
* @param HookManager $hookmanager Hook manager instance
* @return int <0 if KO, >0 if OK
* @param DoliDB $db Database handler
* @param Object $object Object invoice
* @param string $modele Force template to use ('' to not force)
* @param Translate $outputlangs objet lang a utiliser pour traduction
* @param int $hidedetails Hide details of lines
* @param int $hidedesc Hide description
* @param int $hideref Hide ref
* @param HookManager $hookmanager Hook manager instance
* @return int <0 if KO, >0 if OK
*/
function facture_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0, $hookmanager=false)
{

7
htdocs/core/modules/fichinter/modules_fichinter.php
View File

@ -30,8 +30,7 @@ require_once(DOL_DOCUMENT_ROOT."/core/class/commondocgenerator.class.php");
/**
* \class ModelePDFFicheinter
* \brief Classe mere des modeles de fiche intervention
* Parent class to manage intervention document templates
*/
abstract class ModelePDFFicheinter extends CommonDocGenerator
{
@ -149,6 +148,10 @@ abstract class ModeleNumRefFicheinter
* @param Object $object Object fichinter
* @param string $modele force le modele a utiliser ('' par defaut)
* @param Translate $outputlangs objet lang a utiliser pour traduction
* @param int $hidedetails Hide details of lines
* @param int $hidedesc Hide description
* @param int $hideref Hide ref
* @param HookManager $hookmanager Hook manager instance
* @return int 0 if KO, 1 if OK
*/
function fichinter_create($db, $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0, $hookmanager=false)

2
htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
View File

@ -741,7 +741,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
$y+=3;
$row = $this->db->fetch_object($resql);
$pdf->SetXY($tab3_posx, $tab3_top+$y );
$pdf->SetXY($tab3_posx, $tab3_top+$y);
$pdf->MultiCell(20, 3, dol_print_date($this->db->jdate($row->date),'day',false,$outputlangs,true), 0, 'L', 0);
$pdf->SetXY($tab3_posx+21, $tab3_top+$y);
$pdf->MultiCell(20, 3, price($row->amount), 0, 'L', 0);

9
htdocs/core/triggers/interface_20_all_Logevents.class.php
View File

@ -17,15 +17,14 @@
*/
/**
* \file htdocs/core/triggers/interface_20_all_Logevents.class.php
* \ingroup core
* \brief Trigger file for
* \file htdocs/core/triggers/interface_20_all_Logevents.class.php
* \ingroup core
* \brief Trigger file for
*/
/**
* \class InterfaceLogevents
* \brief Class of triggers for security events
* Class of triggers for security events
*/
class InterfaceLogevents
{

3
htdocs/core/triggers/interface_20_modPaypal_PaypalWorkflow.class.php
View File

@ -23,8 +23,7 @@
/**
* \class InterfacePaypalWorkflow
* \brief Class of triggers for paypal module
* Class of triggers for paypal module
*/
class InterfacePaypalWorkflow
{

10
htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
View File

@ -17,15 +17,14 @@
*/
/**
* \file htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
* \ingroup core
* \brief Trigger file for workflows
* \file htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
* \ingroup core
* \brief Trigger file for workflows
*/
/**
* \class InterfaceWorkflowManager
* \brief Class of triggers for workflow module
* Class of triggers for workflow module
*/
class InterfaceWorkflowManager
@ -95,7 +94,6 @@ class InterfaceWorkflowManager
* @param User $user Object user
* @param Translate $langs Object langs
* @param conf $conf Object conf
* @param string $entity Value for instance of data (Always 1 except if module MultiCompany is installed)
* @return int <0 if KO, 0 if no triggered ran, >0 if OK
*/
function run_trigger($action,$object,$user,$langs,$conf)

3
htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
View File

@ -25,8 +25,7 @@
/**
* \class InterfaceActionsAuto
* \brief Class of triggered functions for agenda module
* Class of triggered functions for agenda module
*/
class InterfaceActionsAuto
{

9
htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
View File

@ -16,16 +16,15 @@
*/
/**
* \file htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
* \ingroup core
* \brief Fichier de gestion des triggers LDAP
* \file htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
* \ingroup core
* \brief Fichier de gestion des triggers LDAP
*/
require_once (DOL_DOCUMENT_ROOT."/core/class/ldap.class.php");
/**
* \class InterfaceLdapsynchro
* \brief Class of triggers for ldap module
* Class of triggers for ldap module
*/
class InterfaceLdapsynchro
{

9
htdocs/core/triggers/interface_50_modNotification_Notification.class.php
View File

@ -17,15 +17,14 @@
*/
/**
* \file htdocs/core/triggers/interface_50_modNotification_Notification.class.php
* \ingroup notification
* \brief File of class of triggers for notification module
* \file htdocs/core/triggers/interface_50_modNotification_Notification.class.php
* \ingroup notification
* \brief File of class of triggers for notification module
*/
/**
* \class InterfaceNotification
* \brief Class of triggers for notification module
* Class of triggers for notification module
*/
class InterfaceNotification
{

26
htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
View File

@ -17,22 +17,21 @@
*/
/**
* \file htdocs/core/triggers/interface_90_all_Demo.class.php
* \ingroup core
* \brief Fichier de demo de personalisation des actions du workflow
* \remarks Son propre fichier d'actions peut etre cree par recopie de celui-ci:
* - Le nom du fichier doit etre: interface_99_modMymodule_Mytrigger.class.php
* ou: interface_99_all_Mytrigger.class.php
* - Le fichier doit rester stocke dans core/triggers
* - Le nom de la classe doit etre InterfaceMytrigger
* - Le nom de la methode constructeur doit etre InterfaceMytrigger
* - Le nom de la propriete name doit etre Mytrigger
* \file htdocs/core/triggers/interface_90_all_Demo.class.php
* \ingroup core
* \brief Fichier de demo de personalisation des actions du workflow
* \remarks Son propre fichier d'actions peut etre cree par recopie de celui-ci:
* - Le nom du fichier doit etre: interface_99_modMymodule_Mytrigger.class.php
* ou: interface_99_all_Mytrigger.class.php
* - Le fichier doit rester stocke dans core/triggers
* - Le nom de la classe doit etre InterfaceMytrigger
* - Le nom de la methode constructeur doit etre InterfaceMytrigger
* - Le nom de la propriete name doit etre Mytrigger
*/
/**
* \class InterfaceDemo
* \brief Class of triggers for demo module
* Class of triggers for demo module
*/
class InterfaceDemo
{
@ -57,6 +56,7 @@ class InterfaceDemo
/**
* Return name of trigger file
*
* @return string Name of trigger file
*/
function getName()
@ -66,6 +66,7 @@ class InterfaceDemo
/**
* Return description of trigger file
*
* @return string Description of trigger file
*/
function getDesc()
@ -75,6 +76,7 @@ class InterfaceDemo
/**
* Return version of trigger file
*
* @return string Version of trigger file
*/
function getVersion()

8
htdocs/ecm/index.php
View File

@ -327,7 +327,7 @@ $moreheadjs="
, north__paneSelector: \"#ecm-layout-north\"
, west__paneSelector: \"#ecm-layout-west\"
, resizable: true
, north__size: 34
, north__size: 32
, north__resizable: false
, north__closable: false
, west__size: 340
@ -395,7 +395,7 @@ else
print '<tr><td colspan="2" style="background: #FFFFFF" style="height: 34px !important">';
}
// Start top panel, toolbar
print '<div class="toolbarbutton">';
// Toolbar
if ($user->rights->ecm->setup)
@ -414,7 +414,7 @@ print '<a href="'.$_SERVER["PHP_SELF"].'?action=refreshmanual'.($module?'&amp;mo
print '<img class="toolbarbutton" border="0" src="'.DOL_URL_ROOT.'/theme/common/view-refresh.png">';
print '</a>';
print '</div>';
// End top panel, toolbar
if ($conf->use_javascript_ajax)
{
@ -784,7 +784,7 @@ if (empty($action) || $action == 'file_manager' || preg_match('/refresh/i',$acti
print '</td>';
// Edit link
print '<td align="right"><a href="'.DOL_URL_ROOT.'/ecm/docmine.php?section='.$val['id'].'">'.img_view().'</a></td>';
print '<td align="right"><a href="'.DOL_URL_ROOT.'/ecm/docmine.php?section='.$val['id'].'">'.img_view($langs->trans("Edit").' - '.$langs->trans("Show")).'</a></td>';
// Add link
//print '<td align="right"><a href="'.DOL_URL_ROOT.'/ecm/docdir.php?action=create&amp;catParent='.$val['id'].'">'.img_edit_add().'</a></td>';

2
htdocs/expedition/fiche.php
View File

@ -1413,7 +1413,7 @@ else
$formmail->withcancel=1;
// Tableau des substitutions
$formmail->substit['__SHIPPINGREF__']=$object->ref;
$formmail->substit['__SIGNATURE__']='';
$formmail->substit['__SIGNATURE__']=$user->signature;
$formmail->substit['__PERSONALIZED__']='';
// Tableau des parametres complementaires
$formmail->param['action']='send';

2
htdocs/fichinter/fiche.php
View File

@ -1286,7 +1286,7 @@ else if ($id > 0 || ! empty($ref))
// Tableau des substitutions
$formmail->substit['__FICHINTERREF__']=$object->ref;
$formmail->substit['__SIGNATURE__']='';
$formmail->substit['__SIGNATURE__']=$user->signature;
$formmail->substit['__PERSONALIZED__']='';
// Tableau des parametres complementaires
$formmail->param['action']='send';

6
htdocs/fourn/class/fournisseur.facture.class.php
View File

@ -78,7 +78,7 @@ class FactureFournisseur extends Facture
var $lines;
var $fournisseur;
var $extraparams=array();
@ -194,7 +194,7 @@ class FactureFournisseur extends Facture
$this->lines[$i]->localtax2_tx,
$this->lines[$i]->qty,
$this->lines[$i]->fk_product,
'HT',
'HT',
$this->lines[$i]->info_bits,
$this->lines[$i]->product_type
);
@ -345,7 +345,7 @@ class FactureFournisseur extends Facture
$this->note_public = $obj->note_public;
$this->model_pdf = $obj->model_pdf;
$this->import_key = $obj->import_key;
$this->extraparams = (array) json_decode($obj->extraparams, true);
$this->socid = $obj->socid;

4
htdocs/fourn/commande/fiche.php
View File

@ -190,7 +190,7 @@ else if ($action == 'addline' && $user->rights->fournisseur->commande->creer)
$_POST['idprodfournprice'],
$productsupplier->fourn_ref,
$remise_percent,
'HT',
'HT',
$type
);
}
@ -1687,7 +1687,7 @@ if ($id > 0 || ! empty($ref))
$formmail->withcancel=1;
// Tableau des substitutions
$formmail->substit['__ORDERREF__']=$object->ref;
$formmail->substit['__SIGNATURE__']='';
$formmail->substit['__SIGNATURE__']=$user->signature;
$formmail->substit['__PERSONALIZED__']='';
// Tableau des parametres complementaires
$formmail->param['action']='send';

6
htdocs/fourn/facture/fiche.php
View File

@ -168,7 +168,7 @@ elseif ($action == 'setlabel' && $user->rights->fournisseur->facture->creer)
if ($result < 0) dol_print_error($db);
}
elseif ($action == 'setdate' && $user->rights->fournisseur->facture->creer)
elseif ($action == 'setdatef' && $user->rights->fournisseur->facture->creer)
{
$object->fetch($id);
$object->date=dol_mktime(12,0,0,$_POST['datefmonth'],$_POST['datefday'],$_POST['datefyear']);
@ -316,7 +316,7 @@ elseif ($action == 'add' && $user->rights->fournisseur->facture->creer)
$date_end,
0,
$lines[$i]->info_bits,
'HT',
'HT',
$product_type
);
@ -1936,7 +1936,7 @@ else
$formmail->withcancel=1;
// Tableau des substitutions
$formmail->substit['__FACREF__']=$object->ref;
$formmail->substit['__SIGNATURE__']='';
$formmail->substit['__SIGNATURE__']=$user->signature;
$formmail->substit['__PERSONALIZED__']='';
// Tableau des parametres complementaires
$formmail->param['action']='send';

9
htdocs/projet/fiche.php
View File

@ -339,6 +339,7 @@ if ($action == 'create' && $user->rights->projet->creer)
print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
}
print '</center>';
print '</form>';
}
@ -443,10 +444,12 @@ else
print '<textarea name="description" wrap="soft" cols="80" rows="'.ROWS_3.'">'.$project->description.'</textarea>';
print '</td></tr>';
print '<tr><td align="center" colspan="2">';
print '<input name="update" class="button" type="submit" value="'.$langs->trans("Modify").'"> &nbsp; ';
print '<input type="submit" class="button" name="cancel" Value="'.$langs->trans("Cancel").'"></td></tr>';
print '</table>';
print '<div align="center"><br>';
print '<input name="update" class="button" type="submit" value="'.$langs->trans("Modify").'"> &nbsp; ';
print '<input type="submit" class="button" name="cancel" Value="'.$langs->trans("Cancel").'"></div>';
print '</form>';
}
else

24
htdocs/societe/admin/societe.php
View File

@ -3,7 +3,7 @@
* Copyright (C) 2004 Eric Seigne <eric.seigne@ryxeo.com>
* Copyright (C) 2005-2011 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2012 Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2011 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2011-2012 Juanjo Menent <jmenent@2byte.es>
*
* 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
@ -31,8 +31,8 @@ require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php");
$langs->load("admin");
$action=GETPOST("action");
$value=GETPOST("value");
$action=GETPOST('action','alpha');
$value=GETPOST('value','alpha');
if (!$user->admin) accessforbidden();
@ -69,7 +69,7 @@ if ($action == 'setcodecompta')
if ($action == 'COMPANY_USE_SEARCH_TO_SELECT')
{
$companysearch = GETPOST("activate_COMPANY_USE_SEARCH_TO_SELECT");
$companysearch = GETPOST('activate_COMPANY_USE_SEARCH_TO_SELECT','alpha');
$res = dolibarr_set_const($db, "COMPANY_USE_SEARCH_TO_SELECT", $companysearch,'chaine',0,'',$conf->entity);
if (! $res > 0) $error++;
if (! $error)
@ -93,8 +93,8 @@ if ($action == 'setModuleOptions')
{
if (array_key_exists('param'.$i,$_POST))
{
$param=$_POST["param".$i];
$value=$_POST["value".$i];
$param=GETPOST("param".$i,'alpha');
$value=GETPOST("value".$i,'alpha');
if ($param) $res = dolibarr_set_const($db,$param,$value,'chaine',0,'',$conf->entity);
if (! $res > 0) $error++;
}
@ -114,8 +114,8 @@ if ($action == 'setModuleOptions')
// Activate a document generator module
if ($action == 'set')
{
$label = GETPOST("label");
$scandir = GETPOST("scandir");
$label = GETPOST('label','alpha');
$scandir = GETPOST('scandir','alpha');
$type='company';
$sql = "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity, libelle, description)";
@ -141,8 +141,8 @@ if ($action== 'del')
// Define default generator
if ($action == 'setdoc')
{
$label = GETPOST("label");
$scandir = GETPOST("scandir");
$label = GETPOST('label','alpha');
$scandir = GETPOST('scandir','alpha');
$db->begin();
@ -154,7 +154,7 @@ if ($action == 'setdoc')
// On active le modele
$type='company';
$sql_del = "DELETE FROM ".MAIN_DB_PREFIX."document_model";
$sql_del.= " WHERE nom = '".$db->escape($_GET["value"])."'";
$sql_del.= " WHERE nom = '".$db->escape(GETPOST('value','alpha'))."'";
$sql_del.= " AND type = '".$type."'";
$sql_del.= " AND entity = ".$conf->entity;
dol_syslog("societe.php ".$sql);
@ -181,7 +181,7 @@ if ($action == 'setdoc')
//Activate ProfId
if ($action == 'setprofid')
{
$status = GETPOST("status");
$status = GETPOST('status','alpha');
$idprof="SOCIETE_IDPROF".$value."_UNIQUE";
if (dolibarr_set_const($db, $idprof,$status,'chaine',0,'',$conf->entity) > 0)

14
htdocs/societe/soc.php
View File

@ -985,7 +985,8 @@ else
/*
* Edition
*/
print_fiche_titre($langs->trans("EditCompany"));
//print_fiche_titre($langs->trans("EditCompany"));
if ($socid)
{
@ -995,6 +996,12 @@ else
$res=$object->fetch_optionals($object->id,$extralabels);
//if ($res < 0) { dol_print_error($db); exit; }
$head = societe_prepare_head($object);
dol_fiche_head($head, 'card', $langs->trans("ThirdParty"),0,'company');
// Load object modCodeTiers
$module=$conf->global->SOCIETE_CODECLIENT_ADDON;
if (! $module) dolibarr_error('',$langs->trans("ErrorModuleThirdPartyCodeInCompanyModuleNotDefined"));
@ -1430,6 +1437,8 @@ else
print '</center>';
print '</form>';
dol_fiche_end();
}
}
else
@ -1448,9 +1457,6 @@ else
dol_fiche_head($head, 'card', $langs->trans("ThirdParty"),0,'company');
$form = new Form($db);
// Confirm delete third party
if ($action == 'delete' || $conf->use_javascript_ajax)
{

22
htdocs/theme/eldy/style.css.php
View File

@ -185,7 +185,7 @@ input, input.flat, textarea, textarea.flat, form.flat select, select.flat {
font-size: <?php print $fontsize ?>px;
font-family: <?php print $fontlist ?>;
background: #FDFDFD;
border: 1px solid #ACBCBB;
border: 1px solid #C0C0C0;
padding: 1px 1px 1px 1px;
margin: 0px 0px 0px 0px;
}
@ -196,6 +196,7 @@ input:disabled {
background:#ddd;
}
input:-webkit-autofill { background-color: #FCFEFA !important; background-image:none !important; }
textarea:disabled {
background:#ddd;
}
@ -203,7 +204,7 @@ textarea:disabled {
font-family: <?php print $fontlist ?>;
background-image: url(<?php echo $img_button ?>);
background-position: bottom;
border: 1px solid #ACBCBB;
border: 1px solid #C0C0C0;
padding: 0.1em 0.7em;
margin: 0em 0.5em;
-moz-border-radius:0px 5px 0px 5px;
@ -218,7 +219,7 @@ textarea:disabled {
color: #222244;
background-image: url(<?php echo $img_button ?>);
background-position: bottom;
border: 1px solid #ACBCBB;
border: 1px solid #C0C0C0;
}
.button:hover {
background: #dee7ec;
@ -869,7 +870,7 @@ td.photo {
}
a.toolbarbutton {
margin-top: 1px;
margin-top: 0px;
margin-left: 4px;
margin-right: 4px;
height: 30px;
@ -878,7 +879,8 @@ a.toolbarbutton {
background: #FFFFFF;*/
}
img.toolbarbutton {
height: 28px;
margin-top: 1px;
height: 30px;
}
/* ============================================================================== */
@ -1302,7 +1304,7 @@ table.border {
}
table.border td {
padding: 1px 2px 1px 1px;
padding: 1px 2px 1px 2px;
border: 1px solid #9CACBB;
border-collapse: collapse;
}
@ -1866,9 +1868,9 @@ td.hidden {
/* Module agenda */
/* ============================================================================== */
.cal_other_month { opacity: 0.6; background: #DDDDDD; border: solid 1px #ACBCBB; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
.cal_past_month { opacity: 0.6; background: #EEEEEE; border: solid 1px #ACBCBB; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
.cal_current_month { background: #FFFFFF; border: solid 1px #ACBCBB; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
.cal_other_month { opacity: 0.6; background: #DDDDDD; border: solid 1px #C0C0C0; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
.cal_past_month { opacity: 0.6; background: #EEEEEE; border: solid 1px #C0C0C0; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
.cal_current_month { background: #FFFFFF; border: solid 1px #C0C0C0; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
.cal_today { background: #FFFFFF; border: solid 2px #6C7C7B; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
.cal_past { }
table.cal_event { border-collapse: collapse; margin-bottom: 1px; -webkit-border-radius: 6px; border-radius: 6px; }
@ -2217,7 +2219,7 @@ a.cke_dialog_ui_button
font-family: <?php print $fontlist ?> !important;
background-image: url(<?php echo $img_button ?>) !important;
background-position: bottom !important;
border: 1px solid #ACBCBB !important;
border: 1px solid #C0C0C0 !important;
padding: 0.1em 0.7em !important;
margin: 0em 0.5em !important;
-moz-border-radius:0px 5px 0px 5px !important;

28
htdocs/user/class/user.class.php
View File

@ -25,14 +25,14 @@
/**
* \file htdocs/user/class/user.class.php
* \brief File of class to manage users
* \ingroup core
*/
require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php");
/**
* \class User
* \brief Class to manage users
* Class to manage users
*/
class User extends CommonObject
{
@ -108,7 +108,7 @@ class User extends CommonObject
$this->all_permissions_are_loaded = 0;
$this->admin=0;
$this->rights = (object) array();
$this->rights->user = (object) array();
$this->rights->user->user = (object) array();
@ -1433,17 +1433,17 @@ class User extends CommonObject
dol_syslog("User::send_password url=".$url);
}
$mailfile = new CMailFile(
$subject,
$this->email,
$conf->notification->email_from,
$mesg,
array(),
array(),
array(),
'',
'',
0,
$msgishtml
$subject,
$this->email,
$conf->notification->email_from,
$mesg,
array(),
array(),
array(),
'',
'',
0,
$msgishtml
);
if ($mailfile->sendfile())

16
htdocs/webservices/server_productorservice.php
View File

@ -83,10 +83,10 @@ $server->wsdl->addComplexType(
// Define other specific objects
$server->wsdl->addComplexType(
'product',
'complexType',
'struct',
'all',
'',
'complexType',
'struct',
'all',
'',
array(
'id' => array('name'=>'id','type'=>'xsd:string'),
'ref' => array('name'=>'ref','type'=>'xsd:string'),
@ -120,10 +120,10 @@ $server->wsdl->addComplexType(
// Define other specific objects
$server->wsdl->addComplexType(
'filterproduct',
'complexType',
'struct',
'all',
'',
'complexType',
'struct',
'all',
'',
array(
// 'limit' => array('name'=>'limit','type'=>'xsd:string'),
'type' => array('name'=>'type','type'=>'xsd:string'),