diff --git a/ChangeLog b/ChangeLog index 0aaf9c1feb4..c8b829d14f6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,7 @@ For users: - New: Add option "filter=bank" onto script rebuild_merge_pdf.php to merge PDF that has one payment on a specific bank account.* - New: [ task #901 ] Add Extrafeild on Fiche Inter +- New: Show process id in all command line scripts For developers: - New: DolGraph can build graph with three lines. diff --git a/build/debian/README.howto b/build/debian/README.howto index 797e653bc27..576ebdb47ea 100644 --- a/build/debian/README.howto +++ b/build/debian/README.howto @@ -55,3 +55,15 @@ See page http://www.debian.org/devel/wnpp/#l1 for example of ITP requests conten - Once package is uploaded, following URL are available: http://packages.qa.debian.org/package.html http://bugs.debian.org/package + + + +########################################################## +To use Alioth.debian.org +Create a login +Setup your ssh as described into page: http://wiki.debian.org/Alioth/SSH +Ask to be included into project collab-maint: http://alioth.debian.org/projects/collab-maint/ +Then you can git clone tcpdf +git clone git.debian.org:/git/collab-maint/tcpdf.git + + diff --git a/dev/skeletons/skeleton_script.php b/dev/skeletons/skeleton_script.php index 083e7ef680b..9eb17bbbaaf 100644 --- a/dev/skeletons/skeleton_script.php +++ b/dev/skeletons/skeleton_script.php @@ -34,7 +34,7 @@ if (substr($sapi_type, 0, 3) == 'cgi') { exit; } -// Init global variables +// Global variables $version='1.0'; $error=0; @@ -57,7 +57,7 @@ if (! $result > 0) { dol_print_error('',$user->error); exit; } $user->getrights(); -print "***** ".$script_file." (".$version.") *****\n"; +print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n"; if (! isset($argv[1])) { // Check parameters print "Usage: ".$script_file." param1 param2 ...\n"; exit; diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php index ade26bbafdd..62779230379 100644 --- a/htdocs/admin/fichinter.php +++ b/htdocs/admin/fichinter.php @@ -189,6 +189,23 @@ else if ($action == 'set_FICHINTER_DRAFT_WATERMARK') } } +elseif ($action == 'set_FICHINTER_PRINT_PRODUCTS') +{ + $val = GETPOST('FICHINTER_PRINT_PRODUCTS','alpha'); + $res = dolibarr_set_const($db, "FICHINTER_PRINT_PRODUCTS",($val == 'on'),'bool',0,'',$conf->entity); + + if (! $res > 0) $error++; + + if (! $error) + { + $mesg = "".$langs->trans("SetupSaved").""; + } + else + { + $mesg = "".$langs->trans("Error").""; + } +} + /* * View @@ -469,6 +486,22 @@ print ''; print ''; print "\n"; + +// print products on fichinter +$var=! $var; +print '
'; +print ''; +print ''; +print ''; +print $langs->trans("PrintProductsOnFichinter").' ('.$langs->trans("PrintProductsOnFichinterDetails").')'; +print 'global->FICHINTER_PRINT_PRODUCTS) + print 'checked="checked" '; +print '/>'; +print ''; +print ''; +print "\n"; + print '
'; diff --git a/htdocs/compta/journal/purchasesjournal.php b/htdocs/compta/journal/purchasesjournal.php index 2269c0035b9..0106fbfcb7b 100755 --- a/htdocs/compta/journal/purchasesjournal.php +++ b/htdocs/compta/journal/purchasesjournal.php @@ -1,7 +1,7 @@ * Copyright (C) 2007-2010 Jean Heimburger - * Copyright (C) 2011 Juanjo Menent + * Copyright (C) 2011-2013 Juanjo Menent * Copyright (C) 2012 Regis Houssin * Copyright (C) 2011-2012 Alexandre spangaro * Copyright (C) 2013 Marcos García @@ -225,7 +225,7 @@ foreach ($tabfac as $key => $val) { print ""; //print "".$conf->global->COMPTA_JOURNAL_BUY.""; - print "".$val["date"].""; + print "".dol_print_date($val["date"]).""; print "".$invoicestatic->getNomUrl(1).""; print "".$k."".$line['label'].""; diff --git a/htdocs/compta/journal/sellsjournal.php b/htdocs/compta/journal/sellsjournal.php index 859c1ff2ea5..3f3e07a46a9 100755 --- a/htdocs/compta/journal/sellsjournal.php +++ b/htdocs/compta/journal/sellsjournal.php @@ -1,7 +1,7 @@ * Copyright (C) 2007-2010 Jean Heimburger - * Copyright (C) 2011 Juanjo Menent + * Copyright (C) 2011-2013 Juanjo Menent * Copyright (C) 2012 Regis Houssin * Copyright (C) 2011-2012 Alexandre Spangaro * Copyright (C) 2013 Marcos García @@ -236,7 +236,7 @@ foreach ($tabfac as $key => $val) { print ""; //print "".$conf->global->COMPTA_JOURNAL_SELL.""; - print "".$val["date"].""; + print "".dol_print_date($val["date"]).""; print "".$invoicestatic->getNomUrl(1).""; print "".$k."".$line['label'].""; diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index b29e9da546d..6501dd94ef8 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -3913,6 +3913,11 @@ class Form if ($object->photo) $file=get_exdir($id, 2).'photos/'.$object->photo; if (! empty($conf->global->MAIN_OLD_IMAGE_LINKS)) $altfile=$object->id.".jpg"; // For backward compatibility $email=$object->email; + }else { + $dir=$conf->$modulepart->dir_output; + if ($object->photo) $file=get_exdir($id, 2).'photos/'.$object->photo; + if (! empty($conf->global->MAIN_OLD_IMAGE_LINKS)) $altfile=$object->id.".jpg"; // For backward compatibility + $email=$object->email; } if ($dir) diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php index de42a730b2b..6279e4ee9a0 100644 --- a/htdocs/core/lib/company.lib.php +++ b/htdocs/core/lib/company.lib.php @@ -60,15 +60,15 @@ function societe_prepare_head($object) $head[$h][2] = 'supplier'; $h++; } - if (! empty($conf->agenda->enabled) && !empty($user->right->agenda->lire)) - { + if (! empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read) )) + { $head[$h][0] = DOL_URL_ROOT.'/societe/agenda.php?socid='.$object->id; $head[$h][1] = $langs->trans("Agenda"); $head[$h][2] = 'agenda'; $h++; } //show categorie tab - if (! empty($conf->categorie->enabled) && !empty($user->right->categorie->lire)) + if (! empty($conf->categorie->enabled) && ! empty($user->rights->categorie->lire)) { $type = 2; if ($object->fournisseur) $type = 1; diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php index d8f86063e18..93b17930cfe 100644 --- a/htdocs/core/lib/functions2.lib.php +++ b/htdocs/core/lib/functions2.lib.php @@ -611,7 +611,10 @@ function get_next_value($db,$mask,$table,$field,$where='',$objsoc='',$date='',$m if ($maskraz > 0) // A reset is required { - if ($maskraz == 99) $maskraz = date('m'); + if ($maskraz == 99) { + $maskraz = date('m'); + $resetEveryMonth = true; + } if ($maskraz > 12) return 'ErrorBadMaskBadRazMonth'; // Define posy, posm and reg @@ -653,13 +656,13 @@ function get_next_value($db,$mask,$table,$field,$where='',$objsoc='',$date='',$m else if ($date >= $newyeardate && $yearoffsettype == '-') $yearoffset=-1; } // For backward compatibility - else if (date("m",$date) < $maskraz) { $yearoffset=-1; } // If current month lower that month of return to zero, year is previous year + else if (date("m",$date) < $maskraz && empty($resetEveryMonth)) { $yearoffset=-1; } // If current month lower that month of return to zero, year is previous year $yearlen = dol_strlen($reg[$posy]); if ($yearlen == 4) $yearcomp=sprintf("%04d",date("Y",$date)+$yearoffset); elseif ($yearlen == 2) $yearcomp=sprintf("%02d",date("y",$date)+$yearoffset); elseif ($yearlen == 1) $yearcomp=substr(date("y",$date),2,1)+$yearoffset; - if ($monthcomp > 1) // Test with month is useless if monthcomp = 0 or 1 (0 is same as 1) (regis: $monthcomp can't equal 0) + if ($monthcomp > 1 && empty($resetEveryMonth)) // Test with month is useless if monthcomp = 0 or 1 (0 is same as 1) (regis: $monthcomp can't equal 0) { if ($yearlen == 4) $yearcomp1=sprintf("%04d",date("Y",$date)+$yearoffset+1); elseif ($yearlen == 2) $yearcomp1=sprintf("%02d",date("y",$date)+$yearoffset+1); @@ -680,6 +683,17 @@ function get_next_value($db,$mask,$table,$field,$where='',$objsoc='',$date='',$m $sqlwhere.=" AND SUBSTRING(".$field.", ".$monthpos.", ".$monthlen.") < '".str_pad($monthcomp, $monthlen, '0', STR_PAD_LEFT)."') "; $sqlwhere.=')'; } + else if($resetEveryMonth) { + $monthlen = dol_strlen($reg[$posm]); + $yearpos = (dol_strlen($reg[1])+1); + $monthpos = ($yearpos+$yearlen); + if ($posy == 3) { + $monthpos = (dol_strlen($reg[1])+1); + $yearpos = ($monthpos+$monthlen); + } + $sqlwhere.=" SUBSTRING(".$field.", ".$yearpos.", ".$yearlen.") = '".$yearcomp."'"; + $sqlwhere.=" AND SUBSTRING(".$field.", ".$monthpos.", ".$monthlen.") = '".str_pad($monthcomp, $monthlen, '0', STR_PAD_LEFT)."' "; + } else // reset is done on january { $sqlwhere.='(SUBSTRING('.$field.', '.(dol_strlen($reg[1])+1).', '.dol_strlen($reg[2]).") = '".$yearcomp."')"; diff --git a/htdocs/fichinter/fiche.php b/htdocs/fichinter/fiche.php index 67b3a93b4ee..29742f00a97 100644 --- a/htdocs/fichinter/fiche.php +++ b/htdocs/fichinter/fiche.php @@ -178,7 +178,7 @@ else if ($action == 'add' && $user->rights->ficheinter->creer) $object->linked_objects = array_merge($object->linked_objects, $_POST['other_linked_objects']); } - $id = $object->create(); + $id = $object->create($user); if ($id > 0) { @@ -202,12 +202,10 @@ else if ($action == 'add' && $user->rights->ficheinter->creer) { $product_type=($lines[$i]->product_type?$lines[$i]->product_type:0); - if ($product_type == 1) { //only services + if ($product_type == 1 || !empty($conf->global->FICHINTER_PRINT_PRODUCTS)) { //only services except if config includes products // service prédéfini if ($lines[$i]->fk_product > 0) { - $product_static = new Product($db); - // Define output language if (! empty($conf->global->MAIN_MULTILANGS) && ! empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) { @@ -230,15 +228,8 @@ else if ($action == 'add' && $user->rights->ficheinter->creer) $label = $lines[$i]->product_label; } - $product_static->type=$lines[$i]->fk_product_type; - $product_static->id=$lines[$i]->fk_product; - $product_static->ref=$lines[$i]->ref; - $product_static->libelle=$label; - $desc=$product_static->getNomUrl(0); - $desc.= ' - '.$label; + $desc = $label; $desc .= ' ('.$langs->trans('Quantity').': '.$lines[$i]->qty.')'; - if ($conf->global->PRODUIT_DESC_IN_FORM) - $desc .= ($lines[$i]->desc && $lines[$i]->desc!=$lines[$i]->libelle)?'
'.dol_htmlentitiesbr($lines[$i]->desc):''; } else { $desc = dol_htmlentitiesbr($lines[$i]->desc); @@ -246,7 +237,14 @@ else if ($action == 'add' && $user->rights->ficheinter->creer) } $timearray=dol_getdate(mktime()); $date_intervention=dol_mktime(0,0,0,$timearray['mon'],$timearray['mday'],$timearray['year']); - $duration = 3600; + if ($product_type == 1) + { //service + $duration = 3600; + } + else + { //product + $duration = 0; + } $result = $object->addline( $user, @@ -1621,7 +1619,7 @@ else if ($id > 0 || ! empty($ref)) $somethingshown=$object->showLinkedObjectBlock(); //print ''; - print '
'; + print '
'; // List of actions on element include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php'; diff --git a/htdocs/langs/en_US/interventions.lang b/htdocs/langs/en_US/interventions.lang index 43bd94adc8f..dcd0bcf424c 100644 --- a/htdocs/langs/en_US/interventions.lang +++ b/htdocs/langs/en_US/interventions.lang @@ -39,3 +39,5 @@ ArcticNumRefModelDesc1=Generic number model ArcticNumRefModelError=Failed to activate PacificNumRefModelDesc1=Return numero with format %syymm-nnnn where yy is year, mm is month and nnnn is a sequence with no break and no return to 0 PacificNumRefModelError=An intervention card starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module. +PrintProductsOnFichinter=Print products on intervention card +PrintProductsOnFichinterDetails=forinterventions generated from orders \ No newline at end of file diff --git a/htdocs/langs/fr_FR/interventions.lang b/htdocs/langs/fr_FR/interventions.lang index 7b76224f444..bb006aaf26b 100644 --- a/htdocs/langs/fr_FR/interventions.lang +++ b/htdocs/langs/fr_FR/interventions.lang @@ -52,3 +52,5 @@ PacificNumRefModelDesc1=Renvoie le numéro sous la forme %syymm-nnnn où yy est PacificNumRefModelError=Une facture commençant par $syymm existe en base et est incompatible avec cette numérotation. Supprimez la ou renommez la pour activer ce module. SendInterventionByMail=Envoi de la fiche d'intervention par mail SendInterventionRef=Envoi Intervention %s +PrintProductsOnFichinter=Afficher les produits sur la fiche d'intervention +PrintProductsOnFichinterDetails=pour les interventions générées à partir des commandes \ No newline at end of file diff --git a/scripts/bank/export-bank-receipts.php b/scripts/bank/export-bank-receipts.php index 1d71c4edfe4..825d13a3afe 100755 --- a/scripts/bank/export-bank-receipts.php +++ b/scripts/bank/export-bank-receipts.php @@ -59,7 +59,7 @@ $error=0; */ @set_time_limit(0); -print "***** ".$script_file." (".$version.") *****\n"; +print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n"; if (! isset($argv[3]) || ! $argv[3]) { print "Usage: $script_file bank_ref bank_receipt_number (csv|tsv|excel|excel2007) [lang=xx_XX]\n"; diff --git a/scripts/company/export-contacts-xls-example.php b/scripts/company/export-contacts-xls-example.php index 760b351df7d..589b1eb5014 100644 --- a/scripts/company/export-contacts-xls-example.php +++ b/scripts/company/export-contacts-xls-example.php @@ -59,7 +59,7 @@ $error=0; */ @set_time_limit(0); -print "***** ".$script_file." (".$version.") *****\n"; +print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n"; $fname = DOL_DATA_ROOT.'/export-contacts.xls'; diff --git a/scripts/company/sync_contacts_dolibarr2ldap.php b/scripts/company/sync_contacts_dolibarr2ldap.php index a9916100218..26228df1ad8 100644 --- a/scripts/company/sync_contacts_dolibarr2ldap.php +++ b/scripts/company/sync_contacts_dolibarr2ldap.php @@ -56,7 +56,7 @@ $error=0; */ @set_time_limit(0); -print "***** ".$script_file." (".$version.") *****\n"; +print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n"; print "Mails sending disabled (useless in batch mode)\n"; $conf->global->MAIN_DISABLE_ALL_MAILS=1; // On bloque les mails diff --git a/scripts/contracts/email_expire_services_to_customers.php b/scripts/contracts/email_expire_services_to_customers.php index 75ad4cbfd08..ee7512405a3 100755 --- a/scripts/contracts/email_expire_services_to_customers.php +++ b/scripts/contracts/email_expire_services_to_customers.php @@ -65,13 +65,15 @@ $error=0; */ @set_time_limit(0); -print "***** ".$script_file." (".$version.") *****\n"; +print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n"; $now=dol_now('tzserver'); $duration_value=isset($argv[2])?$argv[2]:'none'; print $script_file." launched with mode ".$mode.(is_numeric($duration_value)?" delay=".$duration_value:"")."\n"; +if ($mode != 'confirm') $conf->global->MAIN_DISABLE_ALL_MAILS=1; + $sql = "SELECT DISTINCT s.nom as name, c.ref, cd.date_fin_validite, cd.total_ttc, p.label label, s.email, s.default_lang"; $sql .= " FROM ".MAIN_DB_PREFIX."societe AS s"; $sql .= ", ".MAIN_DB_PREFIX."contrat AS c"; @@ -243,6 +245,11 @@ function envoi_mail($mode,$oldemail,$message,$total,$userlang,$oldcustomer,$dura if ($mode == 'confirm') { $result=$mail->sendfile(); + if (! $result) + { + print "Error sending email ".$mail->error."\n"; + dol_syslog("Error sending email ".$mail->error."\n"); + } } else { diff --git a/scripts/contracts/email_expire_services_to_representatives.php b/scripts/contracts/email_expire_services_to_representatives.php index 683962480a8..8b995f31773 100755 --- a/scripts/contracts/email_expire_services_to_representatives.php +++ b/scripts/contracts/email_expire_services_to_representatives.php @@ -65,13 +65,15 @@ $error=0; */ @set_time_limit(0); -print "***** ".$script_file." (".$version.") *****\n"; +print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n"; $now=dol_now('tzserver'); $duration_value=isset($argv[2])?$argv[2]:'none'; print $script_file." launched with mode ".$mode.(is_numeric($duration_value)?" delay=".$duration_value:"")."\n"; +if ($mode != 'confirm') $conf->global->MAIN_DISABLE_ALL_MAILS=1; + $sql = "SELECT DISTINCT s.nom, c.ref, cd.date_fin_validite, cd.total_ttc, p.label label, c.fk_soc,u.rowid AS uid, u.lastname, u.firstname, u.email, u.lang"; $sql .= " FROM ".MAIN_DB_PREFIX."societe AS s, ".MAIN_DB_PREFIX."contrat AS c, ".MAIN_DB_PREFIX."contratdet AS cd"; $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product AS p ON p.rowid = cd.fk_product, ".MAIN_DB_PREFIX."societe_commerciaux AS sc, ".MAIN_DB_PREFIX."user AS u"; @@ -242,6 +244,11 @@ function envoi_mail($mode,$oldemail,$message,$total,$userlang,$oldsalerepresenta if ($mode == 'confirm') { $result=$mail->sendfile(); + if (! $result) + { + print "Error sending email ".$mail->error."\n"; + dol_syslog("Error sending email ".$mail->error."\n"); + } } else { diff --git a/scripts/cron/cron_run_jobs.php b/scripts/cron/cron_run_jobs.php index 386c996f137..398a2d7f422 100755 --- a/scripts/cron/cron_run_jobs.php +++ b/scripts/cron/cron_run_jobs.php @@ -69,7 +69,7 @@ $error=0; */ @set_time_limit(0); -print "***** ".$script_file." (".$version.") *****\n"; +print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n"; // Check security key if ($key != $conf->global->CRON_KEY) diff --git a/scripts/emailings/mailing-send.php b/scripts/emailings/mailing-send.php index 23830007fae..786704299bf 100755 --- a/scripts/emailings/mailing-send.php +++ b/scripts/emailings/mailing-send.php @@ -56,7 +56,7 @@ $error=0; */ @set_time_limit(0); -print "***** ".$script_file." (".$version.") *****\n"; +print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n"; diff --git a/scripts/invoices/email_unpaid_invoices_to_customers.php b/scripts/invoices/email_unpaid_invoices_to_customers.php index a98af2f6283..d518d41ab39 100755 --- a/scripts/invoices/email_unpaid_invoices_to_customers.php +++ b/scripts/invoices/email_unpaid_invoices_to_customers.php @@ -65,7 +65,7 @@ $error=0; */ @set_time_limit(0); -print "***** ".$script_file." (".$version.") *****\n"; +print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n"; $now=dol_now('tzserver'); $duration_value=isset($argv[3])?$argv[3]:'none'; @@ -73,6 +73,8 @@ $duration_value=isset($argv[3])?$argv[3]:'none'; $error = 0; print $script_file." launched with mode ".$mode.(is_numeric($duration_value)?" delay=".$duration_value:"")."\n"; +if ($mode != 'confirm') $conf->global->MAIN_DISABLE_ALL_MAILS=1; + $sql = "SELECT f.facnumber, f.total_ttc, f.date_lim_reglement as due_date,"; $sql.= " s.rowid as sid, s.nom as name, s.email, s.default_lang"; if ($targettype == 'contacts') $sql.= ", sp.rowid as cid, sp.firstname as cfirstname, sp.lastname as clastname, sp.email as cemail"; @@ -262,6 +264,11 @@ function envoi_mail($mode,$oldemail,$message,$total,$userlang,$oldtarget) if ($mode == 'confirm') { $result=$mail->sendfile(); + if (! $result) + { + print "Error sending email ".$mail->error."\n"; + dol_syslog("Error sending email ".$mail->error."\n"); + } } else { diff --git a/scripts/invoices/email_unpaid_invoices_to_representatives.php b/scripts/invoices/email_unpaid_invoices_to_representatives.php index 8cf6588ff8b..1ab5e15c2ec 100755 --- a/scripts/invoices/email_unpaid_invoices_to_representatives.php +++ b/scripts/invoices/email_unpaid_invoices_to_representatives.php @@ -65,13 +65,15 @@ $error=0; */ @set_time_limit(0); -print "***** ".$script_file." (".$version.") *****\n"; +print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n"; $now=dol_now('tzserver'); $duration_value=isset($argv[2])?$argv[2]:'none'; print $script_file." launched with mode ".$mode.(is_numeric($duration_value)?" delay=".$duration_value:"")."\n"; +if ($mode != 'confirm') $conf->global->MAIN_DISABLE_ALL_MAILS=1; + $sql = "SELECT f.facnumber, f.total_ttc, f.date_lim_reglement as due_date, s.nom as name, u.rowid as uid, u.lastname, u.firstname, u.email, u.lang"; $sql .= " FROM ".MAIN_DB_PREFIX."facture as f"; $sql .= " , ".MAIN_DB_PREFIX."societe as s"; @@ -173,7 +175,7 @@ else * @param string $total Total amount of unpayed invoices * @param string $userlang Code lang to use for email output. * @param string $oldsalerepresentative Old sale representative - * @return int <0 if KO, >0 if OK + * @return int <0 if KO, >0 if OK */ function envoi_mail($mode,$oldemail,$message,$total,$userlang,$oldsalerepresentative) { @@ -237,6 +239,11 @@ function envoi_mail($mode,$oldemail,$message,$total,$userlang,$oldsalerepresenta if ($mode == 'confirm') { $result=$mail->sendfile(); + if (! $result) + { + print "Error sending email ".$mail->error."\n"; + dol_syslog("Error sending email ".$mail->error."\n"); + } } else { diff --git a/scripts/invoices/rebuild_merge_pdf.php b/scripts/invoices/rebuild_merge_pdf.php index 354b245cb23..42504bd372e 100755 --- a/scripts/invoices/rebuild_merge_pdf.php +++ b/scripts/invoices/rebuild_merge_pdf.php @@ -56,7 +56,7 @@ $error=0; */ @set_time_limit(0); -print "***** ".$script_file." (".$version.") *****\n"; +print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n"; // Check parameters if (! isset($argv[1])) diff --git a/scripts/members/sync_members_dolibarr2ldap.php b/scripts/members/sync_members_dolibarr2ldap.php index 7a8f3bad42c..476837aa309 100755 --- a/scripts/members/sync_members_dolibarr2ldap.php +++ b/scripts/members/sync_members_dolibarr2ldap.php @@ -51,7 +51,7 @@ $error=0; */ @set_time_limit(0); -print "***** ".$script_file." (".$version.") *****\n"; +print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n"; if (! isset($argv[1]) || ! $argv[1]) { print "Usage: $script_file now\n"; diff --git a/scripts/members/sync_members_ldap2dolibarr.php b/scripts/members/sync_members_ldap2dolibarr.php index 45577cddcb0..85687eca95e 100755 --- a/scripts/members/sync_members_ldap2dolibarr.php +++ b/scripts/members/sync_members_ldap2dolibarr.php @@ -56,7 +56,7 @@ $forcecommit=0; */ @set_time_limit(0); -print "***** ".$script_file." (".$version.") *****\n"; +print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n"; // List of fields to get from LDAP $required_fields = array( diff --git a/scripts/user/sync_groups_dolibarr2ldap.php b/scripts/user/sync_groups_dolibarr2ldap.php index 602673c8cce..55a40209a9e 100755 --- a/scripts/user/sync_groups_dolibarr2ldap.php +++ b/scripts/user/sync_groups_dolibarr2ldap.php @@ -54,7 +54,7 @@ $error=0; */ @set_time_limit(0); -print "***** ".$script_file." (".$version.") *****\n"; +print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n"; /* if (! $conf->global->LDAP_SYNCHRO_ACTIVE) diff --git a/scripts/user/sync_groups_ldap2dolibarr.php b/scripts/user/sync_groups_ldap2dolibarr.php index 2c239197b41..ff9907e43ee 100755 --- a/scripts/user/sync_groups_ldap2dolibarr.php +++ b/scripts/user/sync_groups_ldap2dolibarr.php @@ -56,7 +56,7 @@ $forcecommit=0; */ @set_time_limit(0); -print "***** ".$script_file." (".$version.") *****\n"; +print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n"; // List of fields to get from LDAP diff --git a/scripts/user/sync_users_dolibarr2ldap.php b/scripts/user/sync_users_dolibarr2ldap.php index c6a26804b40..c02a676305e 100755 --- a/scripts/user/sync_users_dolibarr2ldap.php +++ b/scripts/user/sync_users_dolibarr2ldap.php @@ -54,7 +54,7 @@ $error=0; */ @set_time_limit(0); -print "***** ".$script_file." (".$version.") *****\n"; +print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n"; /* if (! $conf->global->LDAP_SYNCHRO_ACTIVE) diff --git a/scripts/user/sync_users_ldap2dolibarr.php b/scripts/user/sync_users_ldap2dolibarr.php index 6f7d63c41ce..13fb7464cd4 100755 --- a/scripts/user/sync_users_ldap2dolibarr.php +++ b/scripts/user/sync_users_ldap2dolibarr.php @@ -54,7 +54,7 @@ $forcecommit=0; */ @set_time_limit(0); -print "***** ".$script_file." (".$version.") *****\n"; +print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n"; // List of fields to get from LDAP $required_fields = array( diff --git a/scripts/withdrawals/build_withdrawal_file.php b/scripts/withdrawals/build_withdrawal_file.php index 0afb79b55d7..93e9239ecb7 100644 --- a/scripts/withdrawals/build_withdrawal_file.php +++ b/scripts/withdrawals/build_withdrawal_file.php @@ -50,7 +50,7 @@ $error=0; */ @set_time_limit(0); -print "***** ".$script_file." (".$version.") *****\n"; +print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n"; $datetimeprev = time();