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

Merge branch 'develop' into trimtrailing

Browse Source
This commit is contained in:
Laurent Destailleur 2018-08-21 13:40:04 +02:00 committed by GitHub
commit 85eed6cf80
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
124 changed files with 1044 additions and 306 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ChangeLog
View File

@ -2,6 +2,17 @@
English Dolibarr ChangeLog
--------------------------------------------------------------
***** ChangeLog for 8.0.0 compared to 8.0.0 *****
For Users:
NEW: Stable module: Website
NEW: Stable module: WebDAV
NEW: Dolibarr can provide information in page title when multicompany is enabled of not, making
Android application like DoliDroid able to provide native features for multicompany module
***** ChangeLog for 8.0.0 compared to 7.0.0 *****
For Users:
@ -10,11 +21,11 @@ NEW: Experimental module: WebDAV
NEW: Accept anonymous events (no user assigned)
NEW: Accountancy - Add import on general ledger
NEW: Accountancy - Show journal name on journal page and hide button draft export (Add an option in admin)
NEW: Can create event from record card of a company and member
NEW: Add a button to create Stripe customer from the Payment mode tab
NEW: Can create event from record card of a company and/or member
NEW: Add a button to create Stripe customer from the customer Payment mode tab
NEW: Add accounting account number on product tooltip
NEW: add any predefined mail content
NEW: Add arrows to navigate into containers in website module
NEW: Add any predefined mail content
NEW: Add arrows to navigate into containers in experimental website module
NEW: Add a tab to specify accountant/auditor of the company
NEW: Add Date delivery and Availability on Propals List
NEW: Add date in goods reception supplier order table

3
dev/translation/sanity_check_en_langfiles.php
View File

@ -295,6 +295,9 @@ if ((! empty($_REQUEST['unused']) && $_REQUEST['unused'] == 'true') || (isset($a
if (preg_match('/^DescADHERENT_/', $value)) $qualifiedforclean=0;
if (preg_match('/^SubmitTranslation/', $value)) $qualifiedforclean=0;
if (preg_match('/^ModuleCompanyCode/', $value)) $qualifiedforclean=0;
// admin.lang
if (preg_match('/^DAV_ALLOW_PUBLIC_DIR/i', $value)) $qualifiedforclean=0;
if (preg_match('/^DAV_ALLOW_ECM_DIR/i', $value)) $qualifiedforclean=0;
// boxes.lang
if (preg_match('/^BoxTitleLast/', $value)) $qualifiedforclean=0;
if (preg_match('/^BoxTitleLatest/', $value)) $qualifiedforclean=0;

6
htdocs/accountancy/class/accountancysystem.class.php
View File

@ -29,7 +29,11 @@
class AccountancySystem
{
var $db;
var $error;
/**
* @var string Error code (or message)
*/
public $error='';
var $rowid;
var $fk_pcg_version;
var $pcg_type;

14
htdocs/accountancy/class/accountingaccount.class.php
View File

@ -46,8 +46,18 @@ class AccountingAccount extends CommonObject
public $restrictiononfksoc = 1;
var $db;
var $error;
var $errors;
/**
* @var string Error code (or message)
*/
public $error='';
/**
*
* @var string[] Error codes (or messages)
*/
public $errors = array ();
var $id;
var $rowid;
var $datec; // Creation date

14
htdocs/adherents/canvas/actions_adherentcard_common.class.php
View File

@ -41,10 +41,16 @@ abstract class ActionsAdherentCardCommon
var $tpl = array();
//! Object container
var $object;
//! Error string
var $error;
//! Error array
var $errors=array();
/**
* @var string Error code (or message)
*/
public $error='';
/**
*
* @var string[] Error codes (or messages)
*/
public $errors = array ();
/**

4
htdocs/admin/modulehelp.php
View File

@ -313,7 +313,9 @@ if ($mode == 'desc')
{
$textexternal.='<br><strong>'.$langs->trans("Origin").':</strong> '.$langs->trans("ExternalModule",$dirofmodule);
if ($objMod->editor_name != 'dolibarr') $textexternal.='<br><strong>'.$langs->trans("Publisher").':</strong> '.(empty($objMod->editor_name)?$langs->trans("Unknown"):$objMod->editor_name);
if (! empty($objMod->editor_url) && ! preg_match('/dolibarr\.org/i',$objMod->editor_url)) $textexternal.='<br><strong>'.$langs->trans("Url").':</strong> <a href="'.$objMod->editor_url.'" target="_blank">'.$objMod->editor_url.'</a>';
$editor_url = $objMod->editor_url;
if (! preg_match('/^http/', $editor_url)) $editor_url = 'http://'.$editor_url;
if (! empty($objMod->editor_url) && ! preg_match('/dolibarr\.org/i',$objMod->editor_url)) $textexternal.='<br><strong>'.$langs->trans("Url").':</strong> <a href="'.$editor_url.'" target="_blank">'.$objMod->editor_url.'</a>';
$text.=$textexternal;
$text.='<br>';
}

13
htdocs/comm/action/card.php
View File

@ -1,6 +1,6 @@
<?php
/* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2017 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2004-2018 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005 Simon TOSSER <simon@kornog-computing.com>
* Copyright (C) 2005-2017 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2010-2013 Juanjo Menent <jmenent@2byte.es>
@ -927,6 +927,15 @@ if ($action == 'create')
if ($id > 0)
{
$result1=$object->fetch($id);
if ($result1 <= 0)
{
$langs->load("errors");
print $langs->trans("ErrorRecordNotFound");
llxFooter();
exit;
}
$result2=$object->fetch_thirdparty();
$result2=$object->fetch_projet();
$result3=$object->fetch_contact();
@ -957,7 +966,7 @@ if ($id > 0)
$object->note = GETPOST("note",'none');
}
if ($result1 < 0 || $result2 < 0 || $result3 < 0 || $result4 < 0 || $result5 < 0)
if ($result2 < 0 || $result3 < 0 || $result4 < 0 || $result5 < 0)
{
dol_print_error($db,$object->error);
exit;

2
htdocs/comm/action/class/actioncomm.class.php
View File

@ -621,7 +621,7 @@ class ActionComm extends CommonObject
$this->contact->id = $obj->fk_contact; // deprecated
$this->fk_element = $obj->elementid;
$this->elementid = $obj->elementid;
$this->elementid = $obj->elementid;
$this->elementtype = $obj->elementtype;
$this->fetchResources();

6
htdocs/comm/action/class/cactioncomm.class.php
View File

@ -28,7 +28,11 @@
*/
class CActionComm
{
var $error;
/**
* @var string Error code (or message)
*/
public $error='';
var $db;
var $id;

13
htdocs/comm/mailing/class/advtargetemailing.class.php
View File

@ -30,8 +30,17 @@ class AdvanceTargetingMailing extends CommonObject
{
var $db; //!< To store db handler
var $error; //!< To return error code (or message)
var $errors = array(); //!< To return several error codes (or messages)
/**
* @var string Error code (or message)
*/
public $error='';
/**
*
* @var string[] Error codes (or messages)
*/
public $errors = array ();
var $element='advtargetemailing'; //!< Id that identify managed objects
var $table_element='advtargetemailing'; //!< Name of table without prefix where object is stored

5
htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
View File

@ -27,7 +27,10 @@
class FormAdvTargetEmailing extends Form
{
var $db;
var $error;
/**
* @var string Error code (or message)
*/
public $error='';
/**
* Constructor

11
htdocs/comm/propal/class/propal.class.php
View File

@ -1335,13 +1335,12 @@ class Propal extends CommonObject
$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_availability as ca ON p.fk_availability = ca.rowid';
$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_input_reason as dr ON p.fk_input_reason = dr.rowid';
$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON p.fk_incoterms = i.rowid';
$sql.= " WHERE p.fk_statut = c.id";
if ($ref) {
$sql.= " AND p.entity IN (".getEntity('propal').")"; // Dont't use entity if you use rowid
$sql.= " AND p.ref='".$ref."'";
$sql.= " WHERE p.entity IN (".getEntity('propal').")"; // Dont't use entity if you use rowid
$sql.= " AND p.ref='".$this->db->escape($ref)."'";
}
else $sql.= " AND p.rowid=".$rowid;
else $sql.= " WHERE p.rowid=".$rowid;
dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
$resql=$this->db->query($sql);
@ -3145,7 +3144,7 @@ class Propal extends CommonObject
$clause = " WHERE";
$sql = "SELECT p.rowid, p.ref, p.datec as datec, p.fin_validite as datefin";
$sql = "SELECT p.rowid, p.ref, p.datec as datec, p.fin_validite as datefin, p.total_ht";
$sql.= " FROM ".MAIN_DB_PREFIX."propal as p";
if (!$user->rights->societe->client->voir && !$user->societe_id)
{
@ -3189,6 +3188,8 @@ class Propal extends CommonObject
while ($obj=$this->db->fetch_object($resql))
{
$response->nbtodo++;
$response->total+=$obj->total_ht;
if ($mode == 'opened')
{
$datelimit = $this->db->jdate($obj->datefin);

3
htdocs/commande/class/commande.class.php
View File

@ -3243,7 +3243,7 @@ class Commande extends CommonOrder
$clause = " WHERE";
$sql = "SELECT c.rowid, c.date_creation as datec, c.date_commande, c.date_livraison as delivery_date, c.fk_statut";
$sql = "SELECT c.rowid, c.date_creation as datec, c.date_commande, c.date_livraison as delivery_date, c.fk_statut, c.total_ht";
$sql.= " FROM ".MAIN_DB_PREFIX."commande as c";
if (!$user->rights->societe->client->voir && !$user->societe_id)
{
@ -3270,6 +3270,7 @@ class Commande extends CommonOrder
while ($obj=$this->db->fetch_object($resql))
{
$response->nbtodo++;
$response->total+= $obj->total_ht;
$generic_commande->statut = $obj->fk_statut;
$generic_commande->date_commande = $this->db->jdate($obj->date_commande);

4
htdocs/compta/bank/bankentries_list.php
View File

@ -1423,14 +1423,14 @@ if ($resql)
if (! empty($arrayfields['b.conciliated']['checked']))
{
print '<td class="nowrap" align="center">';
print '<td class="nowraponall" align="center">';
print $objp->conciliated?$langs->trans("Yes"):$langs->trans("No");
print '</td>';
if (! $i) $totalarray['nbfield']++;
}
// Action edit/delete
print '<td class="nowrap" align="center">';
print '<td class="nowraponall" align="center">';
// Transaction reconciliated or edit link
if ($objp->conciliated && $bankaccount->canBeConciliated() > 0) // If line not conciliated and account can be conciliated
{

3
htdocs/compta/facture/class/facture.class.php
View File

@ -3726,7 +3726,7 @@ class Facture extends CommonInvoice
$clause = " WHERE";
$sql = "SELECT f.rowid, f.date_lim_reglement as datefin,f.fk_statut";
$sql = "SELECT f.rowid, f.date_lim_reglement as datefin,f.fk_statut, f.total";
$sql.= " FROM ".MAIN_DB_PREFIX."facture as f";
if (!$user->rights->societe->client->voir && !$user->societe_id)
{
@ -3759,6 +3759,7 @@ class Facture extends CommonInvoice
$generic_facture->statut = $obj->fk_statut;
$response->nbtodo++;
$response->total += $obj->total;
if ($generic_facture->hasDelay()) {
$response->nbtodolate++;

7
htdocs/compta/facture/class/paymentterm.class.php
View File

@ -30,7 +30,12 @@ class PaymentTerm // extends CommonObject
{
var $db; //!< To store db handler
var $error; //!< To return error code (or message)
var $errors=array(); //!< To return several error codes (or messages)
/**
*
* @var string[] Error codes (or messages)
*/
public $errors = array ();
//public $element='c_payment_term'; //!< Id that identify managed objects
//public $table_element='c_payment_term'; //!< Name of table without prefix where object is stored
var $context =array();

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

@ -923,6 +923,9 @@ if ($resql)
$facturestatic->id=$obj->id;
$facturestatic->ref=$obj->ref;
$facturestatic->type=$obj->type;
$facturestatic->total_ht=$obj->total_ht;
$facturestatic->total_tva=$obj->total_vat;
$facturestatic->total_ttc=$obj->total_ttc;
$facturestatic->statut=$obj->fk_statut;
$facturestatic->date_lim_reglement=$db->jdate($obj->datelimite);
$facturestatic->note_public=$obj->note_public;

2
htdocs/compta/index.php
View File

@ -722,7 +722,7 @@ if (! empty($conf->facture->enabled) && ! empty($conf->commande->enabled) && $us
$reshook=$hookmanager->executeHooks('printFieldListWhereCustomerOrderToBill',$parameters);
$sql.=$hookmanager->resPrint;
$sql.= " GROUP BY s.nom, s.rowid, s.email, s.code_client, s.code_compta, c.rowid, c.ref, c.facture, c.fk_statut, c.tva, c.total_ht, c.total_ttc";
$sql.= " GROUP BY s.nom, s.email, s.rowid, s.code_client, s.code_compta, c.rowid, c.ref, c.facture, c.fk_statut, c.total_ht, c.tva, c.total_ttc, cc.rowid, cc.code";
$resql = $db->query($sql);
if ( $resql )

8
htdocs/contact/canvas/actions_contactcard_common.class.php
View File

@ -39,8 +39,12 @@ abstract class ActionsContactCardCommon
var $object;
//! Error string
var $error;
//! Error array
var $errors=array();
/**
*
* @var string[] Error codes (or messages)
*/
public $errors = array ();
/**

12
htdocs/contrat/services_list.php
View File

@ -197,7 +197,7 @@ $now=dol_now();
$form=new Form($db);
$sql = "SELECT c.rowid as cid, c.ref, c.statut as cstatut,";
$sql.= " s.rowid as socid, s.nom as name,";
$sql.= " s.rowid as socid, s.nom as name, s.email, s.client, s.fournisseur,";
$sql.= " cd.rowid, cd.description, cd.statut,";
$sql.= " p.rowid as pid, p.ref as pref, p.label as label, p.fk_product_type as ptype, p.entity as pentity,";
if (!$user->rights->societe->client->voir && !$socid) $sql .= " sc.fk_soc, sc.fk_user,";
@ -540,6 +540,11 @@ while ($i < min($num,$limit))
$contractstatic->id=$obj->cid;
$contractstatic->ref=$obj->ref?$obj->ref:$obj->cid;
$companystatic->id=$obj->socid;
$companystatic->name=$obj->name;
$companystatic->email=$obj->email;
$companystatic->client=$obj->client;
$companystatic->fournisseur=$obj->fournisseur;
print '<tr class="oddeven">';
@ -555,7 +560,7 @@ while ($i < min($num,$limit))
if (! empty($arrayfields['p.description']['checked']))
{
print '<td>';
if ($obj->pid)
if ($obj->pid > 0)
{
$productstatic->id=$obj->pid;
$productstatic->type=$obj->ptype;
@ -625,9 +630,6 @@ while ($i < min($num,$limit))
if (! empty($arrayfields['s.nom']['checked']))
{
print '<td>';
$companystatic->id=$obj->socid;
$companystatic->name=$obj->name;
$companystatic->client=1;
print $companystatic->getNomUrl(1,'customer',28);
print '</td>';
if (! $i) $totalarray['nbfield']++;

4
htdocs/core/actions_printing.inc.php
View File

@ -1,6 +1,6 @@
<?php
/* Copyright (C) 2014-2016 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2014 Frederic France <frederic.france@free.fr>
* Copyright (C) 2014-2018 Frederic France <frederic.france@netlogic.fr>
*
* 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
@ -28,7 +28,7 @@
// Filename to print must be provided into 'file' parameter
// Print file
if ($action == 'print_file' and $user->rights->printing->read)
if ($action == 'print_file' && $user->rights->printing->read)
{
$langs->load("printing");
require_once DOL_DOCUMENT_ROOT . '/core/modules/printing/modules_printing.php';

7
htdocs/core/class/antivir.class.php
View File

@ -32,7 +32,12 @@
class AntiVir
{
var $error;
var $errors;
/**
*
* @var string[] Error codes (or messages)
*/
public $errors = array ();;
var $output;
var $db;

6
htdocs/core/class/canvas.class.php
View File

@ -30,7 +30,11 @@ class Canvas
{
var $db;
var $error;
var $errors=array();
/**
*
* @var string[] Error codes (or messages)
*/
public $errors = array ();
var $actiontype;

7
htdocs/core/class/ccountry.class.php
View File

@ -34,7 +34,12 @@ class Ccountry // extends CommonObject
{
var $db; //!< To store db handler
var $error; //!< To return error code (or message)
var $errors=array(); //!< To return several error codes (or messages)
/**
*
* @var string[] Error codes (or messages)
*/
public $errors = array ();
//var $element='ccountry'; //!< Id that identify managed objects
//var $table_element='ccountry'; //!< Name of table without prefix where object is stored

7
htdocs/core/class/cstate.class.php
View File

@ -34,7 +34,12 @@ class Cstate // extends CommonObject
{
var $db; //!< To store db handler
var $error; //!< To return error code (or message)
var $errors=array(); //!< To return several error codes (or messages)
/**
*
* @var string[] Error codes (or messages)
*/
public $errors = array ();
//var $element='cstate'; //!< Id that identify managed objects
//var $table_element='cstate'; //!< Name of table without prefix where object is stored

7
htdocs/core/class/ctypent.class.php
View File

@ -29,7 +29,12 @@ class Ctypent // extends CommonObject
{
var $db; //!< To store db handler
var $error; //!< To return error code (or message)
var $errors=array(); //!< To return several error codes (or messages)
/**
*
* @var string[] Error codes (or messages)
*/
public $errors = array ();
//var $element='ctypent'; //!< Id that identify managed objects
//var $table_element='ctypent'; //!< Name of table without prefix where object is stored

6
htdocs/core/class/dolreceiptprinter.class.php
View File

@ -110,7 +110,11 @@ class dolReceiptPrinter extends Escpos
var $printer;
var $template;
var $error;
var $errors;
/**
*
* @var string[] Error codes (or messages)
*/
public $errors = array ();

6
htdocs/core/class/hookmanager.class.php
View File

@ -31,7 +31,11 @@ class HookManager
{
var $db;
var $error;
var $errors=array();
/**
*
* @var string[] Error codes (or messages)
*/
public $errors = array ();
// Context hookmanager was created for ('thirdpartycard', 'thirdpartydao', ...)
var $contextarray=array();

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

@ -778,7 +778,8 @@ class FormFile
$out.= '<td class="right nowraponall">';
if ($delallowed)
{
$out.= '<a href="'.$urlsource.(strpos($urlsource,'?')?'&amp;':'?').'action=remove_file&amp;file='.urlencode($relativepath);
$tmpurlsource = preg_replace('/#[a-zA-Z0-9_]*$/', '', $urlsource);
$out.= '<a href="'.$tmpurlsource.(strpos($tmpurlsource,'?')?'&amp;':'?').'action=remove_file&amp;file='.urlencode($relativepath);
$out.= ($param?'&amp;'.$param:'');
//$out.= '&modulepart='.$modulepart; // TODO obsolete ?
//$out.= '&urlsource='.urlencode($urlsource); // TODO obsolete ?
@ -814,7 +815,7 @@ class FormFile
$this->numoffiles++;
}
// Loop on each file found
// Loop on each link found
if (is_array($link_list))
{
$colspan=2;
@ -1304,8 +1305,7 @@ class FormFile
if (! empty($conf->dol_use_jmobile)) $useajax=0;
if (empty($conf->use_javascript_ajax)) $useajax=0;
if (! empty($conf->global->MAIN_ECM_DISABLE_JS)) $useajax=0;
print '<a href="'.(($useinecm && $useajax)?'#':$url.'?action=delete&urlfile='.urlencode($filepath).$param).'" class="deletefilelink" rel="'.$filepath.'">'.img_delete().'</a>';
print '<a href="'.(($useinecm && $useajax)?'#':($url.'?action=delete&urlfile='.urlencode($filepath).$param)).'" class="deletefilelink" rel="'.$filepath.'">'.img_delete().'</a>';
}
print "</td>";

6
htdocs/core/class/interfaces.class.php
View File

@ -33,7 +33,11 @@ class Interfaces
{
var $db;
var $dir; // Directory with all core and external triggers files
var $errors = array(); // Array for errors
/**
*
* @var string[] Error codes (or messages)
*/
public $errors = array ();
/**
* Constructor

6
htdocs/core/class/notify.class.php
View File

@ -33,7 +33,11 @@ class Notify
var $id;
var $db;
var $error;
var $errors=array();
/**
*
* @var string[] Error codes (or messages)
*/
public $errors = array ();
var $author;
var $ref;

9
htdocs/core/class/workboardresponse.class.php
View File

@ -1,6 +1,7 @@
<?php
/* Copyright (C) 2015 Marcos García <marcosgdf@gmail.com>
* Copyright (C) 2018 Charlene Benke <charlie@patas-monkey.com>
*
* 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
@ -66,4 +67,10 @@ class WorkboardResponse
*/
public $nbtodolate = 0;
}
/**
* total price of items
* @var int
*/
public $total = 0;
}

44
htdocs/core/lib/admin.lib.php
View File

@ -108,27 +108,36 @@ function versiondolibarrarray()
/**
* Launch a sql file. Function used by:
* Launch a sql file. Function is used by:
* - Migrate process (dolibarr-xyz-abc.sql)
* - Loading sql menus (auguria)
* - Running specific Sql by a module init
* - Loading sql file of website import package
* Install process however does not use it.
* Note that Sql files must have all comments at start of line.
* Note that Sql files must have all comments at start of line. Also this function take ';' as the char to detect end of sql request
*
* @param string $sqlfile Full path to sql file
* @param int $silent 1=Do not output anything, 0=Output line for update page
* @param int $entity Entity targeted for multicompany module
* @param int $usesavepoint 1=Run a savepoint before each request and a rollback to savepoint if error (this allow to have some request with errors inside global transactions).
* @param string $handler Handler targeted for menu
* @param string $okerror Family of errors we accept ('default', 'none')
* @return int <=0 if KO, >0 if OK
* @param string $sqlfile Full path to sql file
* @param int $silent 1=Do not output anything, 0=Output line for update page
* @param int $entity Entity targeted for multicompany module
* @param int $usesavepoint 1=Run a savepoint before each request and a rollback to savepoint if error (this allow to have some request with errors inside global transactions).
* @param string $handler Handler targeted for menu (replace __HANDLER__ with this value)
* @param string $okerror Family of errors we accept ('default', 'none')
* @param int $linelengthlimit Limit for length of each line (Use 0 if unknown, may be faster if defined)
* @param int $nocommentremoval Do no try to remove comments (in such a case, we consider that each line is a request, so use also $linelengthlimit=0)
* @return int <=0 if KO, >0 if OK
*/
function run_sql($sqlfile,$silent=1,$entity='',$usesavepoint=1,$handler='',$okerror='default')
function run_sql($sqlfile, $silent=1, $entity='', $usesavepoint=1, $handler='', $okerror='default', $linelengthlimit=32768, $nocommentremoval=0)
{
global $db, $conf, $langs, $user;
dol_syslog("Admin.lib::run_sql run sql file ".$sqlfile." silent=".$silent." entity=".$entity." usesavepoint=".$usesavepoint." handler=".$handler." okerror=".$okerror, LOG_DEBUG);
if (! is_numeric($linelengthlimit))
{
dol_syslog("Admin.lib::run_sql param linelengthlimit is not a numeric", LOG_ERR);
return -1;
}
$ok=0;
$error=0;
$i=0;
@ -143,7 +152,9 @@ function run_sql($sqlfile,$silent=1,$entity='',$usesavepoint=1,$handler='',$oker
{
while (! feof($fp))
{
$buf = fgets($fp, 32768);
// Warning fgets with second parameter that is null or 0 hang.
if ($linelengthlimit > 0) $buf = fgets($fp, $linelengthlimit);
else $buf = fgets($fp);
// Test if request must be ran only for particular database or version (if yes, we must remove the -- comment)
if (preg_match('/^--\sV(MYSQL|PGSQL)([^\s]*)/i',$buf,$reg))
@ -191,13 +202,13 @@ function run_sql($sqlfile,$silent=1,$entity='',$usesavepoint=1,$handler='',$oker
}
// Add line buf to buffer if not a comment
if (! preg_match('/^\s*--/',$buf))
if ($nocommentremoval || ! preg_match('/^\s*--/',$buf))
{
$buf=preg_replace('/([,;ERLT\)])\s*--.*$/i','\1',$buf); //remove comment from a line that not start with -- before add it to the buffer
if (empty($nocommentremoval)) $buf=preg_replace('/([,;ERLT\)])\s*--.*$/i','\1',$buf); //remove comment from a line that not start with -- before add it to the buffer
$buffer .= trim($buf);
}
// print $buf.'<br>';
//print $buf.'<br>';exit;
if (preg_match('/;/',$buffer)) // If string contains ';', it's end of a request string, we save it in arraysql.
{
@ -229,7 +240,7 @@ function run_sql($sqlfile,$silent=1,$entity='',$usesavepoint=1,$handler='',$oker
if (! isset($listofmaxrowid[$table]))
{
//var_dump($db);
$sqlgetrowid='SELECT MAX(rowid) as max from '.$table;
$sqlgetrowid='SELECT MAX(rowid) as max from '.preg_replace('/^llx_/', MAIN_DB_PREFIX, $table);
$resql=$db->query($sqlgetrowid);
if ($resql)
{
@ -246,9 +257,10 @@ function run_sql($sqlfile,$silent=1,$entity='',$usesavepoint=1,$handler='',$oker
break;
}
}
// Replace __+MAX_llx_table__ with +999
$from='__+MAX_'.$table.'__';
$to='+'.$listofmaxrowid[$table];
$newsql=str_replace($from,$to,$newsql);
$newsql=str_replace($from, $to, $newsql);
dol_syslog('Admin.lib::run_sql New Request '.($i+1).' (replacing '.$from.' to '.$to.')', LOG_DEBUG);
$arraysql[$i]=$newsql;

10
htdocs/core/lib/files.lib.php
View File

@ -574,7 +574,7 @@ function dol_filemtime($pathoffile)
* @param array $arrayreplacement Array with strings to replace. Example: array('valuebefore'=>'valueafter', ...)
* @param string $destfile Destination file (can't be a directory). If empty, will be same than source file.
* @param int $newmask Mask for new file (0 by default means $conf->global->MAIN_UMASK). Example: '0666'
* @param int $indexdatabase Index new file into database.
* @param int $indexdatabase 1=index new file into database.
* @return int <0 if error, 0 if nothing done (dest file already exists), >0 if OK
* @see dol_copy dolReplaceRegExInFile
*/
@ -611,7 +611,7 @@ function dolReplaceInFile($srcfile, $arrayreplacement, $destfile='', $newmask=0,
dol_delete_file($tmpdestfile);
// Create $newpathoftmpdestfile from $newpathofsrcfile
$content=file_get_contents($newpathofsrcfile, 'r');
$content = file_get_contents($newpathofsrcfile, 'r');
$content = make_substitutions($content, $arrayreplacement, null);
@ -1509,7 +1509,7 @@ function dol_init_file_process($pathtoscan='', $trackid='')
*
* @param string $upload_dir Directory where to store uploaded file (note: used to forge $destpath = $upload_dir + filename)
* @param int $allowoverwrite 1=Allow overwrite existing file
* @param int $donotupdatesession 1=Do no edit _SESSION variable but update database index. 0=Update _SESSION and not database index.
* @param int $donotupdatesession 1=Do no edit _SESSION variable but update database index. 0=Update _SESSION and not database index. -1=Do not update SESSION neither db.
* @param string $varfiles _FILES var name
* @param string $savingdocmask Mask to use to define output filename. For example 'XXXXX-__YYYYMMDD__-__file__'
* @param string $link Link to add (to add a link instead of a file)
@ -1591,7 +1591,7 @@ function dol_add_file_process($upload_dir, $allowoverwrite=0, $donotupdatesessio
}
// Update table of files
if ($donotupdatesession)
if ($donotupdatesession == 1)
{
$result = addFileIntoDatabaseIndex($upload_dir, basename($destfile), $TFile['name'][$i], 'uploaded', 0);
if ($result < 0)
@ -1656,7 +1656,7 @@ function dol_add_file_process($upload_dir, $allowoverwrite=0, $donotupdatesessio
* All information used are in db, conf, langs, user and _FILES.
*
* @param int $filenb File nb to delete
* @param int $donotupdatesession 1=Do not edit _SESSION variable
* @param int $donotupdatesession -1 or 1 = Do not update _SESSION variable
* @param int $donotdeletefile 1=Do not delete physically file
* @param string $trackid Track id (used to prefix name of session vars to avoid conflict)
* @return void

6
htdocs/core/lib/functions.lib.php
View File

@ -3125,8 +3125,8 @@ function dol_trunc($string,$size=40,$trunc='right',$stringencoding='UTF-8',$nodo
* @param boolean|int $pictoisfullpath If true or 1, image path is a full path
* @param int $srconly Return only content of the src attribute of img.
* @param int $notitle 1=Disable tag title. Use it if you add js tooltip, to avoid duplicate tooltip.
* @param string $alt Force alt for bind peoplae
* @param string $morecss Add more class css on img tag (For example 'myclascss')
* @param string $alt Force alt for bind people
* @param string $morecss Add more class css on img tag (For example 'myclascss'). Work only if $moreatt is empty.
* @return string Return img tag
* @see #img_object, #img_picto_common
*/
@ -3282,7 +3282,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
//$title=$tmparray[0];
//$alt=empty($tmparray[1])?'':$tmparray[1];
$title = $titlealt;
return '<img src="'.$fullpathpicto.'" alt="'.dol_escape_htmltag($alt).'"'.(($notitle || empty($title))?'':' title="'.dol_escape_htmltag($title).'"').($moreatt?' '.$moreatt:' class="inline-block"').'>'; // Alt is used for accessibility, title for popup
return '<img src="'.$fullpathpicto.'" alt="'.dol_escape_htmltag($alt).'"'.(($notitle || empty($title))?'':' title="'.dol_escape_htmltag($title).'"').($moreatt?' '.$moreatt:' class="inline-block'.($morecss?' '.$morecss:'').'"').'>'; // Alt is used for accessibility, title for popup
}
}

1
htdocs/core/lib/propal.lib.php
View File

@ -48,6 +48,7 @@ function propal_prepare_head($object)
|| (! empty($conf->livraison_bon->enabled) && $user->rights->expedition->livraison->lire))))
{
$langs->load("sendings");
$text = '';
$head[$h][0] = DOL_URL_ROOT.'/expedition/propal.php?id='.$object->id;
if ($conf->expedition_bon->enabled) $text=$langs->trans("Shipment");
if ($conf->livraison_bon->enabled) $text.='/'.$langs->trans("Receivings");

5
htdocs/core/modules/action/modules_action.php
View File

@ -28,7 +28,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commondocgenerator.class.php';
*/
abstract class ModeleAction extends CommonDocGenerator
{
var $error='';
/**
* @var string Error code (or message)
*/
public $error='';
/**
* Return list of active generation modules

5
htdocs/core/modules/bank/modules_bank.php
View File

@ -31,7 +31,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commondocgenerator.class.php';
*/
abstract class ModeleBankAccountDoc extends CommonDocGenerator
{
var $error='';
/**
* @var string Error code (or message)
*/
public $error='';
/**

6
htdocs/core/modules/barcode/doc/phpbarcode.modules.php
View File

@ -33,7 +33,11 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/barcode.lib.php'; // This is to inc
class modPhpbarcode extends ModeleBarCode
{
var $version='dolibarr'; // 'development', 'experimental', 'dolibarr'
var $error='';
/**
* @var string Error code (or message)
*/
public $error='';
/**

7
htdocs/core/modules/barcode/doc/tcpdfbarcode.modules.php
View File

@ -32,7 +32,12 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/barcode.lib.php'; // This is to inc
class modTcpdfbarcode extends ModeleBarCode
{
var $version='dolibarr'; // 'development', 'experimental', 'dolibarr'
var $error='';
/**
* @var string Error code (or message)
*/
public $error='';
var $is2d = false;
/**

10
htdocs/core/modules/barcode/modules_barcode.class.php
View File

@ -29,7 +29,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php';
*/
abstract class ModeleBarCode
{
var $error='';
/**
* @var string Error code (or message)
*/
public $error='';
/**
@ -50,7 +53,10 @@ abstract class ModeleBarCode
*/
abstract class ModeleNumRefBarCode
{
var $error='';
/**
* @var string Error code (or message)
*/
public $error='';
/** Return default description of numbering model
*

5
htdocs/core/modules/cheque/mod_chequereceipt_mint.php
View File

@ -31,7 +31,10 @@ class mod_chequereceipt_mint extends ModeleNumRefChequeReceipts
{
var $version='dolibarr'; // 'development', 'experimental', 'dolibarr'
var $prefix='CHK';
var $error='';
/**
* @var string Error code (or message)
*/
public $error='';
var $name='Mint';

10
htdocs/core/modules/cheque/modules_chequereceipts.php
View File

@ -36,7 +36,10 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; // Requ
*/
abstract class ModeleNumRefChequeReceipts
{
var $error='';
/**
* @var string Error code (or message)
*/
public $error='';
/**
* Return if a module can be used or not
@ -119,7 +122,10 @@ abstract class ModeleNumRefChequeReceipts
*/
abstract class ModeleChequeReceipts extends CommonDocGenerator
{
var $error='';
/**
* @var string Error code (or message)
*/
public $error='';
/**
* Return list of active generation modules

5
htdocs/core/modules/commande/mod_commande_marbre.php
View File

@ -31,7 +31,10 @@ class mod_commande_marbre extends ModeleNumRefCommandes
{
var $version='dolibarr'; // 'development', 'experimental', 'dolibarr'
var $prefix='CO';
var $error='';
/**
* @var string Error code (or message)
*/
public $error='';
var $nom='Marbre';

10
htdocs/core/modules/commande/modules_commande.php
View File

@ -39,7 +39,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
*/
abstract class ModelePDFCommandes extends CommonDocGenerator
{
var $error='';
/**
* @var string Error code (or message)
*/
public $error='';
/**
* Return list of active generation modules
@ -71,7 +74,10 @@ abstract class ModelePDFCommandes extends CommonDocGenerator
abstract class ModeleNumRefCommandes
{
var $error='';
/**
* @var string Error code (or message)
*/
public $error='';
/**
* Return if a module can be used or not

5
htdocs/core/modules/contract/mod_contract_serpis.php
View File

@ -30,7 +30,10 @@ class mod_contract_serpis extends ModelNumRefContracts
{
var $version='dolibarr';
var $prefix='CT';
var $error='';
/**
* @var string Error code (or message)
*/
public $error='';
var $nom='Serpis';
var $code_auto=1;

10
htdocs/core/modules/contract/modules_contract.php
View File

@ -37,7 +37,10 @@
*/
abstract class ModelePDFContract extends CommonDocGenerator
{
var $error='';
/**
* @var string Error code (or message)
*/
public $error='';
/**
@ -67,7 +70,10 @@ abstract class ModelePDFContract extends CommonDocGenerator
*/
class ModelNumRefContracts
{
var $error='';
/**
* @var string Error code (or message)
*/
public $error='';
/**
* Return if a module can be used or not

10
htdocs/core/modules/dons/modules_don.php
View File

@ -34,7 +34,10 @@ require_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php';
*/
abstract class ModeleDon extends CommonDocGenerator
{
var $error='';
/**
* @var string Error code (or message)
*/
public $error='';
/**
* Return list of active generation modules
@ -63,7 +66,10 @@ abstract class ModeleDon extends CommonDocGenerator
*/
abstract class ModeleNumRefDons
{
var $error='';
/**
* @var string Error code (or message)
*/
public $error='';
/**
* Return if a module can be used or not

5
htdocs/core/modules/expedition/mod_expedition_safor.php
View File

@ -30,7 +30,10 @@ class mod_expedition_safor extends ModelNumRefExpedition
{
var $version='dolibarr';
var $prefix='SH';
var $error='';
/**
* @var string Error code (or message)
*/
public $error='';
var $nom='Safor';

10
htdocs/core/modules/expedition/modules_expedition.php
View File

@ -36,7 +36,10 @@
*/
abstract class ModelePdfExpedition extends CommonDocGenerator
{
var $error='';
/**
* @var string Error code (or message)
*/
public $error='';
/**
@ -66,7 +69,10 @@ abstract class ModelePdfExpedition extends CommonDocGenerator
*/
abstract class ModelNumRefExpedition
{
var $error='';
/**
* @var string Error code (or message)
*/
public $error='';
/** Return if a model can be used or not
*

5
htdocs/core/modules/expensereport/mod_expensereport_jade.php
View File

@ -30,7 +30,10 @@ class mod_expensereport_jade extends ModeleNumRefExpenseReport
{
var $version='dolibarr'; // 'development', 'experimental', 'dolibarr'
var $prefix='ER';
var $error='';
/**
* @var string Error code (or message)
*/
public $error='';
var $nom='Jade';

10
htdocs/core/modules/expensereport/modules_expensereport.php
View File

@ -23,7 +23,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commondocgenerator.class.php';
*/
abstract class ModeleExpenseReport extends CommonDocGenerator
{
var $error='';
/**
* @var string Error code (or message)
*/
public $error='';
/**
@ -73,7 +76,10 @@ function expensereport_pdf_create(DoliDB $db, ExpenseReport $object, $message, $
abstract class ModeleNumRefExpenseReport
{
var $error='';
/**
* @var string Error code (or message)
*/
public $error='';
/**
* Return if a module can be used or not

5
htdocs/core/modules/export/modules_export.php
View File

@ -30,7 +30,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commondocgenerator.class.php';
*/
class ModeleExports extends CommonDocGenerator // This class can't be abstract as there is instance propreties loaded by liste_modeles
{
var $error='';
/**
* @var string Error code (or message)
*/
public $error='';
var $driverlabel=array();
var $driverversion=array();

5
htdocs/core/modules/facture/mod_facture_mars.php
View File

@ -35,7 +35,10 @@ class mod_facture_mars extends ModeleNumRefFactures
var $prefixreplacement='FR';
var $prefixdeposit='AC';
var $prefixcreditnote='AV';
var $error='';
/**
* @var string Error code (or message)
*/
public $error='';
/**

5
htdocs/core/modules/facture/mod_facture_terre.php
View File

@ -33,7 +33,10 @@ class mod_facture_terre extends ModeleNumRefFactures
var $prefixinvoice='FA';
var $prefixcreditnote='AV';
var $prefixdeposit='AC';
var $error='';
/**
* @var string Error code (or message)
*/
public $error='';
/**

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

@ -37,7 +37,10 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; // Requ
*/
abstract class ModelePDFFactures extends CommonDocGenerator
{
var $error='';
/**
* @var string Error code (or message)
*/
public $error='';
/**
* Return list of active generation modules
@ -65,7 +68,10 @@ abstract class ModelePDFFactures extends CommonDocGenerator
*/
abstract class ModeleNumRefFactures
{
var $error='';
/**
* @var string Error code (or message)
*/
public $error='';
/**
* Return if a module can be used or not

5
htdocs/core/modules/fichinter/mod_pacific.php
View File

@ -32,7 +32,10 @@ class mod_pacific extends ModeleNumRefFicheinter
{
var $version='dolibarr'; // 'development', 'experimental', 'dolibarr'
var $prefix='FI';
var $error='';
/**
* @var string Error code (or message)
*/
public $error='';
var $nom = 'pacific';

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

@ -34,7 +34,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commondocgenerator.class.php';
*/
abstract class ModelePDFFicheinter extends CommonDocGenerator
{
var $error='';
/**
* @var string Error code (or message)
*/
public $error='';
/**
@ -64,7 +67,10 @@ abstract class ModelePDFFicheinter extends CommonDocGenerator
*/
abstract class ModeleNumRefFicheinter
{
var $error='';
/**
* @var string Error code (or message)
*/
public $error='';
/**
* Return if a module can be used or not

5
htdocs/core/modules/holiday/mod_holiday_madonna.php
View File

@ -31,7 +31,10 @@ class mod_holiday_madonna extends ModelNumRefHolidays
{
var $version='dolibarr';
var $prefix='HL';
var $error='';
/**
* @var string Error code (or message)
*/
public $error='';
var $nom='Madonna';
var $code_auto=1;

10
htdocs/core/modules/holiday/modules_holiday.php
View File

@ -38,7 +38,10 @@
*/
abstract class ModelePDFHoliday extends CommonDocGenerator
{
var $error='';
/**
* @var string Error code (or message)
*/
public $error='';
/**
@ -68,7 +71,10 @@ abstract class ModelePDFHoliday extends CommonDocGenerator
*/
class ModelNumRefHolidays
{
var $error='';
/**
* @var string Error code (or message)
*/
public $error='';
/**
* Return if a module can be used or not

12
htdocs/core/modules/import/import_csv.modules.php
View File

@ -36,8 +36,16 @@ class ImportCsv extends ModeleImports
var $db;
var $datatoimport;
var $error='';
var $errors=array();
/**
* @var string Error code (or message)
*/
public $error='';
/**
*
* @var string[] Error codes (or messages)
*/
public $errors = array ();
var $id; // Id of driver
var $label; // Label of driver

12
htdocs/core/modules/import/import_xlsx.modules.php
View File

@ -36,8 +36,16 @@ class ImportXlsx extends ModeleImports
var $db;
var $datatoimport;
var $error='';
var $errors=array();
/**
* @var string Error code (or message)
*/
public $error='';
/**
*
* @var string[] Error codes (or messages)
*/
public $errors = array ();
var $id; // Id of driver
var $label; // Label of driver

10
htdocs/core/modules/livraison/modules_livraison.php
View File

@ -36,7 +36,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commondocgenerator.class.php';
*/
abstract class ModelePDFDeliveryOrder extends CommonDocGenerator
{
var $error='';
/**
* @var string Error code (or message)
*/
public $error='';
/**
* Return list of active generation modules
@ -67,7 +70,10 @@ abstract class ModelePDFDeliveryOrder extends CommonDocGenerator
*/
abstract class ModeleNumRefDeliveryOrder
{
var $error='';
/**
* @var string Error code (or message)
*/
public $error='';
/**
* Return if a module can be used or not

5
htdocs/core/modules/member/modules_cards.php
View File

@ -34,7 +34,10 @@ require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
*/
class ModelePDFCards
{
var $error='';
/**
* @var string Error code (or message)
*/
public $error='';
/**

2
htdocs/core/modules/modDav.class.php
View File

@ -68,7 +68,7 @@ class modDav extends DolibarrModules
$this->descriptionlong = "davDescription";
// Possible values for version are: 'development', 'experimental', 'dolibarr', 'dolibarr_deprecated' or a version string like 'x.y.z'
$this->version = 'experimental';
$this->version = 'dolibarr';
// Key used in llx_const table to save module status enabled/disabled (where DAV is value of property name of module in uppercase)
$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
// Name of image file used for this module.

2
htdocs/core/modules/modWebsite.class.php
View File

@ -51,7 +51,7 @@ class modWebsite extends DolibarrModules
$this->name = preg_replace('/^mod/i','',get_class($this));
$this->description = "Enable to build and serve public web sites with CMS features";
// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
$this->version = 'experimental';
$this->version = 'dolibarr';
// Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
// Name of image file used for this module.

5
htdocs/core/modules/payment/mod_payment_cicada.php
View File

@ -31,7 +31,10 @@ class mod_payment_cicada extends ModeleNumRefPayments
{
var $version='dolibarr'; // 'development', 'experimental', 'dolibarr'
var $prefix='PAY';
var $error='';
/**
* @var string Error code (or message)
*/
public $error='';
var $nom='Cicada';

5
htdocs/core/modules/payment/modules_payment.php
View File

@ -23,7 +23,10 @@
abstract class ModeleNumRefPayments
{
var $error='';
/**
* @var string Error code (or message)
*/
public $error='';
/**
* Return if a module can be used or not

7
htdocs/core/modules/printing/printgcp.modules.php
View File

@ -43,7 +43,12 @@ class printing_printgcp extends PrintingDriver
var $google_id = '';
var $google_secret = '';
var $error;
var $errors = array();
/**
*
* @var string[] Error codes (or messages)
*/
public $errors = array ();
var $db;
private $OAUTH_SERVICENAME_GOOGLE = 'Google';

7
htdocs/core/modules/printing/printipp.modules.php
View File

@ -41,7 +41,12 @@ class printing_printipp extends PrintingDriver
var $user;
var $password;
var $error;
var $errors = array();
/**
*
* @var string[] Error codes (or messages)
*/
public $errors = array ();
var $db;

5
htdocs/core/modules/printsheet/modules_labels.php
View File

@ -34,7 +34,10 @@ require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
*/
class ModelePDFLabels
{
var $error='';
/**
* @var string Error code (or message)
*/
public $error='';
/**

10
htdocs/core/modules/product/modules_product.class.php
View File

@ -33,7 +33,10 @@
*/
abstract class ModelePDFProduct extends CommonDocGenerator
{
var $error='';
/**
* @var string Error code (or message)
*/
public $error='';
/**
@ -58,7 +61,10 @@ abstract class ModelePDFProduct extends CommonDocGenerator
abstract class ModeleProductCode
{
var $error='';
/**
* @var string Error code (or message)
*/
public $error='';
/** Renvoi la description par defaut du modele de numerotation
*

5
htdocs/core/modules/product_batch/modules_product_batch.class.php
View File

@ -38,7 +38,10 @@
*/
abstract class ModelePDFProductBatch extends CommonDocGenerator
{
var $error='';
/**
* @var string Error code (or message)
*/
public $error='';
/**

209
htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
View File

@ -160,6 +160,7 @@ class doc_generic_project_odt extends ModelePDFProjects
'task_description'=>$task->description,
'task_fk_parent'=>$task->fk_parent,
'task_duration'=>$task->duration,
'task_duration_hour'=>convertSecondToTime($task->duration,'all'),
'task_progress'=>$task->progress,
'task_public'=>$task->public,
'task_date_start'=>dol_print_date($task->date_start,'day'),
@ -317,7 +318,10 @@ class doc_generic_project_odt extends ModelePDFProjects
'tasktime_fk_user'=>$tasktime['fk_user'],
'tasktime_user_name'=>$tasktime['name'],
'tasktime_user_first'=>$tasktime['firstname'],
'tasktime_fullcivname'=>$tasktime['fullcivname']
'tasktime_fullcivname'=>$tasktime['fullcivname'],
'tasktime_amountht'=>$tasktime['amountht'],
'tasktime_amountttc'=>$tasktime['amountttc'],
'tasktime_thm'=>$tasktime['thm'],
);
}
@ -698,7 +702,7 @@ class doc_generic_project_odt extends ModelePDFProjects
//Time ressources
$sql = "SELECT t.rowid, t.task_date, t.task_duration, t.fk_user, t.note";
$sql.= ", u.lastname, u.firstname";
$sql.= ", u.lastname, u.firstname, t.thm";
$sql .= " FROM ".MAIN_DB_PREFIX."projet_task_time as t";
$sql .= " , ".MAIN_DB_PREFIX."user as u";
$sql .= " WHERE t.fk_task =".$task->id;
@ -712,6 +716,35 @@ class doc_generic_project_odt extends ModelePDFProjects
$i = 0;
$tasks = array();
$listlinestasktime = $listlines->__get('taskstimes');
if (empty($num)) {
$row['rowid']='';
$row['task_date']='';
$row['task_duration']='';
$row['$tasktime']='';
$row['note']='';
$row['fk_user']='';
$row['name']='';
$row['firstname']='';
$row['fullcivname']='';
$row['amountht']='';
$row['amountttc']='';
$row['thm']='';
$tmparray=$this->get_substitutionarray_taskstime($row,$outputlangs);
foreach($tmparray as $key => $val)
{
try
{
$listlinestasktime->setVars($key, $val, true, 'UTF-8');
}
catch(OdfException $e)
{
}
catch(SegmentException $e)
{
}
}
$listlinestasktime->merge();
}
while ($i < $num)
{
$row = $this->db->fetch_array($resql);
@ -723,6 +756,16 @@ class doc_generic_project_odt extends ModelePDFProjects
$row['fullcivname']='';
}
if (!empty($row['thm'])) {
$row['amountht']=($row['task_duration'] / 3600) * $row['thm'];
$defaultvat = get_default_tva($mysoc, $mysoc);
$row['amountttc']=price2num($row['amountht'] * (1 + ($defaultvat / 100)),'MT');;
} else {
$row['amountht']=0;
$row['amountttc']=0;
$row['thm']=0;
}
$tmparray=$this->get_substitutionarray_taskstime($row,$outputlangs);
foreach($tmparray as $key => $val)
@ -884,60 +927,114 @@ class doc_generic_project_odt extends ModelePDFProjects
//List of referent
$listofreferent=array(
'propal'=>array(
'title'=>"ListProposalsAssociatedProject",
'class'=>'Propal',
'table'=>'propal',
'test'=>$conf->propal->enabled && $user->rights->propale->lire),
'order'=>array(
'title'=>"ListOrdersAssociatedProject",
'class'=>'Commande',
'table'=>'commande',
'test'=>$conf->commande->enabled && $user->rights->commande->lire),
'invoice'=>array(
'title'=>"ListInvoicesAssociatedProject",
'class'=>'Facture',
'table'=>'facture',
'test'=>$conf->facture->enabled && $user->rights->facture->lire),
'invoice_predefined'=>array(
'title'=>"ListPredefinedInvoicesAssociatedProject",
'class'=>'FactureRec',
'table'=>'facture_rec',
'test'=>$conf->facture->enabled && $user->rights->facture->lire),
'order_supplier'=>array(
'title'=>"ListSupplierOrdersAssociatedProject",
'table'=>'commande_fournisseur',
'class'=>'CommandeFournisseur',
'test'=>$conf->fournisseur->enabled && $user->rights->fournisseur->commande->lire),
'invoice_supplier'=>array(
'title'=>"ListSupplierInvoicesAssociatedProject",
'table'=>'facture_fourn',
'class'=>'FactureFournisseur',
'test'=>$conf->fournisseur->enabled && $user->rights->fournisseur->facture->lire),
'contract'=>array(
'title'=>"ListContractAssociatedProject",
'class'=>'Contrat',
'table'=>'contrat',
'test'=>$conf->contrat->enabled && $user->rights->contrat->lire),
'intervention'=>array(
'title'=>"ListFichinterAssociatedProject",
'class'=>'Fichinter',
'table'=>'fichinter',
'disableamount'=>1,
'test'=>$conf->ficheinter->enabled && $user->rights->ficheinter->lire),
'trip'=>array(
'title'=>"ListTripAssociatedProject",
'class'=>'Deplacement',
'table'=>'deplacement',
'disableamount'=>1,
'test'=>$conf->deplacement->enabled && $user->rights->deplacement->lire),
'agenda'=>array(
'title'=>"ListActionsAssociatedProject",
'class'=>'ActionComm',
'table'=>'actioncomm',
'disableamount'=>1,
'test'=>$conf->agenda->enabled && $user->rights->agenda->allactions->lire)
$listofreferent = array(
'propal' => array(
'title' => "ListProposalsAssociatedProject",
'class' => 'Propal',
'table' => 'propal',
'test' => $conf->propal->enabled && $user->rights->propale->lire
),
'order' => array(
'title' => "ListOrdersAssociatedProject",
'class' => 'Commande',
'table' => 'commande',
'test' => $conf->commande->enabled && $user->rights->commande->lire
),
'invoice' => array(
'title' => "ListInvoicesAssociatedProject",
'class' => 'Facture',
'table' => 'facture',
'test' => $conf->facture->enabled && $user->rights->facture->lire
),
'invoice_predefined' => array(
'title' => "ListPredefinedInvoicesAssociatedProject",
'class' => 'FactureRec',
'table' => 'facture_rec',
'test' => $conf->facture->enabled && $user->rights->facture->lire
),
'proposal_supplier' => array(
'title' => "ListSupplierProposalsAssociatedProject",
'class' => 'SupplierProposal',
'table' => 'supplier_proposal',
'test' => $conf->supplier_proposal->enabled && $user->rights->supplier_proposal->lire
),
'order_supplier' => array(
'title' => "ListSupplierOrdersAssociatedProject",
'table' => 'commande_fournisseur',
'class' => 'CommandeFournisseur',
'test' => $conf->fournisseur->enabled && $user->rights->fournisseur->commande->lire
),
'invoice_supplier' => array(
'title' => "ListSupplierInvoicesAssociatedProject",
'table' => 'facture_fourn',
'class' => 'FactureFournisseur',
'test' => $conf->fournisseur->enabled && $user->rights->fournisseur->facture->lire
),
'contract' => array(
'title' => "ListContractAssociatedProject",
'class' => 'Contrat',
'table' => 'contrat',
'test' => $conf->contrat->enabled && $user->rights->contrat->lire
),
'intervention' => array(
'title' => "ListFichinterAssociatedProject",
'class' => 'Fichinter',
'table' => 'fichinter',
'disableamount' => 1,
'test' => $conf->ficheinter->enabled && $user->rights->ficheinter->lire
),
'shipping' => array(
'title' => "ListShippingAssociatedProject",
'class' => 'Expedition',
'table' => 'expedition',
'disableamount' => 1,
'test' => $conf->expedition->enabled && $user->rights->expedition->lire
),
'trip' => array(
'title' => "ListTripAssociatedProject",
'class' => 'Deplacement',
'table' => 'deplacement',
'disableamount' => 1,
'test' => $conf->deplacement->enabled && $user->rights->deplacement->lire
),
'expensereport' => array(
'title' => "ListExpenseReportsAssociatedProject",
'class' => 'ExpenseReportLine',
'table' => 'expensereport_det',
'test' => $conf->expensereport->enabled && $user->rights->expensereport->lire
),
'donation' => array(
'title' => "ListDonationsAssociatedProject",
'class' => 'Don',
'table' => 'don',
'test' => $conf->don->enabled && $user->rights->don->lire
),
'loan' => array(
'title' => "ListLoanAssociatedProject",
'class' => 'Loan',
'table' => 'loan',
'test' => $conf->loan->enabled && $user->rights->loan->read
),
'chargesociales' => array(
'title' => "ListSocialContributionAssociatedProject",
'class' => 'ChargeSociales',
'table' => 'chargesociales',
'urlnew' => DOL_URL_ROOT . '/compta/sociales/card.php?action=create&projectid=' . $id,
'test' => $conf->tax->enabled && $user->rights->tax->charges->lire
),
'stock_mouvement' => array(
'title' => "ListMouvementStockProject",
'class' => 'MouvementStock',
'table' => 'stock_mouvement',
'test' => ($conf->stock->enabled && $user->rights->stock->mouvement->lire && ! empty($conf->global->STOCK_MOVEMENT_INTO_PROJECT_OVERVIEW))
),
'agenda' => array(
'title' => "ListActionsAssociatedProject",
'class' => 'ActionComm',
'table' => 'actioncomm',
'disableamount' => 1,
'test' => $conf->agenda->enabled && $user->rights->agenda->allactions->lire
)
);
//Insert reference

5
htdocs/core/modules/project/mod_project_simple.php
View File

@ -33,7 +33,10 @@ class mod_project_simple extends ModeleNumRefProjects
{
var $version='dolibarr'; // 'development', 'experimental', 'dolibarr'
var $prefix='PJ';
var $error='';
/**
* @var string Error code (or message)
*/
public $error='';
var $nom = "Simple";
var $name = "Simple";

10
htdocs/core/modules/project/modules_project.php
View File

@ -31,7 +31,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commondocgenerator.class.php';
*/
abstract class ModelePDFProjects extends CommonDocGenerator
{
var $error='';
/**
* @var string Error code (or message)
*/
public $error='';
/**
@ -62,7 +65,10 @@ abstract class ModelePDFProjects extends CommonDocGenerator
*/
abstract class ModeleNumRefProjects
{
var $error='';
/**
* @var string Error code (or message)
*/
public $error='';
/**
* Return if a module can be used or not

5
htdocs/core/modules/project/task/mod_task_simple.php
View File

@ -33,7 +33,10 @@ class mod_task_simple extends ModeleNumRefTask
{
var $version='dolibarr'; // 'development', 'experimental', 'dolibarr'
var $prefix='TK';
var $error='';
/**
* @var string Error code (or message)
*/
public $error='';
var $nom = "Simple";
var $name = "Simple";

10
htdocs/core/modules/project/task/modules_task.php
View File

@ -32,7 +32,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commondocgenerator.class.php';
*/
abstract class ModelePDFTask extends CommonDocGenerator
{
var $error='';
/**
* @var string Error code (or message)
*/
public $error='';
/**
@ -63,7 +66,10 @@ abstract class ModelePDFTask extends CommonDocGenerator
*/
abstract class ModeleNumRefTask
{
var $error='';
/**
* @var string Error code (or message)
*/
public $error='';
/**
* Return if a module can be used or not

5
htdocs/core/modules/propale/mod_propale_marbre.php
View File

@ -33,7 +33,10 @@ class mod_propale_marbre extends ModeleNumRefPropales
{
var $version='dolibarr'; // 'development', 'experimental', 'dolibarr'
var $prefix='PR';
var $error='';
/**
* @var string Error code (or message)
*/
public $error='';
var $nom = "Marbre";

10
htdocs/core/modules/propale/modules_propale.php
View File

@ -36,7 +36,10 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; // Requ
*/
abstract class ModelePDFPropales extends CommonDocGenerator
{
var $error='';
/**
* @var string Error code (or message)
*/
public $error='';
/**
@ -66,7 +69,10 @@ abstract class ModelePDFPropales extends CommonDocGenerator
*/
abstract class ModeleNumRefPropales
{
var $error='';
/**
* @var string Error code (or message)
*/
public $error='';
/**
* Return if a module can be used or not

5
htdocs/core/modules/security/generate/modules_genpassword.php
View File

@ -30,7 +30,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php';
*/
abstract class ModeleGenPassword
{
var $error='';
/**
* @var string Error code (or message)
*/
public $error='';
/**
* Return if a module can be used or not

15
htdocs/core/modules/societe/modules_societe.class.php
View File

@ -33,7 +33,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commondocgenerator.class.php';
*/
abstract class ModeleThirdPartyDoc extends CommonDocGenerator
{
var $error='';
/**
* @var string Error code (or message)
*/
public $error='';
/**
* Return list of active generation modules
@ -63,7 +66,10 @@ abstract class ModeleThirdPartyDoc extends CommonDocGenerator
*/
abstract class ModeleThirdPartyCode
{
var $error='';
/**
* @var string Error code (or message)
*/
public $error='';
/** Renvoi la description par defaut du modele de numerotation
*
@ -255,7 +261,10 @@ abstract class ModeleThirdPartyCode
*/
abstract class ModeleAccountancyCode
{
var $error='';
/**
* @var string Error code (or message)
*/
public $error='';
/** Return description of module

5
htdocs/core/modules/stock/modules_movement.php
View File

@ -30,7 +30,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commondocgenerator.class.php';
*/
abstract class ModelePDFMovement extends CommonDocGenerator
{
var $error='';
/**
* @var string Error code (or message)
*/
public $error='';
/**

5
htdocs/core/modules/stock/modules_stock.php
View File

@ -23,7 +23,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commondocgenerator.class.php';
*/
abstract class ModelePDFStock extends CommonDocGenerator
{
var $error='';
/**
* @var string Error code (or message)
*/
public $error='';
/**

10
htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php
View File

@ -34,7 +34,10 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; // requir
*/
abstract class ModelePDFSuppliersInvoices extends CommonDocGenerator
{
var $error='';
/**
* @var string Error code (or message)
*/
public $error='';
/**
@ -64,7 +67,10 @@ abstract class ModelePDFSuppliersInvoices extends CommonDocGenerator
*/
abstract class ModeleNumRefSuppliersInvoices
{
var $error='';
/**
* @var string Error code (or message)
*/
public $error='';
/** Return if a model can be used or not
*

10
htdocs/core/modules/supplier_order/modules_commandefournisseur.php
View File

@ -37,7 +37,10 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; // requir
*/
abstract class ModelePDFSuppliersOrders extends CommonDocGenerator
{
var $error='';
/**
* @var string Error code (or message)
*/
public $error='';
/**
@ -69,7 +72,10 @@ abstract class ModelePDFSuppliersOrders extends CommonDocGenerator
*/
abstract class ModeleNumRefSuppliersOrders
{
var $error='';
/**
* @var string Error code (or message)
*/
public $error='';
/** Return if a model can be used or not
*

5
htdocs/core/modules/supplier_payment/mod_supplier_payment_bronan.php
View File

@ -31,7 +31,10 @@ class mod_supplier_payment_bronan extends ModeleNumRefSupplierPayments
{
var $version='dolibarr'; // 'development', 'experimental', 'dolibarr'
var $prefix='SPAY';
var $error='';
/**
* @var string Error code (or message)
*/
public $error='';
var $nom='Bronan';

10
htdocs/core/modules/supplier_payment/modules_supplier_payment.php
View File

@ -22,7 +22,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commondocgenerator.class.php';
*/
abstract class ModelePDFSuppliersPayments extends CommonDocGenerator
{
var $error='';
/**
* @var string Error code (or message)
*/
public $error='';
/**
@ -54,7 +57,10 @@ abstract class ModelePDFSuppliersPayments extends CommonDocGenerator
abstract class ModeleNumRefSupplierPayments
{
var $error='';
/**
* @var string Error code (or message)
*/
public $error='';
/**
* Return if a module can be used or not

5
htdocs/core/modules/supplier_proposal/mod_supplier_proposal_marbre.php
View File

@ -33,7 +33,10 @@ class mod_supplier_proposal_marbre extends ModeleNumRefSupplierProposal
{
var $version='dolibarr'; // 'development', 'experimental', 'dolibarr'
var $prefix='RQ'; // RQ = Request for quotation
var $error='';
/**
* @var string Error code (or message)
*/
public $error='';
var $nom = "Marbre";

10
htdocs/core/modules/supplier_proposal/modules_supplier_proposal.php
View File

@ -36,7 +36,10 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; // Requ
*/
abstract class ModelePDFSupplierProposal extends CommonDocGenerator
{
var $error='';
/**
* @var string Error code (or message)
*/
public $error='';
/**
@ -66,7 +69,10 @@ abstract class ModelePDFSupplierProposal extends CommonDocGenerator
*/
abstract class ModeleNumRefSupplierProposal
{
var $error='';
/**
* @var string Error code (or message)
*/
public $error='';
/**
* Return if a module can be used or not

5
htdocs/core/modules/user/modules_user.class.php
View File

@ -38,7 +38,10 @@
*/
abstract class ModelePDFUser extends CommonDocGenerator
{
var $error='';
/**
* @var string Error code (or message)
*/
public $error='';
/**

5
htdocs/core/modules/usergroup/modules_usergroup.class.php
View File

@ -38,7 +38,10 @@
*/
abstract class ModelePDFUserGroup extends CommonDocGenerator
{
var $error='';
/**
* @var string Error code (or message)
*/
public $error='';
/**

1
htdocs/fichinter/class/fichinter.class.php
View File

@ -278,6 +278,7 @@ class Fichinter extends CommonObject
*/
function update($user, $notrigger=0)
{
global $conf;
if (! is_numeric($this->duration)) {
$this->duration = 0;
}

6
htdocs/imports/class/import.class.php
View File

@ -44,7 +44,11 @@ class Import
var $array_import_run_sql_after;
var $error;
var $errors;
/**
*
* @var string[] Error codes (or messages)
*/
public $errors = array ();
/**

4
htdocs/index.php
View File

@ -565,6 +565,10 @@ if (! empty($valid_dashboardlines))
$sep=($conf->dol_use_jmobile?'<br>':' ');
$boxwork .= '<span class="boxstatstext" title="'.dol_escape_htmltag($board->label).'">'.$board->img.' '.$board->label.'</span><br>';
$boxwork .= '<a class="valignmiddle dashboardlineindicator" href="'.$board->url.'"><span class="dashboardlineindicator'.(($board->nbtodo == 0)?' dashboardlineok':'').'">'.$board->nbtodo.'</span></a>';
if ($board->total > 0 && ! empty($conf->global->MAIN_WORKBOARD_SHOW_TOTAL_WO_TAX))
{
$boxwork .= '&nbsp;/&nbsp;<a class="valignmiddle dashboardlineindicator" href="'.$board->url.'"><span class="dashboardlineindicator'.(($board->nbtodo == 0)?' dashboardlineok':'').'">'.price($board->total) .'</span></a>';
}
$boxwork .= '</div>';
if ($board->nbtodolate > 0)
{

BIN
htdocs/install/doctemplates/projects/template_project.odt
View File

Binary file not shown.

2
htdocs/langs/en_US/admin.lang
View File

@ -477,6 +477,8 @@ davDescription=Add a component to be a DAV server
DAVSetup=Setup of module DAV
DAV_ALLOW_PUBLIC_DIR=Enable the public directory (WebDav directory with no login required)
DAV_ALLOW_PUBLIC_DIRTooltip=The WebDav public directory is a WebDAV directory everybody can access to (in read and write mode), with no need to have/use an existing login/password account.
DAV_ALLOW_ECM_DIR=Enable the root directy of DMS/ECM module (login required)
DAV_ALLOW_ECM_DIRTooltip=The root directory where all files are manually uploaded when using the DMS/ECM module. Like for the feature from the web interface, you will need a valid login/password with granted permissions to access it.
# Modules
Module0Name=Users & Groups
Module0Desc=Users / Employees and Groups management

10
htdocs/langs/en_US/companies.lang
View File

@ -5,10 +5,10 @@ SelectThirdParty=Select a third party
ConfirmDeleteCompany=Are you sure you want to delete this company and all inherited information?
DeleteContact=Delete a contact/address
ConfirmDeleteContact=Are you sure you want to delete this contact and all inherited information?
MenuNewThirdParty=new Third Party
MenuNewCustomer=new Customer
MenuNewProspect=new Prospect
MenuNewSupplier=new Vendor
MenuNewThirdParty=New Third Party
MenuNewCustomer=New Customer
MenuNewProspect=Nnew Prospect
MenuNewSupplier=New Vendor
MenuNewPrivateIndividual=New private individual
NewCompany=New company (prospect, customer, vendor)
NewThirdParty=New Third Party (prospect, customer, vendor)
@ -333,7 +333,7 @@ NoContactForAnyProposal=This contact is not a contact for any commercial proposa
NoContactForAnyContract=This contact is not a contact for any contract
NoContactForAnyInvoice=This contact is not a contact for any invoice
NewContact=New contact
NewContactAddress=new Contact/Address
NewContactAddress=New Contact/Address
MyContacts=My contacts
Capital=Capital
CapitalOf=Capital of %s

3
htdocs/langs/en_US/errors.lang
View File

@ -209,6 +209,7 @@ ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was mod
ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
# Warnings
WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
@ -231,4 +232,4 @@ WarningSomeLinesWithNullHourlyRate=Some times were recorded by some users while
WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security purpose you will have to login with your new login before next action.
WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the mass actions on lists
WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report

6
htdocs/langs/en_US/projects.lang
View File

@ -168,8 +168,9 @@ TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor
SelectElement=Select element
AddElement=Link to element
# Documents models
DocumentModelBeluga=Project template for linked objects overview
DocumentModelBaleine=Project report template for tasks
DocumentModelBeluga=Project document template for linked objects overview
DocumentModelBaleine=Project document template for tasks
DocumentModelTimeSpent=Project report template for time spent
PlannedWorkload=Planned workload
PlannedWorkloadShort=Workload
ProjectReferers=Related items
@ -229,3 +230,4 @@ DontHavePermissionForCloseProject=You do not have permissions to close the proje
DontHaveTheValidateStatus=The project %s must be open to be closed
RecordsClosed=%s project(s) closed
SendProjectRef=Information project %s
ModuleSalaryToDefineHourlyRateMustBeEnabled=Module 'Payment of employee wages' must be enabled to define employee hourly rate to have time spent valorized

Some files were not shown because too many files have changed in this diff Show More