';
if ($conf->societe->enabled)
{
diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index 905b562ab5d..6e4e3fb941b 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -120,7 +120,7 @@ class ActionComm extends CommonObject
* Object user that create action
* @var User
* @deprecated
- * @see authorid
+ * @see $authorid
*/
public $author;
@@ -128,7 +128,7 @@ class ActionComm extends CommonObject
* Object user that modified action
* @var User
* @deprecated
- * @see usermodid
+ * @see $usermodid
*/
public $usermod;
@@ -1010,7 +1010,7 @@ class ActionComm extends CommonObject
/**
* Load all objects with filters.
- * WARNING: This make a fetch on all records instead of making one request with a join.
+ * @TODO WARNING: This make a fetch on all records instead of making one request with a join.
*
* @param DoliDb $db Database handler
* @param int $socid Filter by thirdparty
@@ -1020,7 +1020,7 @@ class ActionComm extends CommonObject
* @param string $sortfield Sort on this field
* @param string $sortorder ASC or DESC
* @param string $limit Limit number of answers
- * @return array or string Error string if KO, array with actions if OK
+ * @return array|string Error string if KO, array with actions if OK
*/
public static function getActions($db, $socid = 0, $fk_element = 0, $elementtype = '', $filter = '', $sortfield = 'a.datep', $sortorder = 'DESC', $limit = 0)
{
@@ -1028,6 +1028,8 @@ class ActionComm extends CommonObject
$resarray=array();
+ dol_syslog(get_class()."::getActions", LOG_DEBUG);
+
$sql = "SELECT a.id";
$sql.= " FROM ".MAIN_DB_PREFIX."actioncomm as a";
$sql.= " WHERE a.entity IN (".getEntity('agenda').")";
@@ -1041,7 +1043,6 @@ class ActionComm extends CommonObject
if ($sortorder && $sortfield) $sql.=$db->order($sortfield, $sortorder);
$sql.=$db->plimit($limit, 0);
- dol_syslog(get_class()."::getActions", LOG_DEBUG);
$resql=$db->query($sql);
if ($resql)
{
@@ -1285,7 +1286,7 @@ class ActionComm extends CommonObject
if (! empty($conf->dol_no_mouse_hover)) $notooltip=1; // Force disable tooltips
- if ((!$user->rights->agenda->allactions->read && $this->author->id != $user->id) || (!$user->rights->agenda->myactions->read && $this->author->id == $user->id))
+ if ((!$user->rights->agenda->allactions->read && $this->authorid != $user->id) || (!$user->rights->agenda->myactions->read && $this->authorid == $user->id))
$option = 'nolink';
$label = $this->label;
diff --git a/htdocs/comm/action/class/api_agendaevents.class.php b/htdocs/comm/action/class/api_agendaevents.class.php
index ec899d72ae1..833f97b3b6b 100644
--- a/htdocs/comm/action/class/api_agendaevents.class.php
+++ b/htdocs/comm/action/class/api_agendaevents.class.php
@@ -356,7 +356,7 @@ class AgendaEvents extends DolibarrApi
unset($object->total_localtax2);
unset($object->total_ttc);
unset($object->fk_incoterms);
- unset($object->libelle_incoterms);
+ unset($object->label_incoterms);
unset($object->location_incoterms);
unset($object->name);
unset($object->lastname);
diff --git a/htdocs/comm/action/list.php b/htdocs/comm/action/list.php
index 28670604b9e..bd57005b7bf 100644
--- a/htdocs/comm/action/list.php
+++ b/htdocs/comm/action/list.php
@@ -43,7 +43,7 @@ $action=GETPOST('action', 'alpha');
$contextpage=GETPOST('contextpage', 'aZ')?GETPOST('contextpage', 'aZ'):'actioncommlist'; // To manage different context of search
$resourceid=GETPOST("search_resourceid", "int")?GETPOST("search_resourceid", "int"):GETPOST("resourceid", "int");
$pid=GETPOST("search_projectid", 'int', 3)?GETPOST("search_projectid", 'int', 3):GETPOST("projectid", 'int', 3);
-$status=GETPOST("search_status", 'alpha')?GETPOST("search_status", 'alpha'):GETPOST("status", 'alpha');
+$status=(GETPOST("search_status", 'alpha') != '')?GETPOST("search_status", 'alpha'):GETPOST("status", 'alpha');
$type=GETPOST('search_type', 'alphanohtml')?GETPOST('search_type', 'alphanohtml'):GETPOST('type', 'alphanohtml');
$optioncss = GETPOST('optioncss', 'alpha');
$year=GETPOST("year", 'int');
@@ -97,15 +97,13 @@ if ($page == -1 || $page == null) { $page = 0 ; }
$offset = $limit * $page ;
if (! $sortorder)
{
- $sortorder="DESC";
- if ($status == 'todo') $sortorder="DESC";
- //if ($status == 'done') $sortorder="DESC";
+ $sortorder="DESC,DESC";
+ if ($status == 'todo') $sortorder="DESC,DESC";
}
if (! $sortfield)
{
- $sortfield="a.datep";
- if ($status == 'todo') $sortfield="a.datep";
- //if ($status == 'done') $sortfield="a.datep2";
+ $sortfield="a.datep,a.id";
+ if ($status == 'todo') $sortfield="a.datep,a.id";
}
// Security check
@@ -500,7 +498,7 @@ if ($resql)
if (! empty($arrayfields['a.label']['checked'])) print_liste_field_titre($arrayfields['a.label']['label'], $_SERVER["PHP_SELF"], "a.label", $param, "", "", $sortfield, $sortorder);
if (! empty($arrayfields['a.note']['checked'])) print_liste_field_titre($arrayfields['a.note']['label'], $_SERVER["PHP_SELF"], "a.note", $param, "", "", $sortfield, $sortorder);
//if (! empty($conf->global->AGENDA_USE_EVENT_TYPE))
- if (! empty($arrayfields['a.datep']['checked'])) print_liste_field_titre($arrayfields['a.datep']['label'], $_SERVER["PHP_SELF"], "a.datep", $param, '', 'align="center"', $sortfield, $sortorder);
+ if (! empty($arrayfields['a.datep']['checked'])) print_liste_field_titre($arrayfields['a.datep']['label'], $_SERVER["PHP_SELF"], "a.datep,a.id", $param, '', 'align="center"', $sortfield, $sortorder);
if (! empty($arrayfields['a.datep2']['checked'])) print_liste_field_titre($arrayfields['a.datep2']['label'], $_SERVER["PHP_SELF"], "a.datep2", $param, '', 'align="center"', $sortfield, $sortorder);
if (! empty($arrayfields['s.nom']['checked'])) print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"], "s.nom", $param, "", "", $sortfield, $sortorder);
if (! empty($arrayfields['a.fk_contact']['checked'])) print_liste_field_titre($arrayfields['a.fk_contact']['label'], $_SERVER["PHP_SELF"], "a.fk_contact", $param, "", "", $sortfield, $sortorder);
@@ -528,6 +526,7 @@ if ($resql)
require_once DOL_DOCUMENT_ROOT.'/comm/action/class/cactioncomm.class.php';
$caction=new CActionComm($db);
$arraylist=$caction->liste_array(1, 'code', '', (empty($conf->global->AGENDA_USE_EVENT_TYPE)?1:0), '', 1);
+ $contactListCache = array();
while ($i < min($num, $limit))
{
@@ -647,7 +646,34 @@ if ($resql)
// Contact
if (! empty($arrayfields['a.fk_contact']['checked'])) {
print '';
- if ($obj->fk_contact > 0)
+
+
+ $actionstatic->fetchResources();
+ if(!empty($actionstatic->socpeopleassigned))
+ {
+ $contactList = array();
+ foreach ($actionstatic->socpeopleassigned as $socpeopleId => $socpeopleassigned)
+ {
+ if(!isset($contactListCache[$socpeopleassigned['id']]))
+ {
+ // if no cache found we fetch it
+ $contact = new Contact($db);
+ if($contact->fetch($socpeopleassigned['id'])>0)
+ {
+ $contactListCache[$socpeopleassigned['id']] = $contact->getNomUrl(1, '', 28);
+ $contactList[] = $contact->getNomUrl(1, '', 28);
+ }
+ }
+ else{
+ // use cache
+ $contactList[] = $contactListCache[$socpeopleassigned['id']];
+ }
+ }
+ if(!empty($contactList)){
+ print implode(', ', $contactList);
+ }
+ }
+ elseif ($obj->fk_contact > 0) //keep for retrocompatibility with faraway event
{
$contactstatic->id=$obj->fk_contact;
$contactstatic->email=$obj->email;
diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php
index 754cb736bc9..d4020f4df92 100644
--- a/htdocs/comm/action/peruser.php
+++ b/htdocs/comm/action/peruser.php
@@ -1186,33 +1186,34 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
}
}
- $ids1='';$ids2='';
- if (count($cases1[$h]) && array_keys($cases1[$h])) $ids1=join(',', array_keys($cases1[$h]));
- if (count($cases2[$h]) && array_keys($cases2[$h])) $ids2=join(',', array_keys($cases2[$h]));
+ $ids1='';
+ $ids2='';
+ if (is_array($cases1[$h]) && count($cases1[$h]) && array_keys($cases1[$h])) $ids1=join(',', array_keys($cases1[$h]));
+ if (is_array($cases2[$h]) && count($cases2[$h]) && array_keys($cases2[$h])) $ids2=join(',', array_keys($cases2[$h]));
if ($h == $begin_h) echo ' ';
else echo ' ';
- if (count($cases1[$h]) == 1) // only 1 event
+ if (is_array($cases1[$h]) && count($cases1[$h]) == 1) // only 1 event
{
$output = array_slice($cases1[$h], 0, 1);
$title1=$langs->trans("Ref").' '.$ids1.($title1?' - '.$title1:'');
if ($output[0]['string']) $title1.=($title1?' - ':'').$output[0]['string'];
if ($output[0]['color']) $color1 = $output[0]['color'];
}
- elseif (count($cases1[$h]) > 1)
+ elseif (is_array($cases1[$h]) && count($cases1[$h]) > 1)
{
$title1=$langs->trans("Ref").' '.$ids1.($title1?' - '.$title1:'');
$color1='222222';
}
- if (count($cases2[$h]) == 1) // only 1 event
+ if (is_array($cases2[$h]) && count($cases2[$h]) == 1) // only 1 event
{
$output = array_slice($cases2[$h], 0, 1);
$title2=$langs->trans("Ref").' '.$ids2.($title2?' - '.$title2:'');
if ($output[0]['string']) $title2.=($title2?' - ':'').$output[0]['string'];
if ($output[0]['color']) $color2 = $output[0]['color'];
}
- elseif (count($cases2[$h]) > 1)
+ elseif (is_array($cases2[$h]) && count($cases2[$h]) > 1)
{
$title2=$langs->trans("Ref").' '.$ids2.($title2?' - '.$title2:'');
$color2='222222';
diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index 721aba20de8..285ed03e7c3 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -694,7 +694,7 @@ if ($object->id > 0)
if ($num > 0)
{
print '';
- print '
';
+ print '';
print '';
print ''.$langs->trans("LastPropals", ($num<=$MAXLIST?"":$MAXLIST)).' '.$langs->trans("AllPropals").' '.$num.' ';
- print '
';
+ print '';
print '';
print ''.$langs->trans("LastCustomerOrders", ($num<=$MAXLIST?"":$MAXLIST)).' '.$langs->trans("AllOrders").' '.$num.' ';
- print '
';
+ print '';
print '';
print ''.$langs->trans("LastSendings", ($num<=$MAXLIST?"":$MAXLIST)).' '.$langs->trans("AllSendings").' '.$num.' ';
- print '
';
+ print '';
print '';
print ''.$langs->trans("LastContracts", ($num<=$MAXLIST?"":$MAXLIST)).' ';
@@ -989,7 +989,7 @@ if ($object->id > 0)
if ($num > 0)
{
print '';
- print '
';
+ print '';
print '';
print ''.$langs->trans("LastInterventions", ($num<=$MAXLIST?"":$MAXLIST)).' '.$langs->trans("AllInterventions").' '.$num.' ';
- print '
';
+ print '';
print '';
print ''.$langs->trans("LatestCustomerTemplateInvoices", ($num<=$MAXLIST?"":$MAXLIST)).' '.$langs->trans("AllCustomerTemplateInvoices").' '.$num.' ';
- print '
';
+ print '';
print '';
print ''.$langs->trans("LastCustomersBills", ($num<=$MAXLIST?"":$MAXLIST)).' '.$langs->trans("AllBills").' '.$num.'
* Copyright (C) 2005-2012 Regis Houssin
* Copyright (C) 2015 Jean-François Ferry
+ * Copyright (C) 2019 Nicolas ZABOURI
*
* 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
@@ -37,6 +38,11 @@ if (! empty($conf->fournisseur->enabled)) require_once DOL_DOCUMENT_ROOT.'/fourn
if (! $user->rights->societe->lire) accessforbidden();
+$hookmanager = new HookManager($db);
+
+// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array
+$hookmanager->initHooks(array('commercialindex'));
+
// Load translation files required by the page
$langs->loadLangs(array("commercial", "propal"));
@@ -897,6 +903,9 @@ if (! empty($conf->commande->enabled) && $user->rights->commande->lire)
print '';
+$parameters = array('user' => $user);
+$reshook = $hookmanager->executeHooks('dashboardCommercials', $parameters, $object); // Note that $action and $object may have been modified by hook
+
// End of page
llxFooter();
$db->close();
diff --git a/htdocs/comm/mailing/index.php b/htdocs/comm/mailing/index.php
index c5d8bc47232..a835ca241a3 100644
--- a/htdocs/comm/mailing/index.php
+++ b/htdocs/comm/mailing/index.php
@@ -2,6 +2,7 @@
/* Copyright (C) 2005 Rodolphe Quiedeville
* Copyright (C) 2005-2009 Laurent Destailleur
* Copyright (C) 2010 Regis Houssin
+ * Copyright (C) 2019 Nicolas ZABOURI
*
* 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
@@ -27,6 +28,11 @@ require '../../main.inc.php';
require_once DOL_DOCUMENT_ROOT .'/comm/mailing/class/mailing.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+$hookmanager = new HookManager($db);
+
+// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array
+$hookmanager->initHooks(array('mailingindex'));
+
// Load translation files required by the page
$langs->loadLangs(array('commercial', 'orders'));
@@ -207,6 +213,9 @@ if ($langs->file_exists("html/spam.html", 0)) {
print '';
- print ''.$form->textwithpicto($langs->trans("IncotermLabel"), $soc->libelle_incoterms, 1).' '.$form->textwithpicto($langs->trans("IncotermLabel"), $soc->label_incoterms, 1).' ';
print $form->select_incoterms((!empty($soc->fk_incoterms) ? $soc->fk_incoterms : ''), (!empty($soc->location_incoterms)?$soc->location_incoterms:''));
print ' ';
@@ -2305,7 +2305,7 @@ $formquestion = array_merge($formquestion, array(
print '';
if ($action != 'editincoterm')
{
- print $form->textwithpicto($object->display_incoterms(), $object->libelle_incoterms, 1);
+ print $form->textwithpicto($object->display_incoterms(), $object->label_incoterms, 1);
}
else
{
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 0b9863f287b..598d34f7093 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -415,7 +415,7 @@ class Propal extends CommonObject
* @param float $remise_percent Pourcentage de remise de la ligne
* @param string $price_base_type HT or TTC
* @param float $pu_ttc Prix unitaire TTC
- * @param int $info_bits Bits de type de lignes
+ * @param int $info_bits Bits for type of lines
* @param int $type Type of line (0=product, 1=service). Not used if fk_product is defined, the type of product is used.
* @param int $rang Position of line
* @param int $special_code Special code (also used by externals modules!)
@@ -530,11 +530,11 @@ class Propal extends CommonObject
$pu_ht_devise = $tabprice[19];
// Rang to use
- $rangtouse = $rang;
- if ($rangtouse == -1)
+ $ranktouse = $rang;
+ if ($ranktouse == -1)
{
$rangmax = $this->line_max($fk_parent_line);
- $rangtouse = $rangmax + 1;
+ $ranktouse = $rangmax + 1;
}
// TODO A virer
@@ -568,7 +568,7 @@ class Propal extends CommonObject
$this->line->fk_remise_except=$fk_remise_except;
$this->line->remise_percent=$remise_percent;
$this->line->subprice=$pu_ht;
- $this->line->rang=$rangtouse;
+ $this->line->rang=$ranktouse;
$this->line->info_bits=$info_bits;
$this->line->total_ht=$total_ht;
$this->line->total_tva=$total_tva;
@@ -1330,9 +1330,9 @@ class Propal extends CommonObject
// Hook of thirdparty module
if (is_object($hookmanager))
{
- $parameters=array('objFrom'=>$this,'clonedObj'=>$clonedObj);
+ $parameters=array('objFrom'=>$this,'clonedObj'=>$object);
$action='';
- $reshook=$hookmanager->executeHooks('createFrom', $parameters, $clonedObj, $action); // Note that $action and $object may have been modified by some hooks
+ $reshook=$hookmanager->executeHooks('createFrom', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
if ($reshook < 0) $error++;
}
}
@@ -1383,7 +1383,7 @@ class Propal extends CommonObject
$sql.= ", p.fk_incoterms, p.location_incoterms";
$sql.= ", p.fk_multicurrency, p.multicurrency_code, p.multicurrency_tx, p.multicurrency_total_ht, p.multicurrency_total_tva, p.multicurrency_total_ttc";
$sql.= ", p.tms as date_modification";
- $sql.= ", i.libelle as libelle_incoterms";
+ $sql.= ", i.libelle as label_incoterms";
$sql.= ", c.label as statut_label";
$sql.= ", ca.code as availability_code, ca.label as availability";
$sql.= ", dr.code as demand_reason_code, dr.label as demand_reason";
@@ -1471,7 +1471,7 @@ class Propal extends CommonObject
//Incoterms
$this->fk_incoterms = $obj->fk_incoterms;
$this->location_incoterms = $obj->location_incoterms;
- $this->libelle_incoterms = $obj->libelle_incoterms;
+ $this->label_incoterms = $obj->label_incoterms;
// Multicurrency
$this->fk_multicurrency = $obj->fk_multicurrency;
@@ -1615,11 +1615,14 @@ class Propal extends CommonObject
/**
* Load array lines
*
- * @param int $only_product Return only physical products
+ * @param int $only_product Return only physical products
+ * @param int $loadalsotranslation Return translation for products
+ *
* @return int <0 if KO, >0 if OK
*/
- public function fetch_lines($only_product = 0)
+ public function fetch_lines($only_product = 0, $loadalsotranslation = 0)
{
+ global $langs, $conf;
// phpcs:enable
$this->lines=array();
@@ -1713,6 +1716,13 @@ class Propal extends CommonObject
$line->fetch_optionals();
+ // multilangs
+ if (! empty($conf->global->MAIN_MULTILANGS) && ! empty($objp->fk_product) && ! empty($loadalsotranslation)) {
+ $line = new Product($this->db);
+ $line->fetch($objp->fk_product);
+ $line->getMultiLangs();
+ }
+
$this->lines[$i] = $line;
//dol_syslog("1 ".$line->fk_product);
//print "xx $i ".$this->lines[$i]->fk_product;
@@ -1739,10 +1749,10 @@ class Propal extends CommonObject
*/
public function valid($user, $notrigger = 0)
{
- require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-
global $conf;
+ require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
$error=0;
// Protection
@@ -1808,14 +1818,18 @@ class Propal extends CommonObject
// Rename directory if dir was a temporary ref
if (preg_match('/^[\(]?PROV/i', $this->ref))
{
- // Rename of propal directory ($this->ref = old ref, $num = new ref)
- // to not lose the linked files
+ // Now we rename also files into index
+ $sql = 'UPDATE '.MAIN_DB_PREFIX."ecm_files set filename = CONCAT('".$this->db->escape($this->newref)."', SUBSTR(filename, ".(strlen($this->ref)+1).")), filepath = 'propale/".$this->db->escape($this->newref)."'";
+ $sql.= " WHERE filename LIKE '".$this->db->escape($this->ref)."%' AND filepath = 'propale/".$this->db->escape($this->ref)."' and entity = ".$conf->entity;
+ $resql = $this->db->query($sql);
+ if (! $resql) { $error++; $this->error = $this->db->lasterror(); }
+
+ // We rename directory ($this->ref = old ref, $num = new ref) in order not to lose the attachments
$oldref = dol_sanitizeFileName($this->ref);
$newref = dol_sanitizeFileName($num);
$dirsource = $conf->propal->multidir_output[$this->entity].'/'.$oldref;
$dirdest = $conf->propal->multidir_output[$this->entity].'/'.$newref;
-
- if (file_exists($dirsource))
+ if (! $error && file_exists($dirsource))
{
dol_syslog(get_class($this)."::validate rename dir ".$dirsource." into ".$dirdest);
if (@rename($dirsource, $dirdest))
@@ -3502,7 +3516,7 @@ class Propal extends CommonObject
else
{
$langs->load("errors");
- print $langs->trans("Error")." ".$langs->trans("ErrorModuleSetupNotComplete");
+ print $langs->trans("Error")." ".$langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("Proposal"));
return "";
}
}
diff --git a/htdocs/comm/propal/index.php b/htdocs/comm/propal/index.php
index e69dbbc8b6c..309712ae76b 100644
--- a/htdocs/comm/propal/index.php
+++ b/htdocs/comm/propal/index.php
@@ -2,6 +2,7 @@
/* Copyright (C) 2003-2004 Rodolphe Quiedeville
* Copyright (C) 2004-2017 Laurent Destailleur
* Copyright (C) 2005-2012 Regis Houssin
+ * Copyright (C) 2019 Nicolas ZABOURI
*
* 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
@@ -27,6 +28,11 @@ require '../../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
require_once DOL_DOCUMENT_ROOT .'/comm/propal/class/propal.class.php';
+$hookmanager = new HookManager($db);
+
+// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array
+$hookmanager->initHooks(array('proposalindex'));
+
// Load translation files required by the page
$langs->loadLangs(array('propal', 'companies'));
@@ -540,6 +546,9 @@ if (! empty($conf->propal->enabled))
//print '
';
print '';
+$parameters = array('user' => $user);
+$reshook = $hookmanager->executeHooks('dashboardPropals', $parameters, $object); // Note that $action and $object may have been modified by hook
+
// End of page
llxFooter();
$db->close();
diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index ff01690660a..c6af61acab9 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -162,10 +162,13 @@ $arrayfields=array(
'p.total_ht'=>array('label'=>"AmountHT", 'checked'=>1),
'p.total_vat'=>array('label'=>"AmountVAT", 'checked'=>0),
'p.total_ttc'=>array('label'=>"AmountTTC", 'checked'=>0),
+ 'p.total_ht_invoiced'=>array('label'=>$langs->trans("AmountInvoicedHT"), 'checked'=>0, 'enabled'=>$conf->global->PROPOSAL_SHOW_INVOICED_AMOUNT),
+ 'p.total_invoiced'=>array('label'=>$langs->trans("AmountInvoicedTTC"), 'checked'=>0, 'enabled'=>$conf->global->PROPOSAL_SHOW_INVOICED_AMOUNT),
'u.login'=>array('label'=>"Author", 'checked'=>1, 'position'=>10),
'sale_representative'=>array('label'=>"SaleRepresentativesOfThirdParty", 'checked'=>1),
'p.datec'=>array('label'=>"DateCreation", 'checked'=>0, 'position'=>500),
'p.tms'=>array('label'=>"DateModificationShort", 'checked'=>0, 'position'=>500),
+ 'p.date_cloture'=>array('label'=>"DateClosing", 'checked'=>0, 'position'=>500),
'p.fk_statut'=>array('label'=>"Status", 'checked'=>1, 'position'=>1000),
);
// Extra fields
@@ -267,10 +270,10 @@ $sql.= " typent.code as typent_code,";
$sql.= " ava.rowid as availability,";
$sql.= " state.code_departement as state_code, state.nom as state_name,";
$sql.= ' p.rowid, p.entity, p.note_private, p.total_ht, p.tva as total_vat, p.total as total_ttc, p.localtax1, p.localtax2, p.ref, p.ref_client, p.fk_statut, p.fk_user_author, p.datep as dp, p.fin_validite as dfv,p.date_livraison as ddelivery,';
-$sql.= ' p.datec as date_creation, p.tms as date_update,';
+$sql.= ' p.datec as date_creation, p.tms as date_update, p.date_cloture as date_cloture,';
$sql.= " pr.rowid as project_id, pr.ref as project_ref, pr.title as project_label,";
$sql.= ' u.login';
-if (! $user->rights->societe->client->voir && ! $socid) $sql .= ", sc.fk_soc, sc.fk_user,";
+if (! $user->rights->societe->client->voir && ! $socid) $sql .= ", sc.fk_soc, sc.fk_user";
if ($search_categ_cus) $sql .= ", cc.fk_categorie, cc.fk_soc";
// Add fields from extrafields
foreach ($extrafields->attribute_label as $key => $val) $sql.=($extrafields->attribute_type[$key] != 'separate' ? ", ef.".$key.' as options_'.$key : '');
@@ -444,7 +447,7 @@ if ($resql)
$newcardbutton.= dolGetButtonTitle($langs->trans('NewPropal'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/comm/propal/card.php?action=create');
}
- // Lignes des champs de filtre
+ // Fields title search
print '';
+ print ' ';
+ }
+ if (! empty($arrayfields['p.total_invoiced']['checked']))
+ {
+ // Amount invoiced
+ print '';
+ print ' ';
+ }
if (! empty($arrayfields['u.login']['checked']))
{
// Author
@@ -674,6 +689,12 @@ if ($resql)
print '';
print ' ';
}
+ // Date cloture
+ if (! empty($arrayfields['p.date_cloture']['checked']))
+ {
+ print '';
+ print ' ';
+ }
// Status
if (! empty($arrayfields['p.fk_statut']['checked']))
{
@@ -709,6 +730,8 @@ if ($resql)
if (! empty($arrayfields['p.total_ht']['checked'])) print_liste_field_titre($arrayfields['p.total_ht']['label'], $_SERVER["PHP_SELF"], 'p.total_ht', '', $param, 'class="right"', $sortfield, $sortorder);
if (! empty($arrayfields['p.total_vat']['checked'])) print_liste_field_titre($arrayfields['p.total_vat']['label'], $_SERVER["PHP_SELF"], 'p.tva', '', $param, 'class="right"', $sortfield, $sortorder);
if (! empty($arrayfields['p.total_ttc']['checked'])) print_liste_field_titre($arrayfields['p.total_ttc']['label'], $_SERVER["PHP_SELF"], 'p.total', '', $param, 'class="right"', $sortfield, $sortorder);
+ if (! empty($arrayfields['p.total_ht_invoiced']['checked'])) print_liste_field_titre($arrayfields['p.total_ht_invoiced']['label'], $_SERVER["PHP_SELF"], '', '', $param, 'class="right"', $sortfield, $sortorder);
+ if (! empty($arrayfields['p.total_invoiced']['checked'])) print_liste_field_titre($arrayfields['p.total_invoiced']['label'], $_SERVER["PHP_SELF"], '', '', $param, 'class="right"', $sortfield, $sortorder);
if (! empty($arrayfields['u.login']['checked'])) print_liste_field_titre($arrayfields['u.login']['label'], $_SERVER["PHP_SELF"], 'u.login', '', $param, 'align="center"', $sortfield, $sortorder);
if (! empty($arrayfields['sale_representative']['checked'])) print_liste_field_titre($arrayfields['sale_representative']['label'], $_SERVER["PHP_SELF"], "", "", "$param", '', $sortfield, $sortorder);
// Extra fields
@@ -719,6 +742,7 @@ if ($resql)
print $hookmanager->resPrint;
if (! empty($arrayfields['p.datec']['checked'])) print_liste_field_titre($arrayfields['p.datec']['label'], $_SERVER["PHP_SELF"], "p.datec", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
if (! empty($arrayfields['p.tms']['checked'])) print_liste_field_titre($arrayfields['p.tms']['label'], $_SERVER["PHP_SELF"], "p.tms", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
+ if (! empty($arrayfields['p.date_cloture']['checked'])) print_liste_field_titre($arrayfields['p.date_cloture']['label'], $_SERVER["PHP_SELF"], "p.date_cloture", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
if (! empty($arrayfields['p.fk_statut']['checked'])) print_liste_field_titre($arrayfields['p.fk_statut']['label'], $_SERVER["PHP_SELF"], "p.fk_statut", "", $param, 'class="right"', $sortfield, $sortorder);
print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
print ' '."\n";
@@ -933,6 +957,48 @@ if ($resql)
if (! $i) $totalarray['totalttcfield']=$totalarray['nbfield'];
$totalarray['totalttc'] += $obj->total_ttc;
}
+ // Amount invoiced
+ if(! empty($arrayfields['p.total_ht_invoiced']['checked'])) {
+ $totalInvoiced = 0;
+ $p = new Propal($db);
+ $TInvoiceData = $p->InvoiceArrayList($obj->rowid);
+
+ if(! empty($TInvoiceData)) {
+ foreach($TInvoiceData as $invoiceData) {
+ $invoice = new Facture($db);
+ $invoice->fetch($invoiceData->facid);
+
+ if(! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS) && $invoice->type == Facture::TYPE_DEPOSIT) continue;
+ $totalInvoiced += $invoice->total_ht;
+ }
+ }
+
+ print ''.price($totalInvoiced)." \n";
+ if (! $i) $totalarray['nbfield']++;
+ if (! $i) $totalarray['totalhtinvoicedfield']=$totalarray['nbfield'];
+ $totalarray['totalhtinvoiced'] += $totalInvoiced;
+ }
+ // Amount invoiced
+ if(! empty($arrayfields['p.total_invoiced']['checked'])) {
+ $totalInvoiced = 0;
+ $p = new Propal($db);
+ $TInvoiceData = $p->InvoiceArrayList($obj->rowid);
+
+ if(! empty($TInvoiceData)) {
+ foreach($TInvoiceData as $invoiceData) {
+ $invoice = new Facture($db);
+ $invoice->fetch($invoiceData->facid);
+
+ if(! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS) && $invoice->type == Facture::TYPE_DEPOSIT) continue;
+ $totalInvoiced += $invoice->total_ttc;
+ }
+ }
+
+ print ''.price($totalInvoiced)." \n";
+ if (! $i) $totalarray['nbfield']++;
+ if (! $i) $totalarray['totalinvoicedfield']=$totalarray['nbfield'];
+ $totalarray['totalinvoiced'] += $totalInvoiced;
+ }
$userstatic->id=$obj->fk_user_author;
$userstatic->login=$obj->login;
@@ -1015,6 +1081,14 @@ if ($resql)
print '';
if (! $i) $totalarray['nbfield']++;
}
+ // Date cloture
+ if (! empty($arrayfields['p.date_cloture']['checked']))
+ {
+ print '';
+ print dol_print_date($db->jdate($obj->date_cloture), 'dayhour', 'tzuser');
+ print ' ';
+ if (! $i) $totalarray['nbfield']++;
+ }
// Status
if (! empty($arrayfields['p.fk_statut']['checked']))
{
@@ -1059,6 +1133,8 @@ if ($resql)
elseif ($totalarray['totalhtfield'] == $i) print ''.price($totalarray['totalht']).' ';
elseif ($totalarray['totalvatfield'] == $i) print ''.price($totalarray['totalvat']).' ';
elseif ($totalarray['totalttcfield'] == $i) print ''.price($totalarray['totalttc']).' ';
+ elseif ($totalarray['totalhtinvoicedfield'] == $i) print ''.price($totalarray['totalhtinvoiced']).' ';
+ elseif ($totalarray['totalinvoicedfield'] == $i) print ''.price($totalarray['totalinvoiced']).' ';
elseif ($totalarray['totalizable']) {
$printed = false;
foreach ($totalarray['totalizable'] as $totalizable) {
diff --git a/htdocs/comm/propal/stats/index.php b/htdocs/comm/propal/stats/index.php
index aa47f1c226d..13b7b5fa2d2 100644
--- a/htdocs/comm/propal/stats/index.php
+++ b/htdocs/comm/propal/stats/index.php
@@ -110,7 +110,6 @@ $mesg = $px1->isGraphKo();
if (! $mesg)
{
$px1->SetData($data);
- $px1->SetPrecisionY(0);
$i=$startyear;$legend=array();
while ($i <= $endyear)
{
@@ -125,7 +124,6 @@ if (! $mesg)
$px1->SetYLabel($langs->trans("NbOfProposals"));
$px1->SetShading(3);
$px1->SetHorizTickIncrement(1);
- $px1->SetPrecisionY(0);
$px1->mode='depth';
$px1->SetTitle($langs->trans("NumberOfProposalsByMonth"));
@@ -152,7 +150,6 @@ $mesg = $px2->isGraphKo();
if (! $mesg)
{
$px2->SetData($data);
- $px2->SetPrecisionY(0);
$i=$startyear;$legend=array();
while ($i <= $endyear)
{
@@ -167,7 +164,6 @@ if (! $mesg)
$px2->SetYLabel($langs->trans("AmountOfProposals"));
$px2->SetShading(3);
$px2->SetHorizTickIncrement(1);
- $px2->SetPrecisionY(0);
$px2->mode='depth';
$px2->SetTitle($langs->trans("AmountOfProposalsByMonthHT"));
@@ -209,7 +205,6 @@ if (! $mesg)
$px3->SetHeight($HEIGHT);
$px3->SetShading(3);
$px3->SetHorizTickIncrement(1);
- $px3->SetPrecisionY(0);
$px3->mode='depth';
$px3->SetTitle($langs->trans("AmountAverage"));
diff --git a/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php b/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
index 1b78370048a..910772d87ca 100644
--- a/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
@@ -43,6 +43,8 @@ $linkedObjectBlock = $GLOBALS['linkedObjectBlock'];
// Load translation files required by the page
$langs->load("propal");
+$linkedObjectBlock = dol_sort_array($linkedObjectBlock, 'date', 'desc', 0, 0, 1);
+
$total=0; $ilink=0;
foreach($linkedObjectBlock as $key => $objectlink)
{
diff --git a/htdocs/comm/remx.php b/htdocs/comm/remx.php
index eabb217fb99..bd143b551ae 100644
--- a/htdocs/comm/remx.php
+++ b/htdocs/comm/remx.php
@@ -734,7 +734,7 @@ if ($socid > 0)
print load_fiche_titre($langs->trans("CustomerDiscounts"), '', '');
}
- // Remises liees a lignes de factures
+ // Discount linked to invoice lines
$sql = "SELECT rc.rowid, rc.amount_ht, rc.amount_tva, rc.amount_ttc, rc.tva_tx, rc.multicurrency_amount_ht, rc.multicurrency_amount_tva, rc.multicurrency_amount_ttc,";
$sql.= " rc.datec as dc, rc.description, rc.fk_facture_line, rc.fk_facture,";
$sql.= " rc.fk_facture_source,";
@@ -904,7 +904,7 @@ if ($socid > 0)
print load_fiche_titre($langs->trans("SupplierDiscounts"), '', '');
}
- // Remises liees a lignes de factures
+ // Discount linked to invoice lines
$sql = "SELECT rc.rowid, rc.amount_ht, rc.amount_tva, rc.amount_ttc, rc.tva_tx, rc.multicurrency_amount_ht, rc.multicurrency_amount_tva, rc.multicurrency_amount_ttc,";
$sql.= " rc.datec as dc, rc.description, rc.fk_invoice_supplier_line, rc.fk_invoice_supplier,";
$sql.= " rc.fk_invoice_supplier_source,";
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 8ceadce89e5..0f875b68f22 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -1519,11 +1519,11 @@ if ($action == 'create' && $user->rights->commande->creer)
if ($element == 'order' || $element == 'commande') {
$element = $subelement = 'commande';
}
- if ($element == 'propal') {
+ elseif ($element == 'propal') {
$element = 'comm/propal';
$subelement = 'propal';
}
- if ($element == 'contract') {
+ elseif ($element == 'contract') {
$element = $subelement = 'contrat';
}
@@ -1737,7 +1737,7 @@ if ($action == 'create' && $user->rights->commande->creer)
if (!empty($conf->incoterm->enabled))
{
print '';
- print ''.$form->textwithpicto($langs->trans("IncotermLabel"), $objectsrc->libelle_incoterms, 1).' '.$form->textwithpicto($langs->trans("IncotermLabel"), $objectsrc->label_incoterms, 1).' ';
$incoterm_id = GETPOST('incoterm_id');
$incoterm_location = GETPOST('location_incoterms');
@@ -2116,7 +2116,7 @@ if ($action == 'create' && $user->rights->commande->creer)
print '';
print '
';
- print '
';
+ print '';
if ($soc->outstanding_limit)
{
@@ -2361,7 +2361,7 @@ if ($action == 'create' && $user->rights->commande->creer)
print '';
if ($action != 'editincoterm')
{
- print $form->textwithpicto($object->display_incoterms(), $object->libelle_incoterms, 1);
+ print $form->textwithpicto($object->display_incoterms(), $object->label_incoterms, 1);
}
else
{
@@ -2454,7 +2454,7 @@ if ($action == 'create' && $user->rights->commande->creer)
print '';
print '';
- print '';
+ print ''; // Close fichecenter
print '
';
print '';
diff --git a/htdocs/commande/index.php b/htdocs/commande/index.php
index c0091b43af0..a0e87bf63a3 100644
--- a/htdocs/commande/index.php
+++ b/htdocs/commande/index.php
@@ -2,6 +2,7 @@
/* Copyright (C) 2003-2004 Rodolphe Quiedeville
* Copyright (C) 2004-2011 Laurent Destailleur
* Copyright (C) 2005-2012 Regis Houssin
+ * Copyright (C) 2019 Nicolas ZABOURI
*
* 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,6 +32,11 @@ require_once DOL_DOCUMENT_ROOT .'/commande/class/commande.class.php';
if (!$user->rights->commande->lire) accessforbidden();
+$hookmanager = new HookManager($db);
+
+// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array
+$hookmanager->initHooks(array('ordersindex'));
+
// Load translation files required by the page
$langs->loadLangs(array('orders', 'bills'));
@@ -478,6 +484,8 @@ if (! empty($conf->commande->enabled))
print '';
+$parameters = array('user' => $user);
+$reshook = $hookmanager->executeHooks('dashboardOrders', $parameters, $object); // Note that $action and $object may have been modified by hook
// End of page
llxFooter();
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index f64aadf0e53..a25d863176e 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -143,6 +143,7 @@ $arrayfields=array(
'c.total_ttc'=>array('label'=>"AmountTTC", 'checked'=>0),
'c.datec'=>array('label'=>"DateCreation", 'checked'=>0, 'position'=>500),
'c.tms'=>array('label'=>"DateModificationShort", 'checked'=>0, 'position'=>500),
+ 'c.date_cloture'=>array('label'=>"DateClosing", 'checked'=>0, 'position'=>500),
'c.fk_statut'=>array('label'=>"Status", 'checked'=>1, 'position'=>1000),
'c.facture'=>array('label'=>"Billed", 'checked'=>1, 'position'=>1000, 'enabled'=>(empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT)))
);
@@ -247,7 +248,7 @@ $sql.= " typent.code as typent_code,";
$sql.= " state.code_departement as state_code, state.nom as state_name,";
$sql.= ' c.rowid, c.ref, c.total_ht, c.tva as total_tva, c.total_ttc, c.ref_client,';
$sql.= ' c.date_valid, c.date_commande, c.note_private, c.date_livraison as date_delivery, c.fk_statut, c.facture as billed,';
-$sql.= ' c.date_creation as date_creation, c.tms as date_update,';
+$sql.= ' c.date_creation as date_creation, c.tms as date_update, c.date_cloture as date_cloture,';
$sql.= " p.rowid as project_id, p.ref as project_ref, p.title as project_label";
if ($search_categ_cus) $sql .= ", cc.fk_categorie, cc.fk_soc";
// Add fields from extrafields
@@ -693,6 +694,12 @@ if ($resql)
print '';
print ' ';
}
+ // Date cloture
+ if (! empty($arrayfields['c.date_cloture']['checked']))
+ {
+ print '';
+ print ' ';
+ }
// Status
if (! empty($arrayfields['c.fk_statut']['checked']))
{
@@ -748,7 +755,8 @@ if ($resql)
print $hookmanager->resPrint;
if (! empty($arrayfields['c.datec']['checked'])) print_liste_field_titre($arrayfields['c.datec']['label'], $_SERVER["PHP_SELF"], "c.date_creation", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
if (! empty($arrayfields['c.tms']['checked'])) print_liste_field_titre($arrayfields['c.tms']['label'], $_SERVER["PHP_SELF"], "c.tms", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
- if (! empty($arrayfields['c.fk_statut']['checked'])) print_liste_field_titre($arrayfields['c.fk_statut']['label'], $_SERVER["PHP_SELF"], "c.fk_statut", "", $param, '', $sortfield, $sortorder, 'right ');
+ if (! empty($arrayfields['c.date_cloture']['checked'])) print_liste_field_titre($arrayfields['c.date_cloture']['label'], $_SERVER["PHP_SELF"], "c.date_cloture", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+ if (! empty($arrayfields['c.fk_statut']['checked'])) print_liste_field_titre($arrayfields['c.fk_statut']['label'], $_SERVER["PHP_SELF"], "c.fk_statut", "", $param, '', $sortfield, $sortorder, 'right ');
if (! empty($arrayfields['c.facture']['checked'])) print_liste_field_titre($arrayfields['c.facture']['label'], $_SERVER["PHP_SELF"], 'c.facture', '', $param, '', $sortfield, $sortorder, 'center ');
print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder, 'maxwidthsearch center ');
print ' '."\n";
@@ -1092,6 +1100,14 @@ if ($resql)
print '';
if (! $i) $totalarray['nbfield']++;
}
+ // Date cloture
+ if (! empty($arrayfields['c.date_cloture']['checked']))
+ {
+ print '';
+ print dol_print_date($db->jdate($obj->date_cloture), 'dayhour', 'tzuser');
+ print ' ';
+ if (! $i) $totalarray['nbfield']++;
+ }
// Status
if (! empty($arrayfields['c.fk_statut']['checked']))
{
diff --git a/htdocs/commande/orderstoinvoice.php b/htdocs/commande/orderstoinvoice.php
index 0d0b202a8c3..33acc2b4969 100644
--- a/htdocs/commande/orderstoinvoice.php
+++ b/htdocs/commande/orderstoinvoice.php
@@ -615,7 +615,7 @@ if (($action != 'create' && $action != 'add') || ($action == 'create' && $error)
print_liste_field_titre('GenerateBill', '', '', '', '', 'align="center"');
print '';
- // Lignes des champs de filtre
+ // Fields title search
print '';
+$parameters = array('user' => $user);
+$reshook = $hookmanager->executeHooks('dashboardSpecialBills', $parameters, $object); // Note that $action and $object may have been modified by hook
+
// End of page
llxFooter();
$db->close();
diff --git a/htdocs/compta/clients.php b/htdocs/compta/clients.php
index 36cc40c851c..58631937955 100644
--- a/htdocs/compta/clients.php
+++ b/htdocs/compta/clients.php
@@ -151,7 +151,7 @@ if ($resql)
print_liste_field_titre("DateCreation", $_SERVER["PHP_SELF"], "datec", $addu, "", '', $sortfield, $sortorder, 'right ');
print "\n";
- // Lignes des champs de filtre
+ // Fields title search
print '';
print '';
diff --git a/htdocs/compta/compta-files.php b/htdocs/compta/compta-files.php
deleted file mode 100644
index 87efafd3405..00000000000
--- a/htdocs/compta/compta-files.php
+++ /dev/null
@@ -1,454 +0,0 @@
-
- * Copyright (C) 2004-2018 Laurent Destailleur
- * Copyright (C) 2017 Pierre-Henry Favre
- *
- * 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
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see '; // You can use div-table-responsive-no-min if you dont need reserved height for your table
- print '
';
- print '';
- print_liste_field_titre($arrayfields['date']['label'], $_SERVER["PHP_SELF"], "date", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
- print ''.$langs->trans("Type").' ';
- print ''.$langs->trans("Ref").' ';
- print ''.$langs->trans("Link").' ';
- print ''.$langs->trans("Paid").' ';
- print ''.$langs->trans("Debit").' ';
- print ''.$langs->trans("Credit").' ';
- print ''.$langs->trans("Balance").' ';
- print ' ';
- if ($result)
- {
- $TData = dol_sort_array($filesarray, 'date', 'ASC');
-
- if (empty($TData))
- {
- print ''.$langs->trans("NoItem").' ';
- print "";
- print dol_print_date($data['date'], 'day');
- print " \n";
- print ''.$langs->trans($data['item']).' ';
- print ''.$data['ref'].' ';
-
- // File link
- print '".$data['name']." '.$data['paid'].' ';
- print ''.(($data['amount'] > 0) ? price(abs($data['amount'])) : '')." \n";
- $totalDebit += ($data['amount'] > 0) ? abs($data['amount']) : 0;
- print ''.(($data['amount'] > 0) ? '' : price(abs($data['amount'])))." \n";
- $totalCredit += ($data['amount'] > 0) ? 0 : abs($data['amount']);
- // Balance
- print ''.price($data['balance'])." \n";
- print " \n";
- }
-
- print '';
- print ' ';
- print ''.price($totalDebit).' ';
- print ''.price($totalCredit).' ';
- print ''.price(price2num($totalDebit - $totalCredit, 'MT')).' ';
- print " \n";
- }
- }
- print "
";
- print '
';
+ if (! empty($conf->global->INVOICE_USE_SITUATION))
+ {
+ if($conf->global->INVOICE_USE_SITUATION_RETAINED_WARRANTY){
+
+ $rwStyle = 'display:none;';
+ if(GETPOST('type', 'int') == Facture::TYPE_SITUATION){
+ $rwStyle = '';
+ }
+
+
+ $retained_warranty = GETPOST('retained_warranty', 'int');
+ $retained_warranty = !empty($retained_warranty)?$retained_warranty:$conf->global->INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_PERCENT;
+ print '' . $langs->trans('RetainedWarranty') . ' ';
+ print ' ' . $langs->trans('PaymentConditionsShortRetainedWarranty') . ' ';
+ $retained_warranty_fk_cond_reglement = GETPOST('retained_warranty_fk_cond_reglement', 'int');
+ $retained_warranty_fk_cond_reglement = !empty($retained_warranty_fk_cond_reglement)? $retained_warranty_fk_cond_reglement : $conf->global->INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_COND_ID;
+ $form->select_conditions_paiements($retained_warranty_fk_cond_reglement, 'retained_warranty_fk_cond_reglement', -1, 1);
+ print ' ' . $langs->trans('PaymentMode') . ' ';
$form->select_types_paiements(isset($_POST['mode_reglement_id']) ? $_POST['mode_reglement_id'] : $mode_reglement_id, 'mode_reglement_id', 'CRDT');
@@ -3172,7 +3255,7 @@ if ($action == 'create')
if (!empty($conf->incoterm->enabled))
{
print ' ';
- print ''.$form->textwithpicto($langs->trans("IncotermLabel"), $objectsrc->libelle_incoterms, 1).' '.$form->textwithpicto($langs->trans("IncotermLabel"), $objectsrc->label_incoterms, 1).' ';
$incoterm_id = GETPOST('incoterm_id');
$incoterm_location = GETPOST('location_incoterms');
@@ -3444,6 +3527,7 @@ elseif ($id > 0 || ! empty($ref))
elseif($object->type == Facture::TYPE_CREDIT_NOTE) $type_fac = 'CreditNote';
elseif($object->type == Facture::TYPE_DEPOSIT) $type_fac = 'Deposit';
$text = $langs->trans('ConfirmConvertToReduc', strtolower($langs->transnoentities($type_fac)));
+ $text.=' ';
if ($action != 'editincoterm')
{
- print $form->textwithpicto($object->display_incoterms(), $object->libelle_incoterms, 1);
+ print $form->textwithpicto($object->display_incoterms(), $object->label_incoterms, 1);
}
else
{
@@ -4016,6 +4100,126 @@ elseif ($id > 0 || ! empty($ref))
print ' ';
}
+ $displayWarranty = false;
+ if( ( $object->type == Facture::TYPE_SITUATION && (!empty($object->retained_warranty) || !empty($conf->global->INVOICE_USE_SITUATION_RETAINED_WARRANTY)) ) )
+ {
+ // Check if this situation invoice is 100% for real
+ if(!empty($object->situation_final) && !empty($object->lines)){
+ $displayWarranty = true;
+ foreach($object->lines as $i => $line){
+ if($line->product_type < 2 && $line->situation_percent < 100){
+ $displayWarranty = false;
+ break;
+ }
+ }
+ }
+
+
+
+ // Retained Warranty
+ print '';
+ print '';
+ print ' ';
+ if ($action == 'editretainedwarranty')
+ {
+ print '';
+ }
+ else
+ {
+ print price($object->retained_warranty).'%';
+ }
+ print ' ';
+ print '';
+ print ' ';
+ $defaultDate = !empty($object->retained_warranty_date_limit)?$object->retained_warranty_date_limit:strtotime('-1 years', $object->date_lim_reglement);
+ if($object->date > $defaultDate){
+ $defaultDate = $object->date;
+ }
+
+ if ($action == 'editretainedwarrantypaymentterms')
+ {
+ //date('Y-m-d',$object->date_lim_reglement)
+ print '';
+ }
+ else
+ {
+ print $form->form_conditions_reglement($_SERVER['PHP_SELF'] . '?facid=' . $object->id, $object->retained_warranty_fk_cond_reglement, 'none');
+ if(!$displayWarranty){
+ print img_picto($langs->trans('RetainedWarrantyNeed100Percent'), 'warning.png', 'class="pictowarning valignmiddle" ');
+ }
+ }
+ print ' ';
+ print '';
+ print ' ';
+ $defaultDate = !empty($object->retained_warranty_date_limit)?$object->retained_warranty_date_limit:strtotime('-1 years', $object->date_lim_reglement);
+ if($object->date > $defaultDate){
+ $defaultDate = $object->date;
+ }
+
+ if ($action == 'editretainedwarrantydatelimit')
+ {
+ //date('Y-m-d',$object->date_lim_reglement)
+ print '';
+ }
+ else
+ {
+ print dol_print_date($object->retained_warranty_date_limit, 'day');
+ }
+ print ' ' . price($resteapayeraffiche) . ' ';
print ' ';
+
+ // Retained warranty : usualy use on construction industry
+ if(!empty($object->situation_final) && !empty($object->retained_warranty) && $displayWarranty){
+
+ // Billed - retained warranty
+ if($object->type == Facture::TYPE_SITUATION)
+ {
+ $retainedWarranty = $total_global_ttc * $object->retained_warranty / 100;
+ }
+ else
+ {
+ // Because one day retained warranty could be used on standard invoices
+ $retainedWarranty = $object->total_ttc * $object->retained_warranty / 100;
+ }
+
+ $billedWithRetainedWarranty = $object->total_ttc - $retainedWarranty ;
+
+ print '' . $langs->trans("ToPayOn", dol_print_date($object->date_lim_reglement, 'day')) . ' : ' . price($billedWithRetainedWarranty) . ' ';
+ print $langs->trans("RetainedWarranty") . ' ('.$object->retained_warranty.'%)';
+ print !empty($object->retained_warranty_date_limit)?' '.$langs->trans("ToPayOn", dol_print_date($object->retained_warranty_date_limit, 'day')):'';
+ print ' : ' . price($retainedWarranty) . ' ';
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index d12fc90fd77..eca39ade98c 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -182,6 +182,12 @@ $arrayfields=array(
'f.tms'=>array('label'=>"DateModificationShort", 'checked'=>0, 'position'=>500),
'f.fk_statut'=>array('label'=>"Status", 'checked'=>1, 'position'=>1000),
);
+
+if($conf->global->INVOICE_USE_SITUATION && $conf->global->INVOICE_USE_SITUATION_RETAINED_WARRANTY)
+{
+ $arrayfields['f.retained_warranty'] = array('label'=>$langs->trans("RetainedWarranty"), 'checked'=>0);
+}
+
// Extra fields
if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
{
@@ -373,6 +379,10 @@ $sql.= ' f.localtax1 as total_localtax1, f.localtax2 as total_localtax2,';
$sql.= ' f.datef as df, f.date_lim_reglement as datelimite,';
$sql.= ' f.paye as paye, f.fk_statut,';
$sql.= ' f.datec as date_creation, f.tms as date_update,';
+if($conf->global->INVOICE_USE_SITUATION && $conf->global->INVOICE_USE_SITUATION_RETAINED_WARRANTY)
+{
+ $sql.= ' f.retained_warranty, f.retained_warranty_date_limit, f.situation_final,f.situation_cycle_ref,f.situation_counter,';
+}
$sql.= ' s.rowid as socid, s.nom as name, s.email, s.town, s.zip, s.fk_pays, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta as code_compta_client, s.code_compta_fournisseur,';
$sql.= " typent.code as typent_code,";
$sql.= " state.code_departement as state_code, state.nom as state_name,";
@@ -834,6 +844,13 @@ if ($resql)
print '';
+ print ' ';
+ }
+
if (! empty($arrayfields['dynamount_payed']['checked']))
{
print '';
@@ -899,6 +916,7 @@ if ($resql)
if (! empty($arrayfields['f.total_localtax1']['checked'])) print_liste_field_titre($arrayfields['f.total_localtax1']['label'], $_SERVER['PHP_SELF'], 'f.localtax1', '', $param, 'class="right"', $sortfield, $sortorder);
if (! empty($arrayfields['f.total_localtax2']['checked'])) print_liste_field_titre($arrayfields['f.total_localtax2']['label'], $_SERVER['PHP_SELF'], 'f.localtax2', '', $param, 'class="right"', $sortfield, $sortorder);
if (! empty($arrayfields['f.total_ttc']['checked'])) print_liste_field_titre($arrayfields['f.total_ttc']['label'], $_SERVER['PHP_SELF'], 'f.total_ttc', '', $param, 'class="right"', $sortfield, $sortorder);
+ if (! empty($arrayfields['f.retained_warranty']['checked'])) print_liste_field_titre($arrayfields['f.retained_warranty']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'align="right"', $sortfield, $sortorder);
if (! empty($arrayfields['dynamount_payed']['checked'])) print_liste_field_titre($arrayfields['dynamount_payed']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'class="right"', $sortfield, $sortorder);
if (! empty($arrayfields['rtp']['checked'])) print_liste_field_titre($arrayfields['rtp']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'class="right"', $sortfield, $sortorder);
// Extra fields
@@ -939,7 +957,15 @@ if ($resql)
$facturestatic->date_lim_reglement=$db->jdate($obj->datelimite);
$facturestatic->note_public=$obj->note_public;
$facturestatic->note_private=$obj->note_private;
-
+ if($conf->global->INVOICE_USE_SITUATION && $conf->global->INVOICE_USE_SITUATION_RETAINED_WARRANTY)
+ {
+ $facturestatic->retained_warranty=$obj->retained_warranty;
+ $facturestatic->retained_warranty_date_limit=$obj->retained_warranty_date_limit;
+ $facturestatic->situation_final=$obj->retained_warranty_date_limit;
+ $facturestatic->situation_final=$obj->retained_warranty_date_limit;
+ $facturestatic->situation_cycle_ref=$obj->situation_cycle_ref;
+ $facturestatic->situation_counter=$obj->situation_counter;
+ }
$thirdpartystatic->id=$obj->socid;
$thirdpartystatic->name=$obj->name;
$thirdpartystatic->client=$obj->client;
@@ -959,11 +985,11 @@ if ($resql)
$totalcreditnotes = $facturestatic->getSumCreditNotesUsed();
$totaldeposits = $facturestatic->getSumDepositsUsed();
$totalpay = $paiement + $totalcreditnotes + $totaldeposits;
- $remaintopay = $facturestatic->total_ttc - $totalpay;
+ $remaintopay = price2num($facturestatic->total_ttc - $totalpay);
if ($facturestatic->type == Facture::TYPE_CREDIT_NOTE && $obj->paye == 1) {
$remaincreditnote = $discount->getAvailableDiscounts($obj->fk_soc, '', 'rc.fk_facture_source='.$facturestatic->id);
$remaintopay = -$remaincreditnote;
- $totalpay = $facturestatic->total_ttc - $remaintopay;
+ $totalpay = price2num($facturestatic->total_ttc - $remaintopay);
}
print ' ';
+ print '';
print $obj->town;
print ' ';
if (! $i) $totalarray['nbfield']++;
@@ -1083,7 +1109,7 @@ if ($resql)
// Zip
if (! empty($arrayfields['s.zip']['checked']))
{
- print '';
+ print ' ';
print $obj->zip;
print ' ';
if (! $i) $totalarray['nbfield']++;
@@ -1143,7 +1169,7 @@ if ($resql)
// Amount HT
if (! empty($arrayfields['f.total_ht']['checked']))
{
- print ''.price($obj->total_ht)." \n";
+ print ''.price($obj->total_ht)." \n";
if (! $i) $totalarray['nbfield']++;
if (! $i) $totalarray['totalhtfield']=$totalarray['nbfield'];
$totalarray['totalht'] += $obj->total_ht;
@@ -1151,7 +1177,7 @@ if ($resql)
// Amount VAT
if (! empty($arrayfields['f.total_vat']['checked']))
{
- print ''.price($obj->total_vat)." \n";
+ print ''.price($obj->total_vat)." \n";
if (! $i) $totalarray['nbfield']++;
if (! $i) $totalarray['totalvatfield']=$totalarray['nbfield'];
$totalarray['totalvat'] += $obj->total_vat;
@@ -1159,7 +1185,7 @@ if ($resql)
// Amount LocalTax1
if (! empty($arrayfields['f.total_localtax1']['checked']))
{
- print ''.price($obj->total_localtax1)." \n";
+ print ''.price($obj->total_localtax1)." \n";
if (! $i) $totalarray['nbfield']++;
if (! $i) $totalarray['totallocaltax1field']=$totalarray['nbfield'];
$totalarray['totallocaltax1'] += $obj->total_localtax1;
@@ -1167,7 +1193,7 @@ if ($resql)
// Amount LocalTax2
if (! empty($arrayfields['f.total_localtax2']['checked']))
{
- print ''.price($obj->total_localtax2)." \n";
+ print ''.price($obj->total_localtax2)." \n";
if (! $i) $totalarray['nbfield']++;
if (! $i) $totalarray['totallocaltax2field']=$totalarray['nbfield'];
$totalarray['totallocaltax2'] += $obj->total_localtax2;
@@ -1175,15 +1201,20 @@ if ($resql)
// Amount TTC
if (! empty($arrayfields['f.total_ttc']['checked']))
{
- print ''.price($obj->total_ttc)." \n";
+ print ''.price($obj->total_ttc)." \n";
if (! $i) $totalarray['nbfield']++;
if (! $i) $totalarray['totalttcfield']=$totalarray['nbfield'];
$totalarray['totalttc'] += $obj->total_ttc;
}
+ if(! empty($arrayfields['f.retained_warranty']['checked']))
+ {
+ print ''.(! empty($obj->retained_warranty)?price($obj->retained_warranty).'%':' ').' ';
+ }
+
if (! empty($arrayfields['dynamount_payed']['checked']))
{
- print ''.(! empty($totalpay)?price($totalpay, 0, $langs):' ').' '; // TODO Use a denormalized field
+ print ''.(! empty($totalpay)?price($totalpay, 0, $langs):' ').' '; // TODO Use a denormalized field
if (! $i) $totalarray['nbfield']++;
if (! $i) $totalarray['totalamfield']=$totalarray['nbfield'];
$totalarray['totalam'] += $totalpay;
@@ -1191,7 +1222,7 @@ if ($resql)
if (! empty($arrayfields['rtp']['checked']))
{
- print ''.(! empty($remaintopay)?price($remaintopay, 0, $langs):' ').' '; // TODO Use a denormalized field
+ print ''.(! empty($remaintopay)?price($remaintopay, 0, $langs):' ').' '; // TODO Use a denormalized field
if (! $i) $totalarray['nbfield']++;
if (! $i) $totalarray['totalrtpfield']=$totalarray['nbfield'];
$totalarray['totalrtp'] += $remaintopay;
@@ -1298,6 +1329,7 @@ if ($resql)
$filedir=$diroutputmassaction;
$genallowed=$user->rights->facture->lire;
$delallowed=$user->rights->facture->creer;
+ $title = '';
print $formfile->showdocuments('massfilesarea_invoices', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
}
diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php
index ccc3b305447..db022259e35 100644
--- a/htdocs/compta/facture/prelevement.php
+++ b/htdocs/compta/facture/prelevement.php
@@ -62,42 +62,52 @@ if ($id > 0 || ! empty($ref))
}
}
+$hookmanager->initHooks(array('directdebitcard','globalcard'));
+
+
/*
* Actions
*/
-if ($action == "new")
+$parameters = array('socid' => $socid);
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+if (empty($reshook))
{
- if ($object->id > 0)
+ if ($action == "new")
{
- $db->begin();
-
- $result = $object->demande_prelevement($user, GETPOST('withdraw_request_amount'));
- if ($result > 0)
+ if ($object->id > 0)
{
- $db->commit();
+ $db->begin();
- setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
- }
- else
- {
- $db->rollback();
- setEventMessages($object->error, $object->errors, 'errors');
+ $result = $object->demande_prelevement($user, GETPOST('withdraw_request_amount'));
+ if ($result > 0)
+ {
+ $db->commit();
+
+ setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
+ }
+ else
+ {
+ $db->rollback();
+ setEventMessages($object->error, $object->errors, 'errors');
+ }
}
+ $action='';
}
- $action='';
-}
-if ($action == "delete")
-{
- if ($object->id > 0)
+ if ($action == "delete")
{
- $result = $object->demande_prelevement_delete($user, GETPOST('did'));
- if ($result == 0)
+ if ($object->id > 0)
{
- header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
- exit;
+ $result = $object->demande_prelevement_delete($user, GETPOST('did'));
+ if ($result == 0)
+ {
+ header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+ exit;
+ }
}
}
}
diff --git a/htdocs/compta/facture/stats/index.php b/htdocs/compta/facture/stats/index.php
index 5d8fee98676..99abd48cb49 100644
--- a/htdocs/compta/facture/stats/index.php
+++ b/htdocs/compta/facture/stats/index.php
@@ -103,7 +103,6 @@ $mesg = $px1->isGraphKo();
if (! $mesg)
{
$px1->SetData($data);
- $px1->SetPrecisionY(0);
$i=$startyear;$legend=array();
while ($i <= $endyear)
{
@@ -117,7 +116,6 @@ if (! $mesg)
$px1->SetYLabel($langs->trans("NumberOfBills"));
$px1->SetShading(3);
$px1->SetHorizTickIncrement(1);
- $px1->SetPrecisionY(0);
$px1->mode='depth';
$px1->SetTitle($langs->trans("NumberOfBillsByMonth"));
@@ -152,7 +150,6 @@ if (! $mesg)
$px2->SetYLabel($langs->trans("AmountOfBills"));
$px2->SetShading(3);
$px2->SetHorizTickIncrement(1);
- $px2->SetPrecisionY(0);
$px2->mode='depth';
$px2->SetTitle($langs->trans("AmountOfBillsByMonthHT"));
@@ -194,7 +191,6 @@ if (! $mesg)
$px3->SetHeight($HEIGHT);
$px3->SetShading(3);
$px3->SetHorizTickIncrement(1);
- $px3->SetPrecisionY(0);
$px3->mode='depth';
$px3->SetTitle($langs->trans("AmountAverage"));
diff --git a/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php b/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
index 97f0b876abc..bef705a21ab 100644
--- a/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
@@ -38,6 +38,8 @@ $linkedObjectBlock = $GLOBALS['linkedObjectBlock'];
$langs->load("bills");
+$linkedObjectBlock = dol_sort_array($linkedObjectBlock, 'date', 'desc', 0, 0, 1);
+
$total=0; $ilink=0;
foreach($linkedObjectBlock as $key => $objectlink)
{
diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php
index ae84340333e..e2c0180dc3b 100644
--- a/htdocs/compta/index.php
+++ b/htdocs/compta/index.php
@@ -2,10 +2,11 @@
/* Copyright (C) 2001-2005 Rodolphe Quiedeville
* Copyright (C) 2004-2013 Laurent Destailleur
* Copyright (C) 2005-2015 Regis Houssin
- * Copyright (C) 2015-2016 Juanjo Menent
+ * Copyright (C) 2015-2016 Juanjo Menent
* Copyright (C) 2015 Jean-François Ferry
* Copyright (C) 2015 Raphaël Doursenaud
* Copyright (C) 2016 Marcos García
+ * Copyright (C) 2019 Nicolas ZABOURI
*
* 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
@@ -63,6 +64,7 @@ if ($user->societe_id > 0)
$max=3;
+// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array
$hookmanager->initHooks(array('invoiceindex'));
/*
@@ -351,6 +353,7 @@ if (! empty($conf->facture->enabled) && $user->rights->facture->lire)
$num = $db->num_rows($resql);
$i = 0;
+ print '';
print '
';
print ''.$langs->trans("BoxTitleLastCustomerBills", $max).' ';
if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print ''.$langs->trans("AmountHT").' ';
@@ -409,8 +412,8 @@ if (! empty($conf->facture->enabled) && $user->rights->facture->lire)
print '';
print $thirdpartystatic->getNomUrl(1, 'customer', 44);
print ' ';
- if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print ''.price($obj->total_ht).' ';
- print ''.price($obj->total_ttc).' ';
+ if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print ''.price($obj->total_ht).' ';
+ print ''.price($obj->total_ttc).' ';
print ''.dol_print_date($db->jdate($obj->tms), 'day').' ';
print ''.$facstatic->LibStatut($obj->paye, $obj->fk_statut, 3, $obj->am).' ';
print ''.$langs->trans("NoInvoice").'
';
+ print '
';
print '
';
print ''.$langs->trans("BoxTitleLastSupplierBills", $max).' ';
if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print ''.$langs->trans("AmountHT").' ';
@@ -508,7 +512,7 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture-
print $thirdpartystatic->getNomUrl(1, 'supplier', 44);
print '';
if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print ''.price($obj->total_ht).' ';
- print ''.price($obj->total_ttc).' ';
+ print ''.price($obj->total_ttc).' ';
print ''.dol_print_date($db->jdate($obj->tms), 'day').' ';
print ''.$facstatic->LibStatut($obj->paye, $obj->fk_statut, 3).' ';
print ''.$langs->trans("NoInvoice").'
';
+ print '
';
print '
';
print '';
print ''.$langs->trans("BoxTitleLastModifiedDonations", $max).' ';
@@ -588,7 +593,7 @@ if (! empty($conf->don->enabled) && $user->rights->societe->lire)
print ' ';
print ''.$donationstatic->getNomUrl(1).' ';
print ''.$label.' ';
- print ''.price($objp->amount).' ';
+ print ''.price($objp->amount).' ';
print ''.dol_print_date($db->jdate($objp->dm), 'day').' ';
print ''.$donationstatic->LibStatut($objp->fk_statut, 3).' ';
print ' ';
@@ -600,7 +605,7 @@ if (! empty($conf->don->enabled) && $user->rights->societe->lire)
{
print ''.$langs->trans("None").'
';
+ print '
';
print '
';
print '';
print ''.$langs->trans("ContributionsToPay").($num?' '.$num.' ';
@@ -658,8 +664,8 @@ if (! empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
print ' ';
print ''.$chargestatic->getNomUrl(1).' ';
print ''.dol_print_date($db->jdate($obj->date_ech), 'day').' ';
- print ''.price($obj->amount).' ';
- print ''.price($obj->sumpaid).' ';
+ print ''.price($obj->amount).' ';
+ print ''.price($obj->sumpaid).' ';
print ''.$chargestatic->getLibStatut(3).' ';
print ' ';
$tot_ttc+=$obj->amount;
@@ -667,7 +673,7 @@ if (! empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
}
print ''.$langs->trans("Total").' ';
- print ''.price($tot_ttc).' ';
+ print ''.price($tot_ttc).' ';
print ' ';
print ''.$langs->trans("None").'
";
+ print "
';
print '
';
print "";
print ''.$langs->trans("OrdersDeliveredToBill").' '.$num.' ';
@@ -778,8 +786,8 @@ if (! empty($conf->facture->enabled) && ! empty($conf->commande->enabled) && $us
print $societestatic->getNomUrl(1, 'customer', 44);
print '';
if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print ''.price($obj->total_ht).' ';
- print ''.price($obj->total_ttc).' ';
- print ''.price($obj->total_ttc-$obj->tot_fttc).' ';
+ print ''.price($obj->total_ttc).' ';
+ print ''.price($obj->total_ttc-$obj->tot_fttc).' ';
print ''.$commandestatic->LibStatut($obj->fk_statut, $obj->facture, 3).' ';
print ' ';
$tot_ht += $obj->total_ht;
@@ -791,11 +799,11 @@ if (! empty($conf->facture->enabled) && ! empty($conf->commande->enabled) && $us
print ''.$langs->trans("Total").' ('.$langs->trans("RemainderToBill").': '.price($tot_tobill).') ';
if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print ''.price($tot_ht).' ';
- print ''.price($tot_ttc).' ';
- print ''.price($tot_tobill).' ';
+ print ''.price($tot_ttc).' ';
+ print ''.price($tot_tobill).' ';
print ' ';
print '
';
+ print '
'.dol_print_date($db->jdate($obj->datelimite), 'day').' ';
if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print ''.price($obj->total_ht).' ';
- print ''.price($obj->total_ttc).' ';
- print ''.price($obj->am).' ';
+ print ''.price($obj->total_ttc).' ';
+ print ''.price($obj->am).' ';
print ''.$facstatic->LibStatut($obj->paye, $obj->fk_statut, 3, $obj->am).' ';
print ' ';
@@ -918,8 +926,8 @@ if (! empty($conf->facture->enabled) && $user->rights->facture->lire)
print ''.$langs->trans("Total").' ('.$langs->trans("RemainderToTake").': '.price($total_ttc-$totalam).') ';
print ' ';
if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print ''.price($total).' ';
- print ''.price($total_ttc).' ';
- print ''.price($totalam).' ';
+ print ''.price($total_ttc).' ';
+ print ''.price($totalam).' ';
print ' ';
print ''.$societestatic->getNomUrl(1, 'supplier', 44).' ';
print ''.dol_print_date($db->jdate($obj->date_lim_reglement), 'day').' ';
if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print ''.price($obj->total_ht).' ';
- print ''.price($obj->total_ttc).' ';
- print ''.price($obj->am).' ';
+ print ''.price($obj->total_ttc).' ';
+ print ''.price($obj->am).' ';
print ''.$facstatic->LibStatut($obj->paye, $obj->fk_statut, 3).' ';
print '';
$total += $obj->total_ht;
@@ -1028,8 +1036,8 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture-
print ''.$langs->trans("Total").' ('.$langs->trans("RemainderToPay").': '.price($total_ttc-$totalam).') ';
print ' ';
if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print ''.price($total).' ';
- print ''.price($total_ttc).' ';
- print ''.price($totalam).' ';
+ print ''.price($total_ttc).' ';
+ print ''.price($totalam).' ';
print ' ';
print '';
print '
';
print ''.$langs->trans("TasksToDo").'';
print "
";
+ print "
'."\n";
print '';
- print ''.$langs->trans("DateChequeReceived").' '."\n";
- print ''.$langs->trans("ChequeNumber")." \n";
- print ''.$langs->trans("CheckTransmitter")." \n";
- print ''.$langs->trans("Bank")." \n";
- print ''.$langs->trans("Amount")." \n";
- print ''.$langs->trans("Payment")." \n";
- print ''.$langs->trans("LineRecord")." \n";
- print ''.$langs->trans("Select")." '.$langs->trans("DateChequeReceived").' '."\n";
+ print ''.$langs->trans("ChequeNumber")." \n";
+ print ''.$langs->trans("CheckTransmitter")." \n";
+ print ''.$langs->trans("Bank")." \n";
+ print ''.$langs->trans("Amount")." \n";
+ print ''.$langs->trans("Payment")." \n";
+ print ''.$langs->trans("LineRecord")." \n";
+ print ''.$langs->trans("Select")."'.$langs->trans("All").' / '.$langs->trans("None").' ';
print ' ';
print " \n";
diff --git a/htdocs/compta/paiement/cheque/class/remisecheque.class.php b/htdocs/compta/paiement/cheque/class/remisecheque.class.php
index d9a912ea50b..26e3f2792d6 100644
--- a/htdocs/compta/paiement/cheque/class/remisecheque.class.php
+++ b/htdocs/compta/paiement/cheque/class/remisecheque.class.php
@@ -489,7 +489,7 @@ class RemiseCheque extends CommonObject
else
{
$langs->load("errors");
- print $langs->trans("Error")." ".$langs->trans("ErrorModuleSetupNotComplete");
+ print $langs->trans("Error")." ".$langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("Bank"));
return "";
}
}
diff --git a/htdocs/compta/paiement/cheque/list.php b/htdocs/compta/paiement/cheque/list.php
index 11de8aa48a2..64ae1dea1f2 100644
--- a/htdocs/compta/paiement/cheque/list.php
+++ b/htdocs/compta/paiement/cheque/list.php
@@ -157,7 +157,7 @@ if ($resql)
print '';
print '
'."\n";
- // Lignes des champs de filtre
+ // Fields title search
print '';
print '';
print ' ";
print $ligne->LibStatut($obj->statut, 2);
print " ";
- print '';
+ print ' ';
print sprintf("%06s", $obj->rowid);
print ' ';
diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index b462095278d..a60330270d4 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -1133,32 +1133,56 @@ class BonPrelevement extends CommonObject
/**
- * Get object and lines from database
+ * Get object and lines from database
*
* @param User $user Object user that delete
- * @return int >0 if OK, <0 if KO
+ * @param int $notrigger 1=Does not execute triggers, 0= execute triggers
+ * @return int >0 if OK, <0 if KO
*/
- public function delete($user = null)
+ public function delete($user = null, $notrigger = 0)
{
$this->db->begin();
- $sql = "DELETE FROM ".MAIN_DB_PREFIX."prelevement_facture WHERE fk_prelevement_lignes IN (SELECT rowid FROM ".MAIN_DB_PREFIX."prelevement_lignes WHERE fk_prelevement_bons = ".$this->id.")";
- $resql1=$this->db->query($sql);
- if (! $resql1) dol_print_error($this->db);
+ $error = 0;
+ $resql1 = $resql2 = $resql3 = $resql4 = 0;
- $sql = "DELETE FROM ".MAIN_DB_PREFIX."prelevement_lignes WHERE fk_prelevement_bons = ".$this->id;
- $resql2=$this->db->query($sql);
- if (! $resql2) dol_print_error($this->db);
+ if (! $notrigger)
+ {
+ // Call trigger
+ $result=$this->call_trigger('BON_PRELEVEMENT_DELETE', $user);
+ if ($result < 0) $error++;
+ // End call triggers
+ }
- $sql = "DELETE FROM ".MAIN_DB_PREFIX."prelevement_bons WHERE rowid = ".$this->id;
- $resql3=$this->db->query($sql);
- if (! $resql3) dol_print_error($this->db);
+ if (! $error)
+ {
+ $sql = "DELETE FROM ".MAIN_DB_PREFIX."prelevement_facture WHERE fk_prelevement_lignes IN (SELECT rowid FROM ".MAIN_DB_PREFIX."prelevement_lignes WHERE fk_prelevement_bons = ".$this->id.")";
+ $resql1=$this->db->query($sql);
+ if (! $resql1) dol_print_error($this->db);
+ }
- $sql = "UPDATE ".MAIN_DB_PREFIX."prelevement_facture_demande SET fk_prelevement_bons = NULL, traite = 0 WHERE fk_prelevement_bons = ".$this->id;
- $resql4=$this->db->query($sql);
- if (! $resql4) dol_print_error($this->db);
+ if (! $error)
+ {
+ $sql = "DELETE FROM ".MAIN_DB_PREFIX."prelevement_lignes WHERE fk_prelevement_bons = ".$this->id;
+ $resql2=$this->db->query($sql);
+ if (! $resql2) dol_print_error($this->db);
+ }
- if ($resql1 && $resql2 && $resql3)
+ if (! $error)
+ {
+ $sql = "DELETE FROM ".MAIN_DB_PREFIX."prelevement_bons WHERE rowid = ".$this->id;
+ $resql3=$this->db->query($sql);
+ if (! $resql3) dol_print_error($this->db);
+ }
+
+ if (! $error)
+ {
+ $sql = "UPDATE ".MAIN_DB_PREFIX."prelevement_facture_demande SET fk_prelevement_bons = NULL, traite = 0 WHERE fk_prelevement_bons = ".$this->id;
+ $resql4=$this->db->query($sql);
+ if (! $resql4) dol_print_error($this->db);
+ }
+
+ if ($resql1 && $resql2 && $resql3 && $resql4 && ! $error)
{
$this->db->commit();
return 1;
@@ -1174,28 +1198,72 @@ class BonPrelevement extends CommonObject
/**
* Returns clickable name (with picto)
*
- * @param int $withpicto link with picto
- * @param string $option link target
- * @return string URL of target
+ * @param int $withpicto Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
+ * @param string $option On what the link point to ('nolink', ...)
+ * @param int $notooltip 1=Disable tooltip
+ * @param string $morecss Add more css on link
+ * @param int $save_lastsearch_value -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+ * @return string URL of target
*/
- public function getNomUrl($withpicto = 0, $option = '')
+ public function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $morecss = '', $save_lastsearch_value = -1)
{
- global $langs;
+ global $conf, $langs, $hookmanager;
+
+ if (! empty($conf->dol_no_mouse_hover)) $notooltip=1; // Force disable tooltips
$result='';
- $label = $langs->trans("ShowWithdraw").': '.$this->ref;
- $link = '';
- $linkend=' ';
+ $label = '' . $langs->trans("ShowWithdraw") . ' ';
+ $label.= '' . $langs->trans('Ref') . ': ' . $this->ref;
- if ($option == 'xxx')
+ $url = DOL_URL_ROOT.'/compta/prelevement/card.php?id='.$this->id;
+
+ if ($option != 'nolink')
{
- $link = '';
- $linkend=' ';
+ // Add param to save lastsearch_values or not
+ $add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
+ if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
+ if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
}
- if ($withpicto) $result.=($link.img_object($label, 'payment', 'class="classfortooltip"').$linkend.' ');
- $result.=$link.$this->ref.$linkend;
+ $linkclose='';
+ if (empty($notooltip))
+ {
+ if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+ {
+ $label=$langs->trans("ShowMyObject");
+ $linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
+ }
+ $linkclose.=' title="'.dol_escape_htmltag($label, 1).'"';
+ $linkclose.=' class="classfortooltip'.($morecss?' '.$morecss:'').'"';
+
+ /*
+ $hookmanager->initHooks(array('myobjectdao'));
+ $parameters=array('id'=>$this->id);
+ $reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action); // Note that $action and $object may have been modified by some hooks
+ if ($reshook > 0) $linkclose = $hookmanager->resPrint;
+ */
+ }
+ else $linkclose = ($morecss?' class="'.$morecss.'"':'');
+
+ $linkstart = '';
+ $linkend=' ';
+
+ $result .= $linkstart;
+ if ($withpicto) $result.=img_object(($notooltip?'':$label), ($this->picto?$this->picto:'generic'), ($notooltip?(($withpicto != 2) ? 'class="paddingright"' : ''):'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip?0:1);
+ if ($withpicto != 2) $result.= $this->ref;
+ $result .= $linkend;
+ //if ($withpicto != 2) $result.=(($addlabel && $this->label) ? $sep . dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
+
+ global $action,$hookmanager;
+ $hookmanager->initHooks(array('myobjectdao'));
+ $parameters=array('id'=>$this->id, 'getnomurl'=>$result);
+ $reshook=$hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+ if ($reshook > 0) $result = $hookmanager->resPrint;
+ else $result .= $hookmanager->resPrint;
+
return $result;
}
@@ -1349,7 +1417,7 @@ class BonPrelevement extends CommonObject
$sql = "SELECT soc.code_client as code, soc.address, soc.zip, soc.town, c.code as country_code,";
$sql.= " pl.client_nom as nom, pl.code_banque as cb, pl.code_guichet as cg, pl.number as cc, pl.amount as somme,";
- $sql.= " f.ref as fac, pf.fk_facture as idfac, rib.datec, rib.iban_prefix as iban, rib.bic as bic, rib.rowid as drum";
+ $sql.= " f.ref as fac, pf.fk_facture as idfac, rib.datec, rib.iban_prefix as iban, rib.bic as bic, rib.rowid as drum, rib.rum, rib.date_rum";
$sql.= " FROM";
$sql.= " ".MAIN_DB_PREFIX."prelevement_lignes as pl,";
$sql.= " ".MAIN_DB_PREFIX."facture as f,";
@@ -1375,7 +1443,8 @@ class BonPrelevement extends CommonObject
while ($i < $num)
{
$obj = $this->db->fetch_object($resql);
- $fileDebiteurSection .= $this->EnregDestinataireSEPA($obj->code, $obj->nom, $obj->address, $obj->zip, $obj->town, $obj->country_code, $obj->cb, $obj->cg, $obj->cc, $obj->somme, $obj->fac, $obj->idfac, $obj->iban, $obj->bic, $this->db->jdate($obj->datec), $obj->drum);
+ $daterum = (!empty($obj->date_rum)) ? $this->db->jdate($obj->date_rum) : $this->db->jdate($obj->datec);
+ $fileDebiteurSection .= $this->EnregDestinataireSEPA($obj->code, $obj->nom, $obj->address, $obj->zip, $obj->town, $obj->country_code, $obj->cb, $obj->cg, $obj->cc, $obj->somme, $obj->fac, $obj->idfac, $obj->iban, $obj->bic, $daterum, $obj->drum, $obj->rum);
$this->total = $this->total + $obj->somme;
$i++;
}
@@ -1580,15 +1649,16 @@ class BonPrelevement extends CommonObject
* @param string $row_cg pl.code_guichet AS cg, Not used for SEPA
* @param string $row_cc pl.number AS cc, Not used for SEPA
* @param string $row_somme pl.amount AS somme,
- * @param string $row_ref f.ref
+ * @param string $row_ref f.ref
* @param string $row_idfac pf.fk_facture AS idfac,
* @param string $row_iban rib.iban_prefix AS iban,
* @param string $row_bic rib.bic AS bic,
* @param string $row_datec rib.datec,
* @param string $row_drum rib.rowid used to generate rum
+ * @param string $row_rum rib.rum Rum defined on company bank account
* @return string Return string with SEPA part DrctDbtTxInf
*/
- public function EnregDestinataireSEPA($row_code_client, $row_nom, $row_address, $row_zip, $row_town, $row_country_code, $row_cb, $row_cg, $row_cc, $row_somme, $row_ref, $row_idfac, $row_iban, $row_bic, $row_datec, $row_drum)
+ public function EnregDestinataireSEPA($row_code_client, $row_nom, $row_address, $row_zip, $row_town, $row_country_code, $row_cb, $row_cg, $row_cc, $row_somme, $row_ref, $row_idfac, $row_iban, $row_bic, $row_datec, $row_drum, $row_rum)
{
// phpcs:enable
global $conf;
@@ -1600,7 +1670,7 @@ class BonPrelevement extends CommonObject
// Define value for RUM
// Example: RUMCustomerCode-CustomerBankAccountId-01424448606 (note: Date is date of creation of CustomerBankAccountId)
- $Rum = $this->buildRumNumber($row_code_client, $row_datec, $row_drum);
+ $Rum = empty($row_rum) ? $this->buildRumNumber($row_code_client, $row_datec, $row_drum) : $row_rum;
// Define date of RUM signature
$DtOfSgntr = dol_print_date($row_datec, '%Y-%m-%d');
diff --git a/htdocs/compta/prelevement/class/ligneprelevement.class.php b/htdocs/compta/prelevement/class/ligneprelevement.class.php
index e76cc9d184d..c0e6921c95d 100644
--- a/htdocs/compta/prelevement/class/ligneprelevement.class.php
+++ b/htdocs/compta/prelevement/class/ligneprelevement.class.php
@@ -22,7 +22,7 @@
/**
* \file htdocs/compta/prelevement/class/ligneprelevement.class.php
* \ingroup prelevement
- * \brief Fichier de la classe des lignes de prelevements
+ * \brief File of class to manage lines of Direct Debit orders
*/
diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php
index d9298c9f607..eaef92a1abc 100644
--- a/htdocs/compta/prelevement/create.php
+++ b/htdocs/compta/prelevement/create.php
@@ -52,42 +52,52 @@ $page = GETPOST("page", 'int');
if (empty($page) || $page == -1) { $page = 0; } // If $page is not defined, or '' or -1
$offset = $limit * $page;
+$hookmanager->initHooks(array('directdebitcreatecard','globalcard'));
+
+
/*
* Actions
*/
-// Change customer bank information to withdraw
-if ($action == 'modify')
-{
- for ($i = 1 ; $i < 9 ; $i++)
- {
- dolibarr_set_const($db, GETPOST("nom$i"), GETPOST("value$i"), 'chaine', 0, '', $conf->entity);
- }
-}
-if ($action == 'create')
-{
- // $conf->global->PRELEVEMENT_CODE_BANQUE and $conf->global->PRELEVEMENT_CODE_GUICHET should be empty
- $bprev = new BonPrelevement($db);
- $executiondate = dol_mktime(0, 0, 0, GETPOST('remonth'), (GETPOST('reday')+$conf->global->PRELEVEMENT_ADDDAYS), GETPOST('reyear'));
+$parameters = array('mode' => $mode, 'format' => $format, 'limit' => $limit, 'page' => $page, 'offset' => $offset);
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
- $result = $bprev->create($conf->global->PRELEVEMENT_CODE_BANQUE, $conf->global->PRELEVEMENT_CODE_GUICHET, $mode, $format, $executiondate);
- if ($result < 0)
+if (empty($reshook))
+{
+ // Change customer bank information to withdraw
+ if ($action == 'modify')
{
- setEventMessages($bprev->error, $bprev->errors, 'errors');
- }
- elseif ($result == 0)
- {
- $mesg=$langs->trans("NoInvoiceCouldBeWithdrawed", $format);
- setEventMessages($mesg, null, 'errors');
- $mesg.=''.$val." '.$val." transnoentitiesnoconv("StandingOrders"))).'">'.$langs->trans("CreateAll")." \n";
}
+print "\n";
print "\n";
print ' ';
- print '';
+ print ' ';
print img_picto('', 'statut'.$obj->statut).' ';
print substr('000000'.$obj->rowid, -6);
print ' ';
diff --git a/htdocs/compta/prelevement/index.php b/htdocs/compta/prelevement/index.php
index 4e2c4e2d3a5..1be716f8f61 100644
--- a/htdocs/compta/prelevement/index.php
+++ b/htdocs/compta/prelevement/index.php
@@ -58,7 +58,7 @@ llxHeader('', $langs->trans("CustomersStandingOrdersArea"));
if (prelevement_check_config() < 0)
{
$langs->load("errors");
- setEventMessages($langs->trans("ErrorModuleSetupNotComplete"), null, 'errors');
+ setEventMessages($langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("Withdraw")), null, 'errors');
}
print load_fiche_titre($langs->trans("CustomersStandingOrdersArea"));
diff --git a/htdocs/compta/prelevement/ligne.php b/htdocs/compta/prelevement/line.php
similarity index 95%
rename from htdocs/compta/prelevement/ligne.php
rename to htdocs/compta/prelevement/line.php
index 8b11716bf6f..c9004c04d26 100644
--- a/htdocs/compta/prelevement/ligne.php
+++ b/htdocs/compta/prelevement/line.php
@@ -20,7 +20,7 @@
*/
/**
- * \file htdocs/compta/prelevement/ligne.php
+ * \file htdocs/compta/prelevement/line.php
* \ingroup prelevement
* \brief card of withdraw line
*/
@@ -86,7 +86,7 @@ if ($action == 'confirm_rejet')
$rej->create($user, $id, GETPOST('motif', 'alpha'), $daterej, $lipre->bon_rowid, GETPOST('facturer', 'int'));
- header("Location: ligne.php?id=".$id);
+ header("Location: line.php?id=".$id);
exit;
}
}
@@ -97,7 +97,7 @@ if ($action == 'confirm_rejet')
}
else
{
- header("Location: ligne.php?id=".$id);
+ header("Location: line.php?id=".$id);
exit;
}
}
@@ -112,7 +112,7 @@ $invoicestatic=new Facture($db);
llxHeader('', $langs->trans("StandingOrder"));
$h = 0;
-$head[$h][0] = DOL_URL_ROOT.'/compta/prelevement/ligne.php?id='.$id;
+$head[$h][0] = DOL_URL_ROOT.'/compta/prelevement/line.php?id='.$id;
$head[$h][1] = $langs->trans("Card");
$hselected = $h;
$h++;
@@ -179,7 +179,7 @@ if ($id)
$rej = new RejetPrelevement($db, $user);
- print '
';
- if(!empty($compatibleImportElementsList))
+ if (!empty($compatibleImportElementsList))
{
$res=@include dol_buildpath('core/tpl/ajax/objectlinked_lineimport.tpl.php');
}
@@ -6628,7 +6641,7 @@ class Form
public function showLinkToObjectBlock($object, $restrictlinksto = array(), $excludelinksto = array())
{
global $conf, $langs, $hookmanager;
- global $bc;
+ global $bc, $action;
$linktoelem='';
$linktoelemlist='';
@@ -6659,12 +6672,11 @@ class Form
'fichinter'=>array('enabled'=>$conf->ficheinter->enabled, 'perms'=>1, 'label'=>'LinkToIntervention', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."fichinter as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.') AND t.entity IN ('.getEntity('intervention').')'),
'supplier_proposal'=>array('enabled'=>$conf->supplier_proposal->enabled , 'perms'=>1, 'label'=>'LinkToSupplierProposal', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, '' as ref_supplier, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."supplier_proposal as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.') AND t.entity IN ('.getEntity('supplier_proposal').')'),
'order_supplier'=>array('enabled'=>$conf->supplier_order->enabled , 'perms'=>1, 'label'=>'LinkToSupplierOrder', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_supplier, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."commande_fournisseur as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.') AND t.entity IN ('.getEntity('commande_fournisseur').')'),
- 'invoice_supplier'=>array('enabled'=>$conf->supplier_invoice->enabled , 'perms'=>1, 'label'=>'LinkToSupplierInvoice', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_supplier, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture_fourn as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.') AND t.entity IN ('.getEntity('facture_fourn').')')
+ 'invoice_supplier'=>array('enabled'=>$conf->supplier_invoice->enabled , 'perms'=>1, 'label'=>'LinkToSupplierInvoice', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_supplier, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture_fourn as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.') AND t.entity IN ('.getEntity('facture_fourn').')'),
+ 'ticket'=>array('enabled'=>$conf->ticket->enabled , 'perms'=>1, 'label'=>'LinkToTicket', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.track_id, '0' as total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."ticket as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.') AND t.entity IN ('.getEntity('ticket').')')
);
}
- global $action;
-
// Can complete the possiblelink array
$hookmanager->initHooks(array('commonobject'));
$parameters=array('listofidcompanytoscan' => $listofidcompanytoscan);
diff --git a/htdocs/core/class/html.formaccounting.class.php b/htdocs/core/class/html.formaccounting.class.php
index 87b32902684..03c70f749d2 100644
--- a/htdocs/core/class/html.formaccounting.class.php
+++ b/htdocs/core/class/html.formaccounting.class.php
@@ -21,7 +21,7 @@
/**
* \file htdocs/core/class/html.formaccounting.class.php
- * \ingroup Advanced accountancy
+ * \ingroup Accountancy (Double entries)
* \brief File of class with all html predefined components
*/
require_once DOL_DOCUMENT_ROOT .'/core/class/html.form.class.php';
@@ -392,7 +392,7 @@ class FormAccounting extends Form
$resql = $this->db->query($sql);
if ($resql) {
while ($obj = $this->db->fetch_object($resql)) {
- if (!empty($obj->code_compta_fournisseur)) {
+ if ($obj->code_compta_fournisseur != "") {
$aux_account[$obj->code_compta_fournisseur] = $obj->code_compta_fournisseur.' ('.$obj->nom.')';
}
}
diff --git a/htdocs/core/class/html.formactions.class.php b/htdocs/core/class/html.formactions.class.php
index 31353ea3d10..bb1cf5fbfe7 100644
--- a/htdocs/core/class/html.formactions.class.php
+++ b/htdocs/core/class/html.formactions.class.php
@@ -213,24 +213,22 @@ class FormActions
$page=0; $param='';
- $total = 0;
-
print '
';
print '
';
print '';
- print getTitleFieldOfList('Ref', 0, $_SERVER["PHP_SELF"], '', $page, $param, '', $sortfield, $sortorder, '', 1);
- print getTitleFieldOfList('By', 0, $_SERVER["PHP_SELF"], '', $page, $param, '', $sortfield, $sortorder, '', 1);
- print getTitleFieldOfList('Type', 0, $_SERVER["PHP_SELF"], '', $page, $param, '', $sortfield, $sortorder, '', 1);
+ print getTitleFieldOfList('Ref', 0, $_SERVER["PHP_SELF"], '', $page, $param, '', $sortfield, $sortorder, '', 1);
+ print getTitleFieldOfList('By', 0, $_SERVER["PHP_SELF"], '', $page, $param, '', $sortfield, $sortorder, '', 1);
+ print getTitleFieldOfList('Type', 0, $_SERVER["PHP_SELF"], '', $page, $param, '', $sortfield, $sortorder, '', 1);
print getTitleFieldOfList('Title', 0, $_SERVER["PHP_SELF"], '', $page, $param, '', $sortfield, $sortorder, '', 1);
- print getTitleFieldOfList('Date', 0, $_SERVER["PHP_SELF"], 'a.datep', $page, $param, '', $sortfield, $sortorder, 'center ', 1);
- print getTitleFieldOfList('', 0, $_SERVER["PHP_SELF"], '', $page, $param, '', $sortfield, $sortorder, 'right ', 1);
+ print getTitleFieldOfList('Date', 0, $_SERVER["PHP_SELF"], 'a.datep', $page, $param, '', $sortfield, $sortorder, 'center ', 1);
+ print getTitleFieldOfList('', 0, $_SERVER["PHP_SELF"], '', $page, $param, '', $sortfield, $sortorder, 'right ', 1);
print ' ';
print "\n";
- $userstatic = new User($this->db);
-
- if (count($listofactions))
+ if (is_array($listofactions) && count($listofactions))
{
+ $cacheusers=array();
+
$cursorevent = 0;
foreach($listofactions as $action)
{
@@ -246,8 +244,20 @@ class FormActions
print '';
if (! empty($action->userownerid))
{
- $userstatic->fetch($action->userownerid); // TODO Introduce a cache on users fetched
- print $userstatic->getNomUrl(-1, '', 0, 0, 16, 0, 'firstelselast', '');
+ if (is_object($cacheusers[$action->userownerid]))
+ {
+ $tmpuser = $cacheusers[$action->userownerid];
+ }
+ else
+ {
+ $tmpuser = new User($this->db);
+ $tmpuser->fetch($action->userownerid);
+ $cacheusers[$action->userownerid] = $tmpuser;
+ }
+ if ($tmpuser->id > 0)
+ {
+ print $tmpuser->getNomUrl(-1, '', 0, 0, 16, 0, 'firstelselast', '');
+ }
}
print ' ';
// Type
@@ -284,10 +294,7 @@ class FormActions
}
print '';
print '';
- if (! empty($action->author->id))
- {
- print $action->getLibStatut(3);
- }
+ print $action->getLibStatut(3);
print ' ';
print '';
diff --git a/htdocs/core/class/html.formcompany.class.php b/htdocs/core/class/html.formcompany.class.php
index d2fb93000a9..2207ab8ab2b 100644
--- a/htdocs/core/class/html.formcompany.class.php
+++ b/htdocs/core/class/html.formcompany.class.php
@@ -211,13 +211,13 @@ class FormCompany
* The key of the list is the code (there can be several entries for a given code but in this case, the country field differs).
* Thus the links with the departments are done on a department independently of its name.
*
- * @param string $selected Code state preselected (mus be state id)
+ * @param int $selected Code state preselected (mus be state id)
* @param integer $country_codeid Country code or id: 0=list for all countries, otherwise country code or country rowid to show
* @param string $htmlname Id of department. If '', we want only the string with
* @return string String with HTML select
* @see select_country()
*/
- public function select_state($selected = '', $country_codeid = 0, $htmlname = 'state_id')
+ public function select_state($selected = 0, $country_codeid = 0, $htmlname = 'state_id')
{
// phpcs:enable
global $conf,$langs,$user;
@@ -391,7 +391,7 @@ class FormCompany
/**
* Return combo list with people title
*
- * @param string $selected Title preselected
+ * @param string $selected Civility/Title code preselected
* @param string $htmlname Name of HTML select combo field
* @param string $morecss Add more css on SELECT element
* @return string String with HTML select
@@ -908,7 +908,7 @@ class FormCompany
$out = '';
if ($typeinput=='form') {
- if ($selected == '') $out .= ' ';
+ if ($selected == '' || $selected == '-1') $out .= ' ';
if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) {
$out .= ''.$langs->trans('Prospect').' ';
}
@@ -920,7 +920,7 @@ class FormCompany
}
$out .= ''.$langs->trans('NorProspectNorCustomer').' ';
} elseif ($typeinput=='list') {
- $out .= ' ';
+ $out .= ' ';
if (empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) {
$out .= ''.$langs->trans('Customer').' ';
}
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index b729ad51fc5..5f63d4db66c 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -130,15 +130,35 @@ class FormFile
$out .= '';
- $max=$conf->global->MAIN_UPLOAD_DOC; // En Kb
- $maxphp=@ini_get('upload_max_filesize'); // En inconnu
+ $max=$conf->global->MAIN_UPLOAD_DOC; // In Kb
+ $maxphp=@ini_get('upload_max_filesize'); // In unknown
if (preg_match('/k$/i', $maxphp)) $maxphp=$maxphp*1;
if (preg_match('/m$/i', $maxphp)) $maxphp=$maxphp*1024;
if (preg_match('/g$/i', $maxphp)) $maxphp=$maxphp*1024*1024;
if (preg_match('/t$/i', $maxphp)) $maxphp=$maxphp*1024*1024*1024;
- // Now $max and $maxphp are in Kb
+ $maxphp2=@ini_get('post_max_size'); // In unknown
+ if (preg_match('/k$/i', $maxphp2)) $maxphp2=$maxphp2*1;
+ if (preg_match('/m$/i', $maxphp2)) $maxphp2=$maxphp2*1024;
+ if (preg_match('/g$/i', $maxphp2)) $maxphp2=$maxphp2*1024*1024;
+ if (preg_match('/t$/i', $maxphp2)) $maxphp2=$maxphp2*1024*1024*1024;
+ // Now $max and $maxphp and $maxphp2 are in Kb
$maxmin = $max;
- if ($maxphp > 0) $maxmin=min($max, $maxphp);
+ $maxphptoshow = $maxphptoshowparam = '';
+ if ($maxphp > 0)
+ {
+ $maxmin=min($max, $maxphp);
+ $maxphptoshow = $maxphp;
+ $maxphptoshowparam = 'upload_max_filesize';
+ }
+ if ($maxphp2 > 0)
+ {
+ $maxmin=min($max, $maxphp2);
+ if ($maxphp2 < $maxphp)
+ {
+ $maxphptoshow = $maxphp2;
+ $maxphptoshowparam = 'post_max_size';
+ }
+ }
if ($maxmin > 0)
{
@@ -168,7 +188,7 @@ class FormFile
{
$langs->load('other');
$out .= ' ';
- $out .= info_admin($langs->trans("ThisLimitIsDefinedInSetup", $max, $maxphp), 1);
+ $out .= info_admin($langs->trans("ThisLimitIsDefinedInSetup", $max, $maxphptoshow), 1);
}
}
else
@@ -1040,9 +1060,9 @@ class FormFile
* @param string $relativepath Relative path of docs (autodefined if not provided), relative to module dir, not to MAIN_DATA_ROOT.
* @param int $permonobject Permission on object (so permission to delete or crop document)
* @param int $useinecm Change output for use in ecm module:
- * 0 or 6: Add a preview column. Show also a rename and crop button.
+ * 0 or 6: Add a preview column. Show also a rename button. Show also a crop button for some values of $modulepart (must be supported into hard coded list in this function + photos_resize.php + restrictedArea + checkUserAccessToObject)
* 1: Add link to edit ECM entry
- * 2: Add rename and crop file
+ * 2: Add rename and crop link
* 4: Add a preview column
* 5: Add link to edit ECM entry and Add a preview column
* @param string $textifempty Text to show if filearray is empty ('NoFileFound' if not defined)
@@ -1068,7 +1088,7 @@ class FormFile
global $form;
$disablecrop=1;
- if (in_array($modulepart, array('expensereport','holiday','member','project','product','produit','service','societe','tax','ticket','user'))) $disablecrop=0;
+ if (in_array($modulepart, array('bom','expensereport','holiday','member','project','product','produit','service','societe','tax','ticket','user'))) $disablecrop=0;
// Define relative path used to store the file
if (empty($relativepath))
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index b39c3839c71..b0cdcd23a96 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -394,6 +394,7 @@ class FormMail extends Form
if ($this->param['models'] != 'none')
{
$result = $this->fetchAllEMailTemplate($this->param["models"], $user, $outputlangs);
+
if ($result < 0)
{
setEventMessages($this->error, $this->errors, 'errors');
@@ -935,7 +936,6 @@ class FormMail extends Form
$defaultmessage=preg_replace("/^( ';
$out.= '';
$out.=$form->textwithpicto($langs->trans('MailText'), $helpforsubstitution, 1, 'help', '', 0, 2, 'substittooltipfrombody');
@@ -1154,6 +1154,12 @@ class FormMail extends Form
return -1;
}
+ $languagetosearch = (is_object($outputlangs) ? $outputlangs->defaultlang : '');
+ // Define $languagetosearchmain to fall back on main language (for example to get 'es_ES' for 'es_MX')
+ $tmparray = explode('_', $languagetosearch);
+ $languagetosearchmain = $tmparray[0].'_'.strtoupper($tmparray[0]);
+ if ($languagetosearchmain == $languagetosearch) $languagetosearchmain = '';
+
$sql = "SELECT rowid, label, topic, joinfiles, content, content_lines, lang";
$sql.= " FROM ".MAIN_DB_PREFIX.'c_email_templates';
$sql.= " WHERE (type_template='".$db->escape($type_template)."' OR type_template='all')";
@@ -1161,10 +1167,10 @@ class FormMail extends Form
$sql.= " AND (private = 0 OR fk_user = ".$user->id.")"; // Get all public or private owned
if ($active >= 0) $sql.=" AND active = ".$active;
if ($label) $sql.=" AND label ='".$db->escape($label)."'";
- if (! ($id > 0) && is_object($outputlangs)) $sql.= " AND (lang = '".$db->escape($outputlangs->defaultlang)."' OR lang IS NULL OR lang = '')";
+ if (! ($id > 0) && $languagetosearch) $sql.= " AND (lang = '".$db->escape($languagetosearch)."'".($languagetosearchmain ? " OR lang = '".$db->escape($languagetosearchmain)."'" : "")." OR lang IS NULL OR lang = '')";
if ($id > 0) $sql.= " AND rowid=".$id;
if ($id == -1) $sql.= " AND position=0";
- if (is_object($outputlangs)) $sql.= $db->order("position,lang,label", "ASC,DESC,ASC"); // We want line with lang set first, then with lang null or ''
+ if ($languagetosearch) $sql.= $db->order("position,lang,label", "ASC,DESC,ASC"); // We want line with lang set first, then with lang null or ''
else $sql.= $db->order("position,lang,label", "ASC,ASC,ASC"); // If no language provided, we give priority to lang not defined
$sql.= $db->plimit(1);
//print $sql;
diff --git a/htdocs/core/class/html.formmargin.class.php b/htdocs/core/class/html.formmargin.class.php
index f9b0a59280f..ea038fa8131 100644
--- a/htdocs/core/class/html.formmargin.class.php
+++ b/htdocs/core/class/html.formmargin.class.php
@@ -199,8 +199,6 @@ class FormMargin
if (! $user->rights->margins->liretous) return;
- $rounding = min($conf->global->MAIN_MAX_DECIMALS_UNIT, $conf->global->MAIN_MAX_DECIMALS_TOT);
-
$marginInfo = $this->getMarginInfosArray($object, $force_price);
if (! empty($conf->global->MARGIN_ADD_SHOWHIDE_BUTTON)) // TODO Warning this feature rely on an external js file that may be removed. Using native js function document.cookie should be better
@@ -240,13 +238,13 @@ class FormMargin
//if ($marginInfo['margin_on_products'] != 0 && $marginInfo['margin_on_services'] != 0) {
print ' ';
print ''.$langs->trans('MarginOnProducts').' ';
- print ''.price($marginInfo['pv_products'], null, null, null, null, $rounding).' ';
- print ''.price($marginInfo['pa_products'], null, null, null, null, $rounding).' ';
- print ''.price($marginInfo['margin_on_products'], null, null, null, null, $rounding).' ';
+ print ''.price($marginInfo['pv_products']).' ';
+ print ''.price($marginInfo['pa_products']).' ';
+ print ''.price($marginInfo['margin_on_products']).' ';
if (! empty($conf->global->DISPLAY_MARGIN_RATES))
- print ''.(($marginInfo['margin_rate_products'] == '')?'':price($marginInfo['margin_rate_products'], null, null, null, null, $rounding).'%').' ';
+ print ''.(($marginInfo['margin_rate_products'] == '')?'':price($marginInfo['margin_rate_products'], null, null, null, null, 2).'%').' ';
if (! empty($conf->global->DISPLAY_MARK_RATES))
- print ''.(($marginInfo['mark_rate_products'] == '')?'':price($marginInfo['mark_rate_products'], null, null, null, null, $rounding).'%').' ';
+ print ''.(($marginInfo['mark_rate_products'] == '')?'':price($marginInfo['mark_rate_products'], null, null, null, null, 2).'%').' ';
print ' ';
}
@@ -254,13 +252,13 @@ class FormMargin
{
print '';
print ''.$langs->trans('MarginOnServices').' ';
- print ''.price($marginInfo['pv_services'], null, null, null, null, $rounding).' ';
- print ''.price($marginInfo['pa_services'], null, null, null, null, $rounding).' ';
- print ''.price($marginInfo['margin_on_services'], null, null, null, null, $rounding).' ';
+ print ''.price($marginInfo['pv_services']).' ';
+ print ''.price($marginInfo['pa_services']).' ';
+ print ''.price($marginInfo['margin_on_services']).' ';
if (! empty($conf->global->DISPLAY_MARGIN_RATES))
- print ''.(($marginInfo['margin_rate_services'] == '')?'':price($marginInfo['margin_rate_services'], null, null, null, null, $rounding).'%').' ';
+ print ''.(($marginInfo['margin_rate_services'] == '')?'':price($marginInfo['margin_rate_services'], null, null, null, null, 2).'%').' ';
if (! empty($conf->global->DISPLAY_MARK_RATES))
- print ''.(($marginInfo['mark_rate_services'] == '')?'':price($marginInfo['mark_rate_services'], null, null, null, null, $rounding).'%').' ';
+ print ''.(($marginInfo['mark_rate_services'] == '')?'':price($marginInfo['mark_rate_services'], null, null, null, null, 2).'%').' ';
print ' ';
}
@@ -268,13 +266,13 @@ class FormMargin
{
print '';
print ''.$langs->trans('TotalMargin').' ';
- print ''.price($marginInfo['pv_total'], null, null, null, null, $rounding).' ';
- print ''.price($marginInfo['pa_total'], null, null, null, null, $rounding).' ';
- print ''.price($marginInfo['total_margin'], null, null, null, null, $rounding).' ';
+ print ''.price($marginInfo['pv_total']).' ';
+ print ''.price($marginInfo['pa_total']).' ';
+ print ''.price($marginInfo['total_margin']).' ';
if (! empty($conf->global->DISPLAY_MARGIN_RATES))
- print ''.(($marginInfo['total_margin_rate'] == '')?'':price($marginInfo['total_margin_rate'], null, null, null, null, $rounding).'%').' ';
+ print ''.(($marginInfo['total_margin_rate'] == '')?'':price($marginInfo['total_margin_rate'], null, null, null, null, 2).'%').' ';
if (! empty($conf->global->DISPLAY_MARK_RATES))
- print ''.(($marginInfo['total_mark_rate'] == '')?'':price($marginInfo['total_mark_rate'], null, null, null, null, $rounding).'%').' ';
+ print ''.(($marginInfo['total_mark_rate'] == '')?'':price($marginInfo['total_mark_rate'], null, null, null, null, 2).'%').' ';
print ' ';
}
print '
';
diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php
index 5b829f95f86..c6a138b2a02 100644
--- a/htdocs/core/class/html.formother.class.php
+++ b/htdocs/core/class/html.formother.class.php
@@ -393,7 +393,8 @@ class FormOther
public function select_salesrepresentatives($selected, $htmlname, $user, $showstatus = 0, $showempty = 1, $morecss = '')
{
// phpcs:enable
- global $conf,$langs;
+ global $conf, $langs;
+
$langs->load('users');
$out = '';
@@ -415,17 +416,44 @@ class FormOther
// Get list of users allowed to be viewed
$sql_usr = "SELECT u.rowid, u.lastname, u.firstname, u.statut, u.login";
$sql_usr.= " FROM ".MAIN_DB_PREFIX."user as u";
- $sql_usr.= " WHERE u.entity IN (0,".$conf->entity.")";
+
+ if (! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
+ {
+ if (! empty($user->admin) && empty($user->entity) && $conf->entity == 1) {
+ $sql_usr.= " WHERE u.entity IS NOT NULL"; // Show all users
+ } else {
+ $sql_usr.= " WHERE EXISTS (SELECT ug.fk_user FROM ".MAIN_DB_PREFIX."usergroup_user as ug WHERE u.rowid = ug.fk_user AND ug.entity IN (".getEntity('usergroup')."))";
+ $sql_usr.= " OR u.entity = 0"; // Show always superadmin
+ }
+ }
+ else
+ {
+ $sql_usr.= " WHERE u.entity IN (".getEntity('user').")";
+ }
+
if (empty($user->rights->user->user->lire)) $sql_usr.=" AND u.rowid = ".$user->id;
- if (! empty($user->societe_id)) $sql_usr.=" AND u.fk_soc = ".$user->societe_id;
+ if (! empty($user->socid)) $sql_usr.=" AND u.fk_soc = ".$user->socid;
// Add existing sales representatives of thirdparty of external user
- if (empty($user->rights->user->user->lire) && $user->societe_id)
+ if (empty($user->rights->user->user->lire) && $user->socid)
{
$sql_usr.=" UNION ";
$sql_usr.= "SELECT u2.rowid, u2.lastname, u2.firstname, u2.statut, u2.login";
$sql_usr.= " FROM ".MAIN_DB_PREFIX."user as u2, ".MAIN_DB_PREFIX."societe_commerciaux as sc";
- $sql_usr.= " WHERE u2.entity IN (0,".$conf->entity.")";
- $sql_usr.= " AND u2.rowid = sc.fk_user AND sc.fk_soc=".$user->societe_id;
+
+ if (! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
+ {
+ if (! empty($user->admin) && empty($user->entity) && $conf->entity == 1) {
+ $sql_usr.= " WHERE u2.entity IS NOT NULL"; // Show all users
+ } else {
+ $sql_usr.= " WHERE EXISTS (SELECT ug2.fk_user FROM ".MAIN_DB_PREFIX."usergroup_user as ug2 WHERE u2.rowid = ug2.fk_user AND ug2.entity IN (".getEntity('usergroup')."))";
+ }
+ }
+ else
+ {
+ $sql_usr.= " WHERE u2.entity IN (".getEntity('user').")";
+ }
+
+ $sql_usr.= " AND u2.rowid = sc.fk_user AND sc.fk_soc=".$user->socid;
}
$sql_usr.= " ORDER BY statut DESC, lastname ASC"; // Do not use 'ORDER BY u.statut' here, not compatible with the UNION.
//print $sql_usr;exit;
diff --git a/htdocs/core/class/html.formprojet.class.php b/htdocs/core/class/html.formprojet.class.php
index b4c0c4295c9..8e01e93b66e 100644
--- a/htdocs/core/class/html.formprojet.class.php
+++ b/htdocs/core/class/html.formprojet.class.php
@@ -60,7 +60,7 @@ class FormProjets
* @param int $maxlength Maximum length of label
* @param int $option_only Return only html options lines without the select tag
* @param int $show_empty Add an empty line
- * @param int $discard_closed Discard closed projects (0=Keep, 1=hide completely, 2=Disable)
+ * @param int $discard_closed Discard closed projects (0=Keep, 1=hide completely, 2=Disable). Use a negative value to not show the "discarded" tooltip.
* @param int $forcefocus Force focus on field (works with javascript only)
* @param int $disabled Disabled
* @param int $mode 0 for HTML mode and 1 for JSON mode
@@ -100,13 +100,13 @@ class FormProjets
}
else
{
- $out.=$this->select_projects_list($socid, $selected, $htmlname, $maxlength, $option_only, $show_empty, $discard_closed, $forcefocus, $disabled, 0, $filterkey, 1, $forceaddid, $htmlid, $morecss);
+ $out.=$this->select_projects_list($socid, $selected, $htmlname, $maxlength, $option_only, $show_empty, abs($discard_closed), $forcefocus, $disabled, 0, $filterkey, 1, $forceaddid, $htmlid, $morecss);
}
- if ($discard_closed)
+ if ($discard_closed > 0)
{
if (class_exists('Form'))
{
- if (empty($form)) $form=new Form($this->db);
+ if (! is_object($form)) $form=new Form($this->db);
$out.=$form->textwithpicto('', $langs->trans("ClosedProjectsAreHidden"));
}
}
@@ -367,7 +367,7 @@ class FormProjets
include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
$comboenhancement = ajax_combobox($htmlname, '', 0, $forcefocus);
$out.=$comboenhancement;
- $morecss='minwidth200 maxwidth500';
+ $morecss='minwidth200imp maxwidth500';
}
if (empty($option_only)) {
diff --git a/htdocs/core/class/html.formticket.class.php b/htdocs/core/class/html.formticket.class.php
index 1d681d2672b..a7797f91833 100644
--- a/htdocs/core/class/html.formticket.class.php
+++ b/htdocs/core/class/html.formticket.class.php
@@ -419,7 +419,7 @@ class FormTicket
if ($withdolfichehead) dol_fiche_end();
- print '
';
+ print '';
print '
';
}
diff --git a/htdocs/core/lib/website.lib.php b/htdocs/core/lib/website.lib.php
index 198f91a4446..4d89210cd44 100644
--- a/htdocs/core/lib/website.lib.php
+++ b/htdocs/core/lib/website.lib.php
@@ -29,13 +29,16 @@
* @param Website $website Web site object
* @param string $content Content to replace
* @param int $removephppart 0=Replace PHP sections with a PHP badge. 1=Remove completely PHP sections.
+ * @param string $contenttype Content type
* @return boolean True if OK
* @see dolWebsiteOutput() for function used to replace content in a web server context
*/
-function dolWebsiteReplacementOfLinks($website, $content, $removephppart = 0)
+function dolWebsiteReplacementOfLinks($website, $content, $removephppart = 0, $contenttype='html')
{
$nbrep = 0;
+ dol_syslog('dolWebsiteReplacementOfLinks start (contenttype='.$contenttype." USEDOLIBARRSERVER=".(defined('USEDOLIBARRSERVER')?'1':'')." USEDOLIBARREDITOR=".(defined('USEDOLIBARREDITOR')?'1':'').')', LOG_DEBUG);
+
// Replace php code. Note $content may come from database and does not contains body tags.
$replacewith='...php...';
if ($removephppart) $replacewith='';
@@ -90,6 +93,8 @@ function dolWebsiteReplacementOfLinks($website, $content, $removephppart = 0)
$content=preg_replace('/(href=")(\/?document\.php\?[^\"]*modulepart=[^\"]*)(\")/', '\1'.DOL_URL_ROOT.'\2\3', $content, -1, $nbrep);
$content=preg_replace('/(src=")(\/?document\.php\?[^\"]*modulepart=[^\"]*)(\")/', '\1'.DOL_URL_ROOT.'\2\3', $content, -1, $nbrep);
+ dol_syslog('dolWebsiteReplacementOfLinks end', LOG_DEBUG);
+
return $content;
}
@@ -176,16 +181,18 @@ function dolKeepOnlyPhpCode($str)
* Render a string of an HTML content and output it.
* Used to ouput the page when viewed from server (Dolibarr or Apache).
*
- * @param string $content Content string
+ * @param string $content Content string
+ * @param string $contenttype Content type
+ * @param int $containerid Contenair id
* @return void
* @see dolWebsiteReplacementOfLinks() for function used to replace content in the backoffice context when USEDOLIBARREDITOR is not on
*/
-function dolWebsiteOutput($content)
+function dolWebsiteOutput($content, $contenttype='html', $containerid='')
{
global $db, $langs, $conf, $user;
global $dolibarr_main_url_root, $dolibarr_main_data_root;
- dol_syslog("dolWebsiteOutput start (USEDOLIBARRSERVER=".(defined('USEDOLIBARRSERVER')?'1':'')." (USEDOLIBARREDITOR=".(defined('USEDOLIBARREDITOR')?'1':'').')');
+ dol_syslog("dolWebsiteOutput start (contenttype=".$contenttype." containerid=".$containerid." USEDOLIBARRSERVER=".(defined('USEDOLIBARRSERVER')?'1':'')." USEDOLIBARREDITOR=".(defined('USEDOLIBARREDITOR')?'1':'').')');
// Define $urlwithroot
$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
@@ -195,9 +202,12 @@ function dolWebsiteOutput($content)
if (defined('USEDOLIBARREDITOR')) // REPLACEMENT OF LINKS When page called from Dolibarr editor
{
// We remove the part of content
- $content = preg_replace('/.*<\/head>/ims', '', $content);
- $content = preg_replace('/^.*]*)*>/ims', '', $content);
- $content = preg_replace('/<\/body(\s[^>]*)*>.*$/ims', '', $content);
+ if ($contenttype == 'html')
+ {
+ $content = preg_replace('/.*<\/head>/ims', '', $content);
+ $content = preg_replace('/^.*]*)*>/ims', '', $content);
+ $content = preg_replace('/<\/body(\s[^>]*)*>.*$/ims', '', $content);
+ }
}
elseif (defined('USEDOLIBARRSERVER')) // REPLACEMENT OF LINKS When page called from Dolibarr server
{
@@ -285,7 +295,7 @@ function dolWebsiteOutput($content)
*
* @param string $content Content string
* @return void
- * @see dolWebsiteOutput
+ * @see dolWebsiteOutput()
*/
/*
function dolWebsiteSaveContent($content)
@@ -339,6 +349,14 @@ function redirectToContainer($containerref, $containeraliasalt = '', $containeri
}
}
+ if (defined('USEDOLIBARREDITOR'))
+ {
+ print '';
+ print "This page contains dynamic code that make a redirect to '".$containerref."' in your current context. Redirect has been canceled as it is not supported in edition mode.";
+ print '
';
+ return;
+ }
+
if (defined('USEDOLIBARRSERVER')) // When page called from Dolibarr server
{
// Check new container exists
@@ -397,7 +415,7 @@ function redirectToContainer($containerref, $containeraliasalt = '', $containeri
*/
function includeContainer($containerref)
{
- global $conf, $db, $hookmanager, $langs, $mysoc, $user, $website, $websitepage, $weblangs; // Very important. Required to have var available when running inluded containers.
+ global $conf, $db, $hookmanager, $langs, $mysoc, $user, $website, $websitepage, $weblangs; // Very important. Required to have var available when running included containers.
global $includehtmlcontentopened;
global $websitekey, $websitepagefile;
@@ -434,7 +452,224 @@ function includeContainer($containerref)
$includehtmlcontentopened--;
}
+/**
+ * Return HTML content to add structured data for an article, news or Blog Post.
+ *
+ * @param string $type 'blogpost', 'product', 'software'...
+ * @param array $data Array of data parameters for structured data
+ * @return string HTML content
+ */
+function getStructuredData($type, $data = array())
+{
+ global $conf, $db, $hookmanager, $langs, $mysoc, $user, $website, $websitepage, $weblangs; // Very important. Required to have var available when running inluded containers.
+ if ($type == 'software')
+ {
+ $ret = ''."\n";
+ $ret .= ''."\n";
+ }
+ elseif ($type == 'blogpost')
+ {
+ if ($websitepage->fk_user_creat > 0)
+ {
+ include_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
+ $tmpuser = new User($db);
+ $restmpuser = $tmpuser->fetch($websitepage->fk_user_creat);
+
+ if ($restmpuser > 0)
+ {
+ $ret = ''."\n";
+ $ret .= ''."\n";
+ }
+ }
+ }
+ elseif ($type == 'product')
+ {
+ $ret = ''."\n";
+ $ret.= ''."\n";
+ }
+ return $ret;
+}
+
+/**
+ * Return list of containers object that match a criteria
+ *
+ * @param string $type Type of container to search into (Example: 'page')
+ * @param string $algo Algorithm used for search (Example: 'meta' is searching into meta information like title and description, 'metacontent')
+ * @param string $searchstring Search string
+ * @param int $max Max number of answers
+ * @return string HTML content
+ */
+function getPagesFromSearchCriterias($type, $algo, $searchstring, $max = 25)
+{
+ global $conf, $db, $hookmanager, $langs, $mysoc, $user, $website, $websitepage, $weblangs; // Very important. Required to have var available when running inluded containers.
+
+ $error = 0;
+ $arrayresult = array('code'=>'', 'list'=>array());
+
+ if (! is_object($weblangs)) $weblangs = $langs;
+
+ if (empty($searchstring))
+ {
+ $error++;
+ $arrayresult['code']='KO';
+ $arrayresult['message']=$weblangs->trans("EmptySearchString");
+ }
+ elseif (dol_strlen($searchstring) < 2)
+ {
+ $weblangs->load("errors");
+ $error++;
+ $arrayresult['code']='KO';
+ $arrayresult['message']=$weblangs->trans("ErrorSearchCriteriaTooSmall");
+ }
+ elseif (! in_array($type, array('', 'page')))
+ {
+ $error++;
+ $arrayresult['code']='KO';
+ $arrayresult['message']='Bad value for parameter $type';
+ }
+
+ $searchdone = 0;
+
+ if (! $error && in_array($algo, array('meta', 'metacontent', 'content')))
+ {
+ $sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.'website_page';
+ $sql.= " WHERE fk_website = ".$website->id;
+ if ($type) $sql.= " AND type_container = '".$db->escape($type)."'";
+ $sql.= " AND (";
+ $searchalgo = '';
+ if ($algo == 'meta' || $algo == 'metacontent')
+ {
+ $searchalgo.= ($searchalgo?' OR ':'')."title LIKE '%".$db->escape($searchstring)."%' OR description LIKE '%".$db->escape($searchstring)."%'";
+ $searchalgo.= ($searchalgo?' OR ':'')."keywords LIKE '".$db->escape($searchstring).",%' OR keywords LIKE '% ".$db->escape($searchstring)."%'"; // TODO Use a better way to scan keywords
+ }
+ if ($algo == 'metacontent' || $algo == 'content')
+ {
+ $searchalgo.= ($searchalgo?' OR ':'')."content LIKE '%".$db->escape($searchstring)."%'";
+ }
+ $sql.=$searchalgo;
+ $sql.= ")";
+ $sql.= $db->plimit($max);
+
+ $resql = $db->query($sql);
+ if ($resql)
+ {
+ $i = 0;
+ while (($obj = $db->fetch_object($resql)) && ($i < $max || $max == 0))
+ {
+ if ($obj->rowid > 0)
+ {
+ $tmpwebsitepage = new WebsitePage($db);
+ $tmpwebsitepage->fetch($obj->rowid);
+ if ($tmpwebsitepage->id > 0) $arrayresult['list'][]=$tmpwebsitepage;
+ }
+ $i++;
+ }
+
+ $arrayresult['code']='OK';
+ if (empty($arrayresult['list']))
+ {
+ $arrayresult['code']='KO';
+ $arrayresult['message']=$weblangs->trans("NoRecordFound");
+ }
+ }
+ else
+ {
+ $error++;
+ $arrayresult['code']=$db->lasterrno();
+ $arrayresult['message']=$db->lasterror();
+ }
+
+ $searchdone = 1;
+ }
+
+ if (! $searchdone)
+ {
+ $error++;
+ $arrayresult['code']='KO';
+ $arrayresult['message']='No supported algorithm found';
+ }
+
+ return $arrayresult;
+}
/**
* Download all images found into page content $tmp.
@@ -619,313 +854,3 @@ function getAllImages($object, $objectpage, $urltograb, &$tmp, &$action, $modify
}
}
}
-
-
-
-/**
- * Save content of a page on disk
- *
- * @param string $filemaster Full path of filename master.inc.php for website to generate
- * @return boolean True if OK
- */
-function dolSaveMasterFile($filemaster)
-{
- global $conf;
-
- // Now generate the master.inc.php page
- dol_syslog("We regenerate the master file");
- dol_delete_file($filemaster);
-
- $mastercontent = ''."\n";
- $result = file_put_contents($filemaster, $mastercontent);
- if (! empty($conf->global->MAIN_UMASK))
- @chmod($filemaster, octdec($conf->global->MAIN_UMASK));
-
- return $result;
-}
-
-/**
- * Save content of a page on disk
- *
- * @param string $filealias Full path of filename to generate
- * @param Website $object Object website
- * @param WebsitePage $objectpage Object websitepage
- * @return boolean True if OK
- */
-function dolSavePageAlias($filealias, $object, $objectpage)
-{
- global $conf;
-
- // Now create the .tpl file (duplicate code with actions updatesource or updatecontent but we need this to save new header)
- dol_syslog("We regenerate the alias page filealias=".$filealias);
-
- $aliascontent = 'id.'.tpl.php\'; ';
- $aliascontent.= 'else require $dolibarr_main_data_root.\'/website/\'.$website->ref.\'/page'.$objectpage->id.'.tpl.php\';'."\n";
- $aliascontent.= '?>'."\n";
- $result = file_put_contents($filealias, $aliascontent);
- if (! empty($conf->global->MAIN_UMASK)) {
- @chmod($filealias, octdec($conf->global->MAIN_UMASK));
- }
-
- return ($result?true:false);
-}
-
-
-/**
- * Save content of a page on disk
- *
- * @param string $filetpl Full path of filename to generate
- * @param Website $object Object website
- * @param WebsitePage $objectpage Object websitepage
- * @return boolean True if OK
- */
-function dolSavePageContent($filetpl, $object, $objectpage)
-{
- global $conf;
-
- // Now create the .tpl file (duplicate code with actions updatesource or updatecontent but we need this to save new header)
- dol_syslog("We regenerate the tpl page filetpl=".$filetpl);
-
- dol_delete_file($filetpl);
-
- $shortlangcode = '';
- if ($objectpage->lang) $shortlangcode=preg_replace('/[_-].*$/', '', $objectpage->lang); // en_US or en-US -> en
-
- $tplcontent ='';
- $tplcontent.= "\n";
- if (! empty($conf->global->WEBSITE_FORCE_DOCTYPE_HTML5))
- {
- $tplcontent.= "\n";
- }
- $tplcontent.= ''."\n";
- $tplcontent.= ''."\n";
- $tplcontent.= ''.dol_string_nohtmltag($objectpage->title, 0, 'UTF-8').' '."\n";
- $tplcontent.= ''."\n";
+ $tplcontent.= ''."\n";
+ $tplcontent.= ''.dol_string_nohtmltag($objectpage->title, 0, 'UTF-8').' '."\n";
+ $tplcontent.= '';
+
+ // Title
+ print '';
+ $url='https://www.dolistore.com/43-web-site-templates';
+ print '';
+ print $langs->trans('DownloadMoreSkins');
+ print ' ';
+ print ' ';
+ print ''.$langs->trans("ThemeDir").' ';
+ print '';
+ foreach($dirthemes as $dirtheme)
+ {
+ echo '"'.$dirtheme.'" ';
+ }
+ print ' ';
+ print ' ';
+
+ print '';
+
+ print '';
+
+ $i=0;
+ foreach($dirthemes as $dir)
+ {
+ //print $dirroot.$dir;exit;
+ $dirtheme=DOL_DATA_ROOT.$dir; // This include loop on $conf->file->dol_document_root
+ if (is_dir($dirtheme))
+ {
+ $handle=opendir($dirtheme);
+ if (is_resource($handle))
+ {
+ while (($subdir = readdir($handle))!==false)
+ {
+ if (is_file($dirtheme."/".$subdir) && substr($subdir, 0, 1) <> '.'
+ && substr($subdir, 0, 3) <> 'CVS' && preg_match('/\.zip$/i', $subdir))
+ {
+ $subdirwithoutzip = preg_replace('/\.zip$/i', '', $subdir);
+
+ // Disable not stable themes (dir ends with _exp or _dev)
+ if ($conf->global->MAIN_FEATURES_LEVEL < 2 && preg_match('/_dev$/i', $subdir)) continue;
+ if ($conf->global->MAIN_FEATURES_LEVEL < 1 && preg_match('/_exp$/i', $subdir)) continue;
+
+ print '
';
+
+ $file=$dirtheme."/".$subdirwithoutzip.".jpg";
+ $url=DOL_URL_ROOT.'/viewimage.php?modulepart=doctemplateswebsite&file='.$subdirwithoutzip.".jpg";
+
+ if (! file_exists($file)) $url=DOL_URL_ROOT.'/public/theme/common/nophoto.png';
+ print '
';
+ print '
';
+ print $subdir.' ('.dol_print_size(dol_filesize($dirtheme."/".$subdir), 1, 1).')';
+ print '
ref.'&templateuserfile='.$subdir.'" class="button">'.$langs->trans("Load").' ';
+ print '
';
+
+ $i++;
+ }
+ }
+ }
+ }
+ }
+
+ print '
';
+
+ print '
';
+}
diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql
index 3a4ec85ec58..dcd874bdf3d 100644
--- a/htdocs/core/menus/init_menu_auguria.sql
+++ b/htdocs/core/menus/init_menu_auguria.sql
@@ -218,10 +218,10 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
-- insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->don->enabled && $leftmenu=="donations"', __HANDLER__, 'left', 2003__+MAX_llx_menu__, 'billing', '', 2000__+MAX_llx_menu__, '/don/stats/index.php?mainmenu=billing&leftmenu=donations', 'Statistics', 1, 'donations', '$user->rights->don->lire', '', 2, 2, __ENTITY__);
-- Special expenses
insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->tax->enabled || $conf->salaries->enabled || $conf->loan->enabled || $conf->banque->enabled', __HANDLER__, 'left', 2200__+MAX_llx_menu__, 'billing', 'tax', 6__+MAX_llx_menu__, '/compta/charges/index.php?mainmenu=billing&leftmenu=tax', 'MenuSpecialExpenses', 0, 'compta', '(! empty($conf->tax->enabled) && $user->rights->tax->charges->lire) || (! empty($conf->salaries->enabled) && ! empty($user->rights->salaries->read)) || (! empty($conf->loan->enabled) && $user->rights->loan->read) || (! empty($conf->banque->enabled) && $user->rights->banque->lire)', '', 0, 6, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->salaries->enabled', __HANDLER__, 'left', 2210__+MAX_llx_menu__, 'billing', 'tax_sal', 2200__+MAX_llx_menu__, '/compta/salaries/list.php?mainmenu=billing&leftmenu=tax_salary', 'Salaries', 1, 'salaries', '$user->rights->salaries->read', '', 0, 1, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->salaries->enabled && $leftmenu=="tax_salary"', __HANDLER__, 'left', 2211__+MAX_llx_menu__, 'billing', '', 2210__+MAX_llx_menu__, '/compta/salaries/card.php?mainmenu=billing&leftmenu=tax_salary&action=create', 'NewPayment', 2, 'companies', '$user->rights->salaries->write', '', 0, 2, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->salaries->enabled && $leftmenu=="tax_salary"', __HANDLER__, 'left', 2212__+MAX_llx_menu__, 'billing', '', 2210__+MAX_llx_menu__, '/compta/salaries/list.php?mainmenu=billing&leftmenu=tax_salary', 'Payments', 2, 'companies', '$user->rights->salaries->read', '', 0, 3, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->salaries->enabled && $leftmenu=="tax_salary"', __HANDLER__, 'left', 2213__+MAX_llx_menu__, 'billing', '', 2210__+MAX_llx_menu__, '/compta/salaries/stats/index.php?mainmenu=billing&leftmenu=tax_salary', 'Statistics', 2, 'companies', '$user->rights->salaries->read', '', 0, 4, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->salaries->enabled', __HANDLER__, 'left', 2210__+MAX_llx_menu__, 'billing', 'tax_sal', 2200__+MAX_llx_menu__, '/salaries/list.php?mainmenu=billing&leftmenu=tax_salary', 'Salaries', 1, 'salaries', '$user->rights->salaries->read', '', 0, 1, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->salaries->enabled && $leftmenu=="tax_salary"', __HANDLER__, 'left', 2211__+MAX_llx_menu__, 'billing', '', 2210__+MAX_llx_menu__, '/salaries/card.php?mainmenu=billing&leftmenu=tax_salary&action=create', 'NewPayment', 2, 'companies', '$user->rights->salaries->write', '', 0, 2, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->salaries->enabled && $leftmenu=="tax_salary"', __HANDLER__, 'left', 2212__+MAX_llx_menu__, 'billing', '', 2210__+MAX_llx_menu__, '/salaries/list.php?mainmenu=billing&leftmenu=tax_salary', 'Payments', 2, 'companies', '$user->rights->salaries->read', '', 0, 3, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->salaries->enabled && $leftmenu=="tax_salary"', __HANDLER__, 'left', 2213__+MAX_llx_menu__, 'billing', '', 2210__+MAX_llx_menu__, '/salaries/stats/index.php?mainmenu=billing&leftmenu=tax_salary', 'Statistics', 2, 'companies', '$user->rights->salaries->read', '', 0, 4, __ENTITY__);
insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->loan->enabled', __HANDLER__, 'left', 2220__+MAX_llx_menu__, 'billing', 'tax_loan', 2200__+MAX_llx_menu__, '/loan/list.php?mainmenu=billing&leftmenu=tax_loan', 'Loans', 1, 'loan', '$user->rights->loan->read', '', 0, 1, __ENTITY__);
insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->loan->enabled && $leftmenu=="tax_loan"', __HANDLER__, 'left', 2221__+MAX_llx_menu__, 'billing', '', 2220__+MAX_llx_menu__, '/loan/card.php?mainmenu=billing&leftmenu=tax_loan&action=create', 'NewLoan', 2, 'loan', '$user->rights->loan->write', '', 0, 2, __ENTITY__);
--insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->loan->enabled && $leftmenu=="tax_loan"', __HANDLER__, 'left', 2222__+MAX_llx_menu__, 'billing', '', 2220__+MAX_llx_menu__, '/loan/payment/list.php?mainmenu=billing&leftmenu=tax_loan', 'Payments', 2, 'companies', '$user->rights->loan->read', '', 0, 3, __ENTITY__);
@@ -281,6 +281,8 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2430__+MAX_llx_menu__, 'accountancy', 'bookkeeping', 2400__+MAX_llx_menu__, '/accountancy/bookkeeping/list.php?mainmenu=accountancy&leftmenu=accountancy_bookeeping', 'Bookkeeping', 1, 'accountancy', '$user->rights->accounting->mouvements->lire', '', 0, 15, __ENTITY__);
-- Balance
insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2435__+MAX_llx_menu__, 'accountancy', 'balance', 2400__+MAX_llx_menu__, '/accountancy/bookkeeping/balance.php?mainmenu=accountancy&leftmenu=accountancy_balance', 'AccountBalance', 1, 'accountancy', '$user->rights->accounting->mouvements->lire', '', 0, 16, __ENTITY__);
+ -- Export accounting documents
+ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2436__+MAX_llx_menu__, 'accountancy', 'accountancy_files', 2400__+MAX_llx_menu__, '/compta/compta-files.php?mainmenu=accountancy&leftmenu=accountancy_files', 'AccountantFiles', 1, 'accountancy', '$user->rights->accounting->mouvements->lire', '', 0, 17, __ENTITY__);
-- Reports
insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2440__+MAX_llx_menu__, 'accountancy', 'accountancy_report', 2400__+MAX_llx_menu__, '/compta/resultat/index.php?mainmenu=accountancy&leftmenu=accountancy_report', 'Reportings', 1, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 17, __ENTITY__);
insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_report"', __HANDLER__, 'left', 2441__+MAX_llx_menu__, 'accountancy', 'accountancy_report', 2440__+MAX_llx_menu__, '/compta/resultat/index.php?mainmenu=accountancy&leftmenu=accountancy_report', 'MenuReportInOut', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 18, __ENTITY__);
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 3073ffe6032..4596afc0bcf 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -1108,11 +1108,11 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
if (! empty($conf->salaries->enabled))
{
$langs->load("salaries");
- $newmenu->add("/compta/salaries/list.php?leftmenu=tax_salary&mainmenu=billing", $langs->trans("Salaries"), 1, $user->rights->salaries->read, '', $mainmenu, 'tax_salary');
+ $newmenu->add("/salaries/list.php?leftmenu=tax_salary&mainmenu=billing", $langs->trans("Salaries"), 1, $user->rights->salaries->read, '', $mainmenu, 'tax_salary');
if ($usemenuhider || empty($leftmenu) || preg_match('/^tax_salary/i', $leftmenu)) {
- $newmenu->add("/compta/salaries/card.php?leftmenu=tax_salary&action=create", $langs->trans("NewPayment"), 2, $user->rights->salaries->write);
- $newmenu->add("/compta/salaries/list.php?leftmenu=tax_salary", $langs->trans("Payments"), 2, $user->rights->salaries->read);
- $newmenu->add("/compta/salaries/stats/index.php?leftmenu=tax_salary", $langs->trans("Statistics"), 2, $user->rights->salaries->read);
+ $newmenu->add("/salaries/card.php?leftmenu=tax_salary&action=create", $langs->trans("NewPayment"), 2, $user->rights->salaries->write);
+ $newmenu->add("/salaries/list.php?leftmenu=tax_salary", $langs->trans("Payments"), 2, $user->rights->salaries->read);
+ $newmenu->add("/salaries/stats/index.php?leftmenu=tax_salary", $langs->trans("Statistics"), 2, $user->rights->salaries->read);
}
}
@@ -1285,9 +1285,9 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
$newmenu->add("/accountancy/bookkeeping/balance.php?mainmenu=accountancy&leftmenu=accountancy_accountancy", $langs->trans("AccountBalance"), 1, $user->rights->accounting->mouvements->lire);
// Files
- if (! empty($conf->global->MAIN_FEATURES_LEVEL) && $conf->global->MAIN_FEATURES_LEVEL >= 2)
+ if ((! empty($conf->global->MAIN_FEATURES_LEVEL) && $conf->global->MAIN_FEATURES_LEVEL >= 1) || ! empty($conf->global->ACCOUNTANCY_SHOW_EXPORT_FILES_MENU))
{
- $newmenu->add("/compta/compta-files.php?mainmenu=accountancy&leftmenu=accountancy_files", $langs->trans("AccountantFiles"), 1, $user->rights->accounting->mouvements->lire);
+ $newmenu->add("/compta/accounting-files.php?mainmenu=accountancy&leftmenu=accountancy_files", $langs->trans("AccountantFiles"), 1, $user->rights->accounting->mouvements->lire);
}
// Reports
@@ -1329,6 +1329,12 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
// Accountancy (simple)
if (! empty($conf->comptabilite->enabled))
{
+ // Files
+ if (! empty($conf->global->MAIN_FEATURES_LEVEL) && $conf->global->MAIN_FEATURES_LEVEL >= 1)
+ {
+ $newmenu->add("/compta/accounting-files.php?mainmenu=accountancy&leftmenu=accountancy_files", $langs->trans("AccountantFiles"), 0, $user->rights->compta->resultat->lire, '', $mainmenu, 'files');
+ }
+
// Bilan, resultats
$newmenu->add("/compta/resultat/index.php?leftmenu=report&mainmenu=accountancy", $langs->trans("Reportings"), 0, $user->rights->compta->resultat->lire, '', $mainmenu, 'ca');
@@ -1573,7 +1579,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
{
$langs->load("mrp");
- $newmenu->add("", $langs->trans("MenuBOM"), 0, $user->rights->service->lire, '', $mainmenu, 'service');
+ $newmenu->add("", $langs->trans("MenuBOM"), 0, $user->rights->bom->read, '', $mainmenu, 'bom');
$newmenu->add("/bom/bom_card.php?leftmenu=bom&action=create", $langs->trans("NewBOM"), 1, $user->rights->bom->write);
$newmenu->add("/bom/bom_list.php?leftmenu=bom", $langs->trans("List"), 1, $user->rights->bom->read);
}
diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index 9a695788b47..16d3969652d 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -1297,7 +1297,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
// For the moment, we manage this with hard coded exception
//print "Remove box ".$file.'
* Copyright (C) 2015 Marcos García
* Copyright (C) 2017 Ferran Marcet
- * Copyright (C) 2018 Frédéric France
+ * Copyright (C) 2018 Frédéric France
*
* 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
@@ -27,7 +27,7 @@
/**
* \file htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
* \ingroup commande
- * \brief Fichier de la classe permettant de generer les commandes au modele Eratosthène
+ * \brief File of Class to generate PDF orders with template Eratosthène
*/
require_once DOL_DOCUMENT_ROOT.'/core/modules/commande/modules_commande.php';
@@ -38,7 +38,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
/**
- * Classe to generate PDF orders with template Eratosthene
+ * Class to generate PDF orders with template Eratosthene
*/
class pdf_eratosthene extends ModelePDFCommandes
{
@@ -149,13 +149,13 @@ class pdf_eratosthene extends ModelePDFCommandes
$this->marge_haute =isset($conf->global->MAIN_PDF_MARGIN_TOP)?$conf->global->MAIN_PDF_MARGIN_TOP:10;
$this->marge_basse =isset($conf->global->MAIN_PDF_MARGIN_BOTTOM)?$conf->global->MAIN_PDF_MARGIN_BOTTOM:10;
- $this->option_logo = 1; // Affiche logo
- $this->option_tva = 1; // Gere option tva FACTURE_TVAOPTION
- $this->option_modereg = 1; // Affiche mode reglement
- $this->option_condreg = 1; // Affiche conditions reglement
- $this->option_codeproduitservice = 1; // Affiche code produit-service
- $this->option_multilang = 1; // Dispo en plusieurs langues
- $this->option_escompte = 0; // Affiche si il y a eu escompte
+ $this->option_logo = 1; // Display logo
+ $this->option_tva = 1; // Manage the vat option FACTURE_TVAOPTION
+ $this->option_modereg = 1; // Display payment mode
+ $this->option_condreg = 1; // Display payment terms
+ $this->option_codeproduitservice = 1; // Display product-service code
+ $this->option_multilang = 1; // Available in several languages
+ $this->option_escompte = 0; // Displays if there has been a discount
$this->option_credit_note = 0; // Support credit notes
$this->option_freetext = 1; // Support add of a personalised text
$this->option_draft_watermark = 1; // Support add of a watermark on drafts
@@ -194,7 +194,7 @@ class pdf_eratosthene extends ModelePDFCommandes
public function write_file($object, $outputlangs, $srctemplatepath = '', $hidedetails = 0, $hidedesc = 0, $hideref = 0)
{
// phpcs:enable
- global $user, $langs, $conf, $mysoc, $db, $hookmanager, $nblignes;
+ global $user, $langs, $conf, $mysoc, $db, $hookmanager, $nblines;
if (! is_object($outputlangs)) $outputlangs=$langs;
// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
@@ -203,7 +203,7 @@ class pdf_eratosthene extends ModelePDFCommandes
// Translations
$outputlangs->loadLangs(array("main", "dict", "companies", "bills", "products", "orders", "deliveries"));
- $nblignes = count($object->lines);
+ $nblines = count($object->lines);
$hidetop=0;
if(!empty($conf->global->MAIN_PDF_DISABLE_COL_HEAD_TITLE)){
@@ -217,7 +217,7 @@ class pdf_eratosthene extends ModelePDFCommandes
{
$objphoto = new Product($this->db);
- for ($i = 0 ; $i < $nblignes ; $i++)
+ for ($i = 0 ; $i < $nblines ; $i++)
{
if (empty($object->lines[$i]->fk_product)) continue;
@@ -541,7 +541,7 @@ class pdf_eratosthene extends ModelePDFCommandes
// Loop on each lines
$pageposbeforeprintlines=$pdf->getPage();
$pagenb = $pageposbeforeprintlines;
- for ($i = 0 ; $i < $nblignes ; $i++)
+ for ($i = 0 ; $i < $nblines ; $i++)
{
$curY = $nexY;
$pdf->SetFont('', '', $default_font_size - 1); // Into loop to work with multipage
@@ -599,7 +599,7 @@ class pdf_eratosthene extends ModelePDFCommandes
$posyafter=$pdf->GetY();
if ($posyafter > ($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))) // There is no space left for total+free text
{
- if ($i == ($nblignes-1)) // No more lines, and no space left to show total, so we create a new page
+ if ($i == ($nblines-1)) // No more lines, and no space left to show total, so we create a new page
{
$pdf->AddPage('', '', true);
if (! empty($tplidx)) $pdf->useTemplate($tplidx);
@@ -738,7 +738,7 @@ class pdf_eratosthene extends ModelePDFCommandes
$this->tva[$vatrate] += $tvaligne;
// Add line
- if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1))
+ if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1))
{
$pdf->setPage($pageposafter);
$pdf->SetLineStyle(array('dash'=>'1,1','color'=>array(80,80,80)));
@@ -747,7 +747,7 @@ class pdf_eratosthene extends ModelePDFCommandes
$pdf->SetLineStyle(array('dash'=>0));
}
- $nexY+=2; // Passe espace entre les lignes
+ $nexY+=2; // Add space between lines
// Detect if some page were added automatically and output _tableau for past pages
while ($pagenb < $pageposafter)
@@ -1352,6 +1352,8 @@ class pdf_eratosthene extends ModelePDFCommandes
}
}
+ // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+ // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
/**
* Show top header of page.
*
@@ -1362,8 +1364,9 @@ class pdf_eratosthene extends ModelePDFCommandes
* @param string $titlekey Translation key to show as title of document
* @return void
*/
- private function _pagehead(&$pdf, $object, $showaddress, $outputlangs, $titlekey = "PdfOrderTitle")
+ protected function _pagehead(&$pdf, $object, $showaddress, $outputlangs, $titlekey = "PdfOrderTitle")
{
+ // phpcs:enable
global $conf,$langs,$hookmanager;
// Translations
@@ -1564,6 +1567,8 @@ class pdf_eratosthene extends ModelePDFCommandes
return $top_shift;
}
+ // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+ // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
/**
* Show footer of page. Need this->emetteur object
*
@@ -1573,8 +1578,9 @@ class pdf_eratosthene extends ModelePDFCommandes
* @param int $hidefreetext 1=Hide free text
* @return int Return height of bottom margin including footer text
*/
- private function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
+ protected function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
{
+ // phpcs:enable
global $conf;
$showdetails=$conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
return pdf_pagefoot($pdf, $outputlangs, 'ORDER_FREE_TEXT', $this->emetteur, $this->marge_basse, $this->marge_gauche, $this->page_hauteur, $object, $showdetails, $hidefreetext);
diff --git a/htdocs/core/modules/commande/doc/pdf_proforma.modules.php b/htdocs/core/modules/commande/doc/pdf_proforma.modules.php
index f10f858544f..b6c7fe6d78f 100644
--- a/htdocs/core/modules/commande/doc/pdf_proforma.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_proforma.modules.php
@@ -25,7 +25,7 @@
/**
* \file htdocs/core/modules/commande/doc/pdf_proforma.modules.php
* \ingroup commande
- * \brief Fichier de la classe permettant de generer les commandes au modele Proforma
+ * \brief File of Class to generate PDF orders with template Proforma
*/
require_once DOL_DOCUMENT_ROOT.'/core/modules/commande/doc/pdf_einstein.modules.php';
@@ -36,7 +36,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
/**
- * Classe permettant de generer les commandes au modele Proforma
+ * Class to generate PDF orders with template Proforma
*/
class pdf_proforma extends pdf_einstein
{
@@ -57,6 +57,8 @@ class pdf_proforma extends pdf_einstein
}
+ // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+ // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
/**
* Show top header of page.
*
@@ -65,12 +67,13 @@ class pdf_proforma extends pdf_einstein
* @param int $showaddress 0=no, 1=yes
* @param Translate $outputlangs Object lang for output
* @param string $titlekey Translation key to show as title of document
- * @return void
+ * @return int Return topshift value
*/
- private function _pagehead(&$pdf, $object, $showaddress, $outputlangs, $titlekey = "InvoiceProForma")
+ protected function _pagehead(&$pdf, $object, $showaddress, $outputlangs, $titlekey = "InvoiceProForma")
{
+ // phpcs:enable
global $conf,$langs,$hookmanager;
- parent::_pagehead($pdf, $object, $showaddress, $outputlangs, $titlekey);
+ return parent::_pagehead($pdf, $object, $showaddress, $outputlangs, $titlekey);
}
}
diff --git a/htdocs/core/modules/commande/mod_commande_saphir.php b/htdocs/core/modules/commande/mod_commande_saphir.php
index 8c96c237a0f..892a279cbe8 100644
--- a/htdocs/core/modules/commande/mod_commande_saphir.php
+++ b/htdocs/core/modules/commande/mod_commande_saphir.php
@@ -52,7 +52,7 @@ class mod_commande_saphir extends ModeleNumRefCommandes
/**
- * Renvoi la description du modele de numerotation
+ * Returns the description of the numbering model
*
* @return string Texte descripif
*/
diff --git a/htdocs/core/modules/contract/doc/pdf_strato.modules.php b/htdocs/core/modules/contract/doc/pdf_strato.modules.php
index 97fedf45808..d358149d7cc 100644
--- a/htdocs/core/modules/contract/doc/pdf_strato.modules.php
+++ b/htdocs/core/modules/contract/doc/pdf_strato.modules.php
@@ -4,7 +4,7 @@
* Copyright (C) 2005-2012 Regis Houssin
* Copyright (C) 2008 Raphael Bertrand (Resultic)
* Copyright (C) 2011 Fabrice CHERRIER
- * Copyright (C) 2013-2018 Philippe Grand
+ * Copyright (C) 2013-2019 Philippe Grand
* Copyright (C) 2015 Marcos García
* Copyright (C) 2018 Frédéric France
*
@@ -144,13 +144,13 @@ class pdf_strato extends ModelePDFContract
$this->marge_haute =isset($conf->global->MAIN_PDF_MARGIN_TOP)?$conf->global->MAIN_PDF_MARGIN_TOP:10;
$this->marge_basse =isset($conf->global->MAIN_PDF_MARGIN_BOTTOM)?$conf->global->MAIN_PDF_MARGIN_BOTTOM:10;
- $this->option_logo = 1; // Affiche logo
- $this->option_tva = 0; // Gere option tva FACTURE_TVAOPTION
- $this->option_modereg = 0; // Affiche mode reglement
- $this->option_condreg = 0; // Affiche conditions reglement
- $this->option_codeproduitservice = 0; // Affiche code produit-service
- $this->option_multilang = 0; // Dispo en plusieurs langues
- $this->option_draft_watermark = 1; //Support add of a watermark on drafts
+ $this->option_logo = 1; // Display logo
+ $this->option_tva = 0; // Manage the vat option FACTURE_TVAOPTION
+ $this->option_modereg = 0; // Display payment mode
+ $this->option_condreg = 0; // Display payment terms
+ $this->option_codeproduitservice = 0; // Display product-service code
+ $this->option_multilang = 0; // Available in several languages
+ $this->option_draft_watermark = 1; // Support add of a watermark on drafts
// Get source company
$this->emetteur=$mysoc;
diff --git a/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php b/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
index 28e5addd2b2..9f94dd86867 100644
--- a/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
+++ b/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
@@ -414,7 +414,11 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
}
}
// Make substitutions into odt of thirdparty
- $tmparray=$this->get_substitutionarray_thirdparty($socobject, $outputlangs);
+ if ($socobject->element == 'contact') {
+ $tmparray = $this->get_substitutionarray_contact($socobject, $outputlangs);
+ } else {
+ $tmparray = $this->get_substitutionarray_thirdparty($socobject, $outputlangs);
+ }
foreach($tmparray as $key=>$value)
{
try {
diff --git a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
index 87f04dca016..5bcd6d153d0 100644
--- a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
@@ -168,7 +168,7 @@ class pdf_espadon extends ModelePdfExpedition
// Load traductions files requiredby by page
$outputlangs->loadLangs(array("main", "bills", "products", "dict", "companies", "propal", "deliveries", "sendings", "productbatch"));
- $nblignes = count($object->lines);
+ $nblines = count($object->lines);
// Loop on each lines to detect if there is at least one image to show
$realpatharray=array();
@@ -176,7 +176,7 @@ class pdf_espadon extends ModelePdfExpedition
{
$objphoto = new Product($this->db);
- for ($i = 0 ; $i < $nblignes ; $i++)
+ for ($i = 0 ; $i < $nblines ; $i++)
{
if (empty($object->lines[$i]->fk_product)) continue;
@@ -253,8 +253,8 @@ class pdf_espadon extends ModelePdfExpedition
global $action;
$reshook=$hookmanager->executeHooks('beforePDFCreation', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
- // Set nblignes with the new facture lines content after hook
- $nblignes = count($object->lines);
+ // Set nblines with the new facture lines content after hook
+ $nblines = count($object->lines);
$pdf=pdf_getInstance($this->format);
$default_font_size = pdf_getPDFFontSize($outputlangs);
@@ -404,7 +404,7 @@ class pdf_espadon extends ModelePdfExpedition
$nexY = $tab_top + $this->tabTitleHeight + 2;
// Loop on each lines
- for ($i = 0; $i < $nblignes; $i++)
+ for ($i = 0; $i < $nblines; $i++)
{
$curY = $nexY;
$pdf->SetFont('', '', $default_font_size - 1); // Into loop to work with multipage
@@ -464,7 +464,7 @@ class pdf_espadon extends ModelePdfExpedition
//var_dump($posyafter); var_dump(($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))); exit;
if ($posyafter > ($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforsignature+$heightforinfotot))) // There is no space left for total+free text
{
- if ($i == ($nblignes-1)) // No more lines, and no space left to show total, so we create a new page
+ if ($i == ($nblines-1)) // No more lines, and no space left to show total, so we create a new page
{
$pdf->AddPage('', '', true);
if (! empty($tplidx)) $pdf->useTemplate($tplidx);
@@ -548,7 +548,7 @@ class pdf_espadon extends ModelePdfExpedition
if ($weighttxt && $voltxt) $nexY+=2;
// Add line
- if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1))
+ if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1))
{
$pdf->setPage($pageposafter);
$pdf->SetLineStyle(array('dash'=>'1,1', 'color'=>array(80,80,80)));
diff --git a/htdocs/core/modules/expedition/doc/pdf_merou.modules.php b/htdocs/core/modules/expedition/doc/pdf_merou.modules.php
index 8696bc21a02..bd46fc5a75e 100644
--- a/htdocs/core/modules/expedition/doc/pdf_merou.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_merou.modules.php
@@ -3,7 +3,7 @@
* Copyright (C) 2005-2015 Laurent Destailleur
* Copyright (C) 2005-2011 Regis Houssin
* Copyright (C) 2013 Florian Henry
- * Copyright (C) 2015 Marcos García
+ * Copyright (C) 2015 Marcos García
*
* 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
@@ -23,7 +23,7 @@
/**
* \file htdocs/core/modules/expedition/doc/pdf_merou.modules.php
* \ingroup expedition
- * \brief Fichier de la classe permettant de generer les bordereaux envoi au modele Merou
+ * \brief Class file used to generate the dispatch slips for the Merou model
*/
require_once DOL_DOCUMENT_ROOT.'/core/modules/expedition/modules_expedition.php';
@@ -134,7 +134,7 @@ class pdf_merou extends ModelePdfExpedition
$this->marge_haute =isset($conf->global->MAIN_PDF_MARGIN_TOP)?$conf->global->MAIN_PDF_MARGIN_TOP:10;
$this->marge_basse =isset($conf->global->MAIN_PDF_MARGIN_BOTTOM)?$conf->global->MAIN_PDF_MARGIN_BOTTOM:10;
- $this->option_logo = 1;
+ $this->option_logo = 1; // Display logo
// Get source company
$this->emetteur=$mysoc;
@@ -222,7 +222,7 @@ class pdf_merou extends ModelePdfExpedition
global $action;
$reshook=$hookmanager->executeHooks('beforePDFCreation', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
- $nblignes = count($object->lines);
+ $nblines = count($object->lines);
$pdf=pdf_getInstance($this->format, 'mm', 'l');
$default_font_size = pdf_getPDFFontSize($outputlangs);
@@ -347,7 +347,7 @@ class pdf_merou extends ModelePdfExpedition
$pdf->MultiCell(30, 3, $object->lines[$i]->qty_shipped, 0, 'C', 0);
// Add line
- if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1))
+ if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1))
{
$pdf->setPage($pageposafter);
$pdf->SetLineStyle(array('dash'=>'1,1','color'=>array(80,80,80)));
@@ -356,7 +356,7 @@ class pdf_merou extends ModelePdfExpedition
$pdf->SetLineStyle(array('dash'=>0));
}
- $nexY+=2; // Passe espace entre les lignes
+ $nexY+=2; // Add space between lines
// Detect if some page were added automatically and output _tableau for past pages
while ($pagenb < $pageposafter)
diff --git a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
index e8de6ffdb73..8929b86a938 100644
--- a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
@@ -23,12 +23,13 @@
/**
* \file htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
* \ingroup expedition
- * \brief Fichier de la classe permettant de generer les bordereaux envoi au modele Rouget
+ * \brief Class file used to generate the dispatch slips for the Rouget model
*/
require_once DOL_DOCUMENT_ROOT.'/core/modules/expedition/modules_expedition.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
/**
@@ -133,7 +134,7 @@ class pdf_rouget extends ModelePdfExpedition
$this->marge_haute =isset($conf->global->MAIN_PDF_MARGIN_TOP)?$conf->global->MAIN_PDF_MARGIN_TOP:10;
$this->marge_basse =isset($conf->global->MAIN_PDF_MARGIN_BOTTOM)?$conf->global->MAIN_PDF_MARGIN_BOTTOM:10;
- $this->option_logo = 1;
+ $this->option_logo = 1; // Display logo
// Get source company
$this->emetteur=$mysoc;
@@ -197,7 +198,7 @@ class pdf_rouget extends ModelePdfExpedition
// Load traductions files requiredby by page
$outputlangs->loadLangs(array("main", "bills", "products", "dict", "companies", "propal", "deliveries", "sendings", "productbatch"));
- $nblignes = count($object->lines);
+ $nblines = count($object->lines);
// Loop on each lines to detect if there is at least one image to show
$realpatharray=array();
@@ -205,7 +206,7 @@ class pdf_rouget extends ModelePdfExpedition
{
$objphoto = new Product($this->db);
- for ($i = 0 ; $i < $nblignes ; $i++)
+ for ($i = 0 ; $i < $nblines ; $i++)
{
if (empty($object->lines[$i]->fk_product)) continue;
@@ -282,8 +283,8 @@ class pdf_rouget extends ModelePdfExpedition
global $action;
$reshook=$hookmanager->executeHooks('beforePDFCreation', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
- // Set nblignes with the new facture lines content after hook
- $nblignes = count($object->lines);
+ // Set nblines with the new facture lines content after hook
+ $nblines = count($object->lines);
$pdf=pdf_getInstance($this->format);
$default_font_size = pdf_getPDFFontSize($outputlangs);
@@ -423,7 +424,7 @@ class pdf_rouget extends ModelePdfExpedition
$nexY = $tab_top + 7;
// Loop on each lines
- for ($i = 0; $i < $nblignes; $i++)
+ for ($i = 0; $i < $nblines; $i++)
{
$curY = $nexY;
$pdf->SetFont('', '', $default_font_size - 1); // Into loop to work with multipage
@@ -481,7 +482,7 @@ class pdf_rouget extends ModelePdfExpedition
//var_dump($posyafter); var_dump(($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))); exit;
if ($posyafter > ($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))) // There is no space left for total+free text
{
- if ($i == ($nblignes-1)) // No more lines, and no space left to show total, so we create a new page
+ if ($i == ($nblines-1)) // No more lines, and no space left to show total, so we create a new page
{
$pdf->AddPage('', '', true);
if (! empty($tplidx)) $pdf->useTemplate($tplidx);
@@ -563,7 +564,7 @@ class pdf_rouget extends ModelePdfExpedition
if ($weighttxt && $voltxt) $nexY+=2;
// Add line
- if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1))
+ if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1))
{
$pdf->setPage($pageposafter);
$pdf->SetLineStyle(array('dash'=>'1,1','color'=>array(80,80,80)));
diff --git a/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php b/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
index 8bb3eaa7804..b85ca573188 100644
--- a/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
@@ -117,13 +117,13 @@ class pdf_standard extends ModeleExpenseReport
public $emetteur;
- /**
- * Constructor
- *
- * @param DoliDB $db Database handler
- */
- public function __construct($db)
- {
+ /**
+ * Constructor
+ *
+ * @param DoliDB $db Database handler
+ */
+ public function __construct($db)
+ {
global $conf, $langs, $mysoc, $user;
// Translations
@@ -172,12 +172,12 @@ class pdf_standard extends ModeleExpenseReport
$this->posxup=145;
$this->posxqty=168;
$this->postotalttc=178;
- // if (empty($conf->projet->enabled)) {
- // $this->posxtva-=20;
- // $this->posxup-=20;
- // $this->posxqty-=20;
- // $this->postotalttc-=20;
- // }
+ // if (empty($conf->projet->enabled)) {
+ // $this->posxtva-=20;
+ // $this->posxup-=20;
+ // $this->posxqty-=20;
+ // $this->postotalttc-=20;
+ // }
if ($this->page_largeur < 210) // To work with US executive format
{
$this->posxdate-=20;
@@ -196,19 +196,19 @@ class pdf_standard extends ModeleExpenseReport
}
- // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
- /**
- * Function to build pdf onto disk
- *
- * @param Object $object Object to generate
- * @param Translate $outputlangs Lang output object
- * @param string $srctemplatepath Full path of source filename for generator using a template file
- * @param int $hidedetails Do not show line details
- * @param int $hidedesc Do not show desc
- * @param int $hideref Do not show ref
- * @return int 1=OK, 0=KO
+ // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+ /**
+ * Function to build pdf onto disk
+ *
+ * @param Object $object Object to generate
+ * @param Translate $outputlangs Lang output object
+ * @param string $srctemplatepath Full path of source filename for generator using a template file
+ * @param int $hidedetails Do not show line details
+ * @param int $hidedesc Do not show desc
+ * @param int $hideref Do not show ref
+ * @return int 1=OK, 0=KO
*/
- public function write_file($object, $outputlangs, $srctemplatepath = '', $hidedetails = 0, $hidedesc = 0, $hideref = 0)
+ public function write_file($object, $outputlangs, $srctemplatepath = '', $hidedetails = 0, $hidedesc = 0, $hideref = 0)
{
// phpcs:enable
global $user, $langs, $conf, $mysoc, $db, $hookmanager;
@@ -220,7 +220,7 @@ class pdf_standard extends ModeleExpenseReport
// Load traductions files requiredby by page
$outputlangs->loadLangs(array("main", "trips", "projects", "dict", "bills", "banks"));
- $nblignes = count($object->lines);
+ $nblines = count($object->lines);
if ($conf->expensereport->dir_output) {
// Definition of $dir and $file
@@ -351,7 +351,7 @@ class pdf_standard extends ModeleExpenseReport
$nexY = $tab_top + 7;
// Loop on each lines
- for ($i = 0 ; $i < $nblignes ; $i++) {
+ for ($i = 0 ; $i < $nblines ; $i++) {
$pdf->SetFont('', '', $default_font_size - 2); // Into loop to work with multipage
$pdf->SetTextColor(0, 0, 0);
@@ -374,7 +374,7 @@ class pdf_standard extends ModeleExpenseReport
//var_dump($posyafter); var_dump(($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))); exit;
if ($posyafter > ($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))) {
// There is no space left for total+free text
- if ($i == ($nblignes-1)) {
+ if ($i == ($nblines-1)) {
// No more lines, and no space left to show total, so we create a new page
$pdf->AddPage('', '', true);
if (! empty($tplidx)) $pdf->useTemplate($tplidx);
@@ -400,8 +400,8 @@ class pdf_standard extends ModeleExpenseReport
$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
//$nblineFollowComment = 1;
- // Cherche nombre de lignes a venir pour savoir si place suffisante
- // if ($i < ($nblignes - 1)) // If it's not last line
+ // Search number of lines coming to know if there is enough room
+ // if ($i < ($nblines - 1)) // If it's not last line
// {
// //Fetch current description to know on which line the next one should be placed
// $follow_comment = $object->lines[$i]->comments;
@@ -414,8 +414,8 @@ class pdf_standard extends ModeleExpenseReport
// $nblineFollowComment = max($nbLineCommentNeed, $nbLineTypeNeed);
// }
- //$nexY+=$nblineFollowComment*($pdf->getFontSize()*1.3); // Passe espace entre les lignes
- $nexY += ($pdf->getFontSize()*1.3); // Passe espace entre les lignes
+ //$nexY+=$nblineFollowComment*($pdf->getFontSize()*1.3); // Add space between lines
+ $nexY += ($pdf->getFontSize()*1.3); // Add space between lines
// Detect if some page were added automatically and output _tableau for past pages
while ($pagenb < $pageposafter)
@@ -501,9 +501,9 @@ class pdf_standard extends ModeleExpenseReport
$posy=$this->tablePayments($pdf, $object, $posy_start_of_totals, $outputlangs);
}
- // Pied de page
+ // Page footer
$this->_pagefoot($pdf, $object, $outputlangs);
- if (method_exists($pdf, 'AliasNbPages')) $pdf->AliasNbPage();
+ if (method_exists($pdf, 'AliasNbPages')) $pdf->AliasNbPages();
$pdf->Close();
@@ -540,17 +540,17 @@ class pdf_standard extends ModeleExpenseReport
}
}
- /**
- * @param TCPDF $pdf Object PDF
- * @param Object $object Object to show
- * @param int $linenumber line number
- * @param int $curY current y position
- * @param int $default_font_size default siez of font
- * @param Translate $outputlangs Object lang for output
- * @param int $hidedetails Hide details (0=no, 1=yes, 2=just special lines)
- * @return void
- */
- private function printLine(&$pdf, $object, $linenumber, $curY, $default_font_size, $outputlangs, $hidedetails = 0)
+ /**
+ * @param TCPDF $pdf Object PDF
+ * @param Object $object Object to show
+ * @param int $linenumber line number
+ * @param int $curY current y position
+ * @param int $default_font_size default siez of font
+ * @param Translate $outputlangs Object lang for output
+ * @param int $hidedetails Hide details (0=no, 1=yes, 2=just special lines)
+ * @return void
+ */
+ private function printLine(&$pdf, $object, $linenumber, $curY, $default_font_size, $outputlangs, $hidedetails = 0)
{
global $conf;
$pdf->SetFont('', '', $default_font_size - 1);
@@ -618,7 +618,7 @@ class pdf_standard extends ModeleExpenseReport
}
$comment .= $object->lines[$linenumber]->comments;
$pdf->writeHTMLCell($this->posxtva-$this->posxcomment-0.8, 4, $this->posxcomment-1, $curY, $comment, 0, 1);
- }
+ }
/**
* Show top header of page.
@@ -846,7 +846,7 @@ class pdf_standard extends ModeleExpenseReport
}
}
}
- }
+ }
/**
* Show table for lines
@@ -1024,6 +1024,7 @@ class pdf_standard extends ModeleExpenseReport
if ($resql)
{
$num = $this->db->num_rows($resql);
+ $totalpaid = 0;
$i=0;
while ($i < $num) {
$y+=$tab3_height;
diff --git a/htdocs/core/modules/expensereport/mod_expensereport_sand.php b/htdocs/core/modules/expensereport/mod_expensereport_sand.php
index c0a5aa0a031..5217e2dc1c3 100644
--- a/htdocs/core/modules/expensereport/mod_expensereport_sand.php
+++ b/htdocs/core/modules/expensereport/mod_expensereport_sand.php
@@ -55,7 +55,7 @@ class mod_expensereport_sand extends ModeleNumRefExpenseReport
/**
- * Renvoi la description du modele de numerotation
+ * Returns the description of the numbering model
*
* @return string Texte descripif
*/
diff --git a/htdocs/core/modules/export/export_csv.modules.php b/htdocs/core/modules/export/export_csv.modules.php
index c3c8431962e..9d606aadc33 100644
--- a/htdocs/core/modules/export/export_csv.modules.php
+++ b/htdocs/core/modules/export/export_csv.modules.php
@@ -261,6 +261,9 @@ class ExportCsv extends ModeleExports
}
$this->col=0;
+
+ $reg=array();
+
foreach($array_selected_sorted as $code => $value)
{
if (strpos($code, ' as ') == 0) $alias=str_replace(array('.','-','(',')'), '_', $code);
diff --git a/htdocs/core/modules/export/export_excel.modules.php b/htdocs/core/modules/export/export_excel.modules.php
index ffb1fd83cce..0e7fd0f1169 100644
--- a/htdocs/core/modules/export/export_excel.modules.php
+++ b/htdocs/core/modules/export/export_excel.modules.php
@@ -345,6 +345,8 @@ class ExportExcel extends ModeleExports
// Define first row
$this->col=0;
+ $reg=array();
+
foreach($array_selected_sorted as $code => $value)
{
if (strpos($code, ' as ') == 0) $alias=str_replace(array('.','-','(',')'), '_', $code);
diff --git a/htdocs/core/modules/export/export_excel2007new.modules.php b/htdocs/core/modules/export/export_excel2007new.modules.php
index 266cedc1310..038446643a2 100644
--- a/htdocs/core/modules/export/export_excel2007new.modules.php
+++ b/htdocs/core/modules/export/export_excel2007new.modules.php
@@ -304,6 +304,8 @@ class ExportExcel2007new extends ModeleExports
// Define first row
$this->col=0;
+ $reg=array();
+
foreach($array_selected_sorted as $code => $value)
{
if (strpos($code, ' as ') == 0) $alias=str_replace(array('.','-','(',')'), '_', $code);
diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
index de1ebc00a8b..acc88a1e96a 100644
--- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
@@ -160,13 +160,13 @@ class pdf_crabe extends ModelePDFFactures
$this->marge_haute =isset($conf->global->MAIN_PDF_MARGIN_TOP)?$conf->global->MAIN_PDF_MARGIN_TOP:10;
$this->marge_basse =isset($conf->global->MAIN_PDF_MARGIN_BOTTOM)?$conf->global->MAIN_PDF_MARGIN_BOTTOM:10;
- $this->option_logo = 1; // Affiche logo
- $this->option_tva = 1; // Gere option tva FACTURE_TVAOPTION
- $this->option_modereg = 1; // Affiche mode reglement
- $this->option_condreg = 1; // Affiche conditions reglement
- $this->option_codeproduitservice = 1; // Affiche code produit-service
- $this->option_multilang = 1; // Dispo en plusieurs langues
- $this->option_escompte = 1; // Affiche si il y a eu escompte
+ $this->option_logo = 1; // Display logo
+ $this->option_tva = 1; // Manage the vat option FACTURE_TVAOPTION
+ $this->option_modereg = 1; // Display payment mode
+ $this->option_condreg = 1; // Display payment terms
+ $this->option_codeproduitservice = 1; // Display product-service code
+ $this->option_multilang = 1; // Available in several languages
+ $this->option_escompte = 1; // Displays if there has been a discount
$this->option_credit_note = 1; // Support credit notes
$this->option_freetext = 1; // Support add of a personalised text
$this->option_draft_watermark = 1; // Support add of a watermark on drafts
@@ -235,7 +235,9 @@ class pdf_crabe extends ModelePDFFactures
public function write_file($object, $outputlangs, $srctemplatepath = '', $hidedetails = 0, $hidedesc = 0, $hideref = 0)
{
// phpcs:enable
- global $user,$langs,$conf,$mysoc,$db,$hookmanager,$nblignes;
+ global $user,$langs,$conf,$mysoc,$db,$hookmanager,$nblines;
+
+ dol_syslog("write_file outputlangs->defaultlang=".(is_object($outputlangs) ? $outputlangs->defaultlang : 'null'));
if (! is_object($outputlangs)) $outputlangs=$langs;
// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
@@ -244,13 +246,13 @@ class pdf_crabe extends ModelePDFFactures
// Load traductions files requiredby by page
$outputlangs->loadLangs(array("main", "bills", "products", "dict", "companies"));
- $nblignes = count($object->lines);
+ $nblines = count($object->lines);
// Loop on each lines to detect if there is at least one image to show
$realpatharray=array();
if (! empty($conf->global->MAIN_GENERATE_INVOICES_WITH_PICTURE))
{
- for ($i = 0 ; $i < $nblignes ; $i++)
+ for ($i = 0 ; $i < $nblines ; $i++)
{
if (empty($object->lines[$i]->fk_product)) continue;
@@ -316,8 +318,8 @@ class pdf_crabe extends ModelePDFFactures
global $action;
$reshook=$hookmanager->executeHooks('beforePDFCreation', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
- // Set nblignes with the new facture lines content after hook
- $nblignes = count($object->lines);
+ // Set nblines with the new facture lines content after hook
+ $nblines = count($object->lines);
$nbpayments = count($object->getListOfPayments());
// Create pdf instance
@@ -358,7 +360,7 @@ class pdf_crabe extends ModelePDFFactures
$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
// Positionne $this->atleastonediscount si on a au moins une remise
- for ($i = 0 ; $i < $nblignes ; $i++)
+ for ($i = 0 ; $i < $nblines ; $i++)
{
if ($object->lines[$i]->remise_percent)
{
@@ -465,7 +467,7 @@ class pdf_crabe extends ModelePDFFactures
$nexY = $tab_top + 7;
// Loop on each lines
- for ($i = 0; $i < $nblignes; $i++)
+ for ($i = 0; $i < $nblines; $i++)
{
$curY = $nexY;
$pdf->SetFont('', '', $default_font_size - 1); // Into loop to work with multipage
@@ -521,7 +523,7 @@ class pdf_crabe extends ModelePDFFactures
//var_dump($posyafter); var_dump(($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))); exit;
if ($posyafter > ($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))) // There is no space left for total+free text
{
- if ($i == ($nblignes-1)) // No more lines, and no space left to show total, so we create a new page
+ if ($i == ($nblines-1)) // No more lines, and no space left to show total, so we create a new page
{
$pdf->AddPage('', '', true);
if (! empty($tplidx)) $pdf->useTemplate($tplidx);
@@ -650,7 +652,7 @@ class pdf_crabe extends ModelePDFFactures
if ($posYAfterImage > $posYAfterDescription) $nexY=$posYAfterImage;
// Add line
- if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1))
+ if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1))
{
$pdf->setPage($pageposafter);
$pdf->SetLineStyle(array('dash'=>'1,1','color'=>array(80,80,80)));
@@ -659,7 +661,7 @@ class pdf_crabe extends ModelePDFFactures
$pdf->SetLineStyle(array('dash'=>0));
}
- $nexY+=2; // Passe espace entre les lignes
+ $nexY+=2; // Add space between lines
// Detect if some page were added automatically and output _tableau for past pages
while ($pagenb < $pageposafter)
@@ -1345,6 +1347,50 @@ class pdf_crabe extends ModelePDFFactures
$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
$pdf->MultiCell($largcol2, $tab2_hl, price($sign * $total_ttc, 0, $outputlangs), $useborder, 'R', 1);
+
+ // Retained warranty
+ if( !empty($object->situation_final) && ( $object->type == Facture::TYPE_SITUATION && (!empty($object->retained_warranty) ) ) )
+ {
+ $displayWarranty = false;
+
+ // Check if this situation invoice is 100% for real
+ if(!empty($object->lines)){
+ $displayWarranty = true;
+ foreach($object->lines as $i => $line){
+ if($line->product_type < 2 && $line->situation_percent < 100){
+ $displayWarranty = false;
+ break;
+ }
+ }
+ }
+
+ if($displayWarranty){
+ $pdf->SetTextColor(40, 40, 40);
+ $pdf->SetFillColor(255, 255, 255);
+
+ $retainedWarranty = $object->total_ttc * $object->retained_warranty / 100;
+ $billedWithRetainedWarranty = $object->total_ttc - $retainedWarranty ;
+
+ // Billed - retained warranty
+ $index++;
+ $pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+ $pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("ToPayOn", dol_print_date($object->date_lim_reglement, 'day')), $useborder, 'L', 1);
+
+ $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
+ $pdf->MultiCell($largcol2, $tab2_hl, price($billedWithRetainedWarranty), $useborder, 'R', 1);
+
+ // retained warranty
+ $index++;
+ $pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+
+ $retainedWarrantyToPayOn = $outputlangs->transnoentities("RetainedWarranty") . ' ('.$object->retained_warranty.'%)';
+ $retainedWarrantyToPayOn.= !empty($object->retained_warranty_date_limit)?' '.$outputlangs->transnoentities("toPayOn", dol_print_date($object->retained_warranty_date_limit, 'day')):'';
+
+ $pdf->MultiCell($col2x-$col1x, $tab2_hl, $retainedWarrantyToPayOn, $useborder, 'L', 1);
+ $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
+ $pdf->MultiCell($largcol2, $tab2_hl, price($retainedWarranty), $useborder, 'R', 1);
+ }
+ }
}
}
diff --git a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
index 9c7c7797841..26e2b1824d8 100644
--- a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
@@ -160,13 +160,13 @@ class pdf_sponge extends ModelePDFFactures
$this->marge_haute =isset($conf->global->MAIN_PDF_MARGIN_TOP)?$conf->global->MAIN_PDF_MARGIN_TOP:10;
$this->marge_basse =isset($conf->global->MAIN_PDF_MARGIN_BOTTOM)?$conf->global->MAIN_PDF_MARGIN_BOTTOM:10;
- $this->option_logo = 1; // Affiche logo
- $this->option_tva = 1; // Gere option tva FACTURE_TVAOPTION
- $this->option_modereg = 1; // Affiche mode reglement
- $this->option_condreg = 1; // Affiche conditions reglement
- $this->option_codeproduitservice = 1; // Affiche code produit-service
- $this->option_multilang = 1; // Dispo en plusieurs langues
- $this->option_escompte = 1; // Affiche si il y a eu escompte
+ $this->option_logo = 1; // Display logo
+ $this->option_tva = 1; // Manage the vat option FACTURE_TVAOPTION
+ $this->option_modereg = 1; // Display payment mode
+ $this->option_condreg = 1; // Display payment terms
+ $this->option_codeproduitservice = 1; // Display product-service code
+ $this->option_multilang = 1; // Available in several languages
+ $this->option_escompte = 1; // Displays if there has been a discount
$this->option_credit_note = 1; // Support credit notes
$this->option_freetext = 1; // Support add of a personalised text
$this->option_draft_watermark = 1; // Support add of a watermark on drafts
@@ -209,7 +209,7 @@ class pdf_sponge extends ModelePDFFactures
public function write_file($object, $outputlangs, $srctemplatepath = '', $hidedetails = 0, $hidedesc = 0, $hideref = 0)
{
// phpcs:enable
- global $user,$langs,$conf,$mysoc,$db,$hookmanager,$nblignes;
+ global $user,$langs,$conf,$mysoc,$db,$hookmanager,$nblines;
if (! is_object($outputlangs)) $outputlangs=$langs;
// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
@@ -218,7 +218,7 @@ class pdf_sponge extends ModelePDFFactures
// Translations
$outputlangs->loadLangs(array("main", "bills", "products", "dict", "companies"));
- $nblignes = count($object->lines);
+ $nblines = count($object->lines);
$hidetop=0;
if(!empty($conf->global->MAIN_PDF_DISABLE_COL_HEAD_TITLE)){
@@ -232,7 +232,7 @@ class pdf_sponge extends ModelePDFFactures
{
$objphoto = new Product($this->db);
- for ($i = 0 ; $i < $nblignes ; $i++)
+ for ($i = 0 ; $i < $nblines ; $i++)
{
if (empty($object->lines[$i]->fk_product)) continue;
@@ -329,8 +329,8 @@ class pdf_sponge extends ModelePDFFactures
global $action;
$reshook=$hookmanager->executeHooks('beforePDFCreation', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
- // Set nblignes with the new facture lines content after hook
- $nblignes = count($object->lines);
+ // Set nblines with the new facture lines content after hook
+ $nblines = count($object->lines);
$nbpayments = count($object->getListOfPayments());
// Create pdf instance
@@ -449,7 +449,7 @@ class pdf_sponge extends ModelePDFFactures
complete_substitutions_array($substitutionarray, $outputlangs, $object);
$notetoshow = make_substitutions($notetoshow, $substitutionarray, $outputlangs);
$notetoshow = convertBackOfficeMediasLinksToPublicLinks($notetoshow);
-
+
$pdf->startTransaction();
$pdf->SetFont('', '', $default_font_size - 1);
@@ -572,7 +572,7 @@ class pdf_sponge extends ModelePDFFactures
// Loop on each lines
$pageposbeforeprintlines=$pdf->getPage();
$pagenb = $pageposbeforeprintlines;
- for ($i = 0; $i < $nblignes; $i++)
+ for ($i = 0; $i < $nblines; $i++)
{
$curY = $nexY;
@@ -630,7 +630,7 @@ class pdf_sponge extends ModelePDFFactures
//var_dump($posyafter); var_dump(($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))); exit;
if ($posyafter > ($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))) // There is no space left for total+free text
{
- if ($i == ($nblignes-1)) // No more lines, and no space left to show total, so we create a new page
+ if ($i == ($nblines-1)) // No more lines, and no space left to show total, so we create a new page
{
$pdf->AddPage('', '', true);
if (! empty($tplidx)) $pdf->useTemplate($tplidx);
@@ -782,7 +782,7 @@ class pdf_sponge extends ModelePDFFactures
$nexY = max($nexY, $posYAfterImage);
// Add line
- if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1))
+ if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1))
{
$pdf->setPage($pageposafter);
$pdf->SetLineStyle(array('dash'=>'1,1','color'=>array(80,80,80)));
@@ -791,7 +791,7 @@ class pdf_sponge extends ModelePDFFactures
$pdf->SetLineStyle(array('dash'=>0));
}
- $nexY+=2; // Passe espace entre les lignes
+ $nexY+=2; // Add space between lines
// Detect if some page were added automatically and output _tableau for past pages
while ($pagenb < $pageposafter)
@@ -1225,13 +1225,172 @@ class pdf_sponge extends ModelePDFFactures
$useborder=0;
$index = 0;
+
+
+ // pourcentage global d'avancement
+ $percent = 0;
+ $i=0;
+ foreach ($object->lines as $line)
+ {
+ if(!class_exists('TSubtotal') || !TSubtotal::isModSubtotalLine($line)){
+ $percent += $line->situation_percent;
+ $i++;
+ }
+ }
+ if(!empty($i)){
+ $avancementGlobal = $percent/$i;
+ }
+ else{
+ $avancementGlobal = 0;
+ }
+
+ $object->fetchPreviousNextSituationInvoice();
+ $TPreviousIncoice = $object->tab_previous_situation_invoice;
+
+ $total_a_payer = 0;
+ $total_a_payer_ttc = 0;
+ foreach ($TPreviousIncoice as &$fac){
+ $total_a_payer += $fac->total_ht;
+ $total_a_payer_ttc += $fac->total_ttc;
+ }
+ $total_a_payer += $object->total_ht;
+ $total_a_payer_ttc += $object->total_ttc;
+
+ if(!empty($avancementGlobal)){
+ $total_a_payer = $total_a_payer * 100 / $avancementGlobal;
+ $total_a_payer_ttc = $total_a_payer_ttc * 100 / $avancementGlobal;
+ }
+ else{
+ $total_a_payer = 0;
+ $total_a_payer_ttc = 0;
+ }
+
+ $deja_paye = 0;
+ $i = 1;
+ if(!empty($TPreviousIncoice)){
+
+ $pdf->setY($tab2_top);
+ $posy = $pdf->GetY();
+
+
+
+
+ foreach ($TPreviousIncoice as &$fac){
+
+ if($posy > $this->page_hauteur - 4 ) {
+ $this->_pagefoot($pdf, $object, $outputlangs, 1);
+ $pdf->addPage();
+ $pdf->setY($this->marge_haute);
+ $posy = $pdf->GetY();
+ }
+
+ // cumul TVA précédent
+ $index++;
+ $pdf->SetFillColor(255, 255, 255);
+ $pdf->SetXY($col1x, $posy);
+ $pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("PDFSituationTitle", $fac->situation_counter).' '.$outputlangs->transnoentities("TotalHT"), 0, 'L', 1);
+
+ $pdf->SetXY($col2x, $posy);
+
+ $facSign = '';
+ if($i>1){
+ $facSign = $fac->total_ht>=0?'+':'';
+ }
+
+ $displayAmount = ' '.$facSign.' '.price($fac->total_ht, 0, $outputlangs);
+
+ $pdf->MultiCell($largcol2, $tab2_hl, $displayAmount, 0, 'R', 1);
+
+ $i++;
+ $deja_paye += $fac->total_ht;
+ $posy += $tab2_hl;
+
+ $pdf->setY($posy);
+ }
+
+ // Display curent total
+ $pdf->SetFillColor(255, 255, 255);
+ $pdf->SetXY($col1x, $posy);
+ $pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("PDFSituationTitle", $object->situation_counter).' '.$outputlangs->transnoentities("TotalHT"), 0, 'L', 1);
+
+ $pdf->SetXY($col2x, $posy);
+ $facSign = '';
+ if($i>1){
+ $facSign = $object->total_ht>=0?'+':''; // gestion d'un cas particulier client
+ }
+
+ if($fac->type === facture::TYPE_CREDIT_NOTE){
+ $facSign = '-'; // les avoirs
+ }
+
+
+ $displayAmount = ' '.$facSign.' '.price($object->total_ht, 0, $outputlangs);
+ $pdf->MultiCell($largcol2, $tab2_hl, $displayAmount, 0, 'R', 1);
+
+ $posy += $tab2_hl;
+
+ // Display all total
+ $pdf->SetFont('', '', $default_font_size - 1);
+ $pdf->SetFillColor(255, 255, 255);
+ $pdf->SetXY($col1x, $posy);
+ $pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("SituationTotalProgress", $avancementGlobal), 0, 'L', 1);
+
+ $pdf->SetXY($col2x, $posy);
+ $pdf->MultiCell($largcol2, $tab2_hl, price($total_a_payer*$avancementGlobal/100, 0, $outputlangs), 0, 'R', 1);
+ $pdf->SetFont('', '', $default_font_size - 2);
+
+ $posy += $tab2_hl;
+
+ if($posy > $this->page_hauteur - 4 ) {
+ $pdf->addPage();
+ $pdf->setY($this->marge_haute);
+ $posy = $pdf->GetY();
+ }
+
+ $tab2_top = $posy;
+ $index=0;
+ }
+
+ $tab2_top += 3;
+
+ // Get Total HT
+ $total_ht = ($conf->multicurrency->enabled && $object->mylticurrency_tx != 1 ? $object->multicurrency_total_ht : $object->total_ht);
+
+ // Total remise
+ $total_line_remise=0;
+ foreach($object->lines as $i => $line) {
+ $total_line_remise+= pdfGetLineTotalDiscountAmount($object, $i, $outputlangs, 2); // TODO: add this methode to core/lib/pdf.lib
+ // Gestion remise sous forme de ligne négative
+ if($line->total_ht < 0) $total_line_remise += -$line->total_ht;
+ }
+ if($total_line_remise > 0) {
+ if (! empty($conf->global->MAIN_SHOW_AMOUNT_DISCOUNT)) {
+ $pdf->SetFillColor(255, 255, 255);
+ $pdf->SetXY($col1x, $tab2_top + $tab2_hl);
+ $pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("TotalDiscount"), 0, 'L', 1);
+ $pdf->SetXY($col2x, $tab2_top + $tab2_hl);
+ $pdf->MultiCell($largcol2, $tab2_hl, price($total_line_remise, 0, $outputlangs), 0, 'R', 1);
+
+ $index++;
+ }
+ // Show total NET before discount
+ if (! empty($conf->global->MAIN_SHOW_AMOUNT_BEFORE_DISCOUNT)) {
+ $pdf->SetFillColor(255, 255, 255);
+ $pdf->SetXY($col1x, $tab2_top + 0);
+ $pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("TotalHTBeforeDiscount"), 0, 'L', 1);
+ $pdf->SetXY($col2x, $tab2_top + 0);
+ $pdf->MultiCell($largcol2, $tab2_hl, price($total_line_remise + $total_ht, 0, $outputlangs), 0, 'R', 1);
+
+ $index++;
+ }
+ }
+
// Total HT
$pdf->SetFillColor(255, 255, 255);
- $pdf->SetXY($col1x, $tab2_top + 0);
+ $pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT"), 0, 'L', 1);
- $total_ht = ($conf->multicurrency->enabled && $object->mylticurrency_tx != 1 ? $object->multicurrency_total_ht : $object->total_ht);
- $pdf->SetXY($col2x, $tab2_top + 0);
+ $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
$pdf->MultiCell($largcol2, $tab2_hl, price($sign * ($total_ht + (! empty($object->remise)?$object->remise:0)), 0, $outputlangs), 0, 'R', 1);
// Show VAT by rates and total
@@ -1256,7 +1415,7 @@ class pdf_sponge extends ModelePDFFactures
//{
foreach($this->localtax1 as $localtax_type => $localtax_rate)
{
- if (in_array((string) $localtax_type, array('1','3','5'))) continue;
+ if (in_array((string) $localtax_type, array('1', '3', '5'))) continue;
foreach($localtax_rate as $tvakey => $tvaval)
{
@@ -1330,7 +1489,14 @@ class pdf_sponge extends ModelePDFFactures
}
if($sum_pdf_tva!=$object->total_tva) { // apply coef to recover the VAT object amount (the good one)
- $coef_fix_tva = $object->total_tva / $sum_pdf_tva;
+ if(!empty($sum_pdf_tva))
+ {
+ $coef_fix_tva = $object->total_tva / $sum_pdf_tva;
+ }
+ else {
+ $coef_fix_tva = 1;
+ }
+
foreach($this->tva as $tvakey => $tvaval) {
$this->tva[$tvakey]=$tvaval * $coef_fix_tva;
@@ -1427,7 +1593,7 @@ class pdf_sponge extends ModelePDFFactures
}
}
}
- //}
+
// Revenue stamp
if (price2num($object->revenuestamp) != 0)
@@ -1449,6 +1615,69 @@ class pdf_sponge extends ModelePDFFactures
$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
$pdf->MultiCell($largcol2, $tab2_hl, price($sign * $total_ttc, 0, $outputlangs), $useborder, 'R', 1);
+
+
+ /*if($object->type == Facture::TYPE_SITUATION)
+ {
+ // reste à payer total
+ $index++;
+
+ $pdf->SetFont('','', $default_font_size - 1);
+ $pdf->SetFillColor(255,255,255);
+ $pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+ $pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities('SituationTotalRayToRest'), 0, 'L', 1);
+ $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
+ $pdf->MultiCell($largcol2, $tab2_hl, price($total_a_payer_ttc-$deja_paye, 0, $outputlangs), 0, 'R', 1);
+ }*/
+
+
+ // Retained warranty
+ if( !empty($object->situation_final) && ( $object->type == Facture::TYPE_SITUATION && (!empty($object->retained_warranty) ) ) )
+ {
+ $displayWarranty = false;
+
+ // Check if this situation invoice is 100% for real
+ if(!empty($object->situation_final)){
+ $displayWarranty = true;
+ }
+ elseif(!empty($object->lines) && $object->status == Facture::STATUS_DRAFT ){
+ // $object->situation_final need validation to be done so this test is need for draft
+ $displayWarranty = true;
+ foreach($object->lines as $i => $line){
+ if($line->product_type < 2 && $line->situation_percent < 100){
+ $displayWarranty = false;
+ break;
+ }
+ }
+ }
+
+ if($displayWarranty){
+ $pdf->SetTextColor(40, 40, 40);
+ $pdf->SetFillColor(255, 255, 255);
+
+ $retainedWarranty = $total_a_payer_ttc * $object->retained_warranty / 100;
+ $billedWithRetainedWarranty = $object->total_ttc - $retainedWarranty ;
+
+ // Billed - retained warranty
+ $index++;
+ $pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+ $pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("PDFEVOLToPayOn", dol_print_date($object->date_lim_reglement, 'day')), $useborder, 'L', 1);
+
+ $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
+ $pdf->MultiCell($largcol2, $tab2_hl, price($billedWithRetainedWarranty), $useborder, 'R', 1);
+
+ // retained warranty
+ $index++;
+ $pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+
+ $retainedWarrantyToPayOn = $outputlangs->transnoentities("PDFEVOLRetainedWarranty") . ' ('.$object->retained_warranty.'%)';
+ $retainedWarrantyToPayOn.= !empty($object->retained_warranty_date_limit)?' '.$outputlangs->transnoentities("PDFEVOLtoPayOn", dol_print_date($object->retained_warranty_date_limit, 'day')):'';
+
+ $pdf->MultiCell($col2x-$col1x, $tab2_hl, $retainedWarrantyToPayOn, $useborder, 'L', 1);
+ $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
+ $pdf->MultiCell($largcol2, $tab2_hl, price($retainedWarranty), $useborder, 'R', 1);
+ }
+ }
}
}
@@ -1456,7 +1685,7 @@ class pdf_sponge extends ModelePDFFactures
$creditnoteamount=$object->getSumCreditNotesUsed(($conf->multicurrency->enabled && $object->multicurrency_tx != 1) ? 1 : 0);
$depositsamount=$object->getSumDepositsUsed(($conf->multicurrency->enabled && $object->multicurrency_tx != 1) ? 1 : 0);
- //print "x".$creditnoteamount."-".$depositsamount;exit;
+
$resteapayer = price2num($total_ttc - $deja_regle - $creditnoteamount - $depositsamount, 'MT');
if ($object->paye) $resteapayer=0;
@@ -1509,6 +1738,20 @@ class pdf_sponge extends ModelePDFFactures
return ($tab2_top + ($tab2_hl * $index));
}
+ // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+ /**
+ * Return list of active generation modules
+ *
+ * @param DoliDB $db Database handler
+ * @param integer $maxfilenamelength Max length of value to show
+ * @return array List of templates
+ */
+ public static function liste_modeles($db, $maxfilenamelength = 0)
+ {
+ // phpcs:enable
+ return parent::liste_modeles($db, $maxfilenamelength); // TODO: Change the autogenerated stub
+ }
+
/**
* Show table for lines
*
diff --git a/htdocs/core/modules/facture/mod_facture_mars.php b/htdocs/core/modules/facture/mod_facture_mars.php
index 752a80669c5..4c9d249d6c8 100644
--- a/htdocs/core/modules/facture/mod_facture_mars.php
+++ b/htdocs/core/modules/facture/mod_facture_mars.php
@@ -62,7 +62,7 @@ class mod_facture_mars extends ModeleNumRefFactures
}
/**
- * Renvoi la description du modele de numerotation
+ * Returns the description of the numbering model
*
* @return string Texte descripif
*/
diff --git a/htdocs/core/modules/facture/mod_facture_mercure.php b/htdocs/core/modules/facture/mod_facture_mercure.php
index 8c921d982bf..992a90b9731 100644
--- a/htdocs/core/modules/facture/mod_facture_mercure.php
+++ b/htdocs/core/modules/facture/mod_facture_mercure.php
@@ -46,7 +46,7 @@ class mod_facture_mercure extends ModeleNumRefFactures
/**
- * Renvoi la description du modele de numerotation
+ * Returns the description of the numbering model
*
* @return string Texte descripif
*/
diff --git a/htdocs/core/modules/facture/mod_facture_terre.php b/htdocs/core/modules/facture/mod_facture_terre.php
index c01fa9d2e09..db9a3e2e046 100644
--- a/htdocs/core/modules/facture/mod_facture_terre.php
+++ b/htdocs/core/modules/facture/mod_facture_terre.php
@@ -72,7 +72,7 @@ class mod_facture_terre extends ModeleNumRefFactures
}
/**
- * Renvoi la description du modele de numerotation
+ * Returns the description of the numbering model
*
* @return string Texte descripif
*/
@@ -184,6 +184,8 @@ class mod_facture_terre extends ModeleNumRefFactures
{
global $db;
+ dol_syslog(get_class($this)."::getNextValue mode=".$mode, LOG_DEBUG);
+
if ($invoice->type == 2) $prefix=$this->prefixcreditnote;
elseif ($invoice->type == 3) $prefix=$this->prefixdeposit;
else $prefix=$this->prefixinvoice;
@@ -195,7 +197,6 @@ class mod_facture_terre extends ModeleNumRefFactures
$sql.= " AND entity IN (".getEntity('invoicenumber', 1, $invoice).")";
$resql=$db->query($sql);
- dol_syslog(get_class($this)."::getNextValue", LOG_DEBUG);
if ($resql)
{
$obj = $db->fetch_object($resql);
@@ -219,7 +220,6 @@ class mod_facture_terre extends ModeleNumRefFactures
$sql.= " AND entity IN (".getEntity('invoicenumber', 1, $invoice).")";
$sql.= " ORDER BY ref DESC";
- dol_syslog(get_class($this)."::getNextValue", LOG_DEBUG);
$resql=$db->query($sql);
if ($resql)
{
diff --git a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
index 41edc6c0a1d..936eabeadda 100644
--- a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
+++ b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
@@ -136,12 +136,12 @@ class pdf_soleil extends ModelePDFFicheinter
$this->marge_haute =isset($conf->global->MAIN_PDF_MARGIN_TOP)?$conf->global->MAIN_PDF_MARGIN_TOP:10;
$this->marge_basse =isset($conf->global->MAIN_PDF_MARGIN_BOTTOM)?$conf->global->MAIN_PDF_MARGIN_BOTTOM:10;
- $this->option_logo = 1; // Affiche logo
- $this->option_tva = 0; // Gere option tva FACTURE_TVAOPTION
- $this->option_modereg = 0; // Affiche mode reglement
- $this->option_condreg = 0; // Affiche conditions reglement
- $this->option_codeproduitservice = 0; // Affiche code produit-service
- $this->option_multilang = 1; // Dispo en plusieurs langues
+ $this->option_logo = 1; // Display logo
+ $this->option_tva = 0; // Manage the vat option FACTURE_TVAOPTION
+ $this->option_modereg = 0; // Display payment mode
+ $this->option_condreg = 0; // Display payment terms
+ $this->option_codeproduitservice = 0; // Display product-service code
+ $this->option_multilang = 1; // Available in several languages
$this->option_draft_watermark = 1; //Support add of a watermark on drafts
// Get source company
@@ -216,7 +216,7 @@ class pdf_soleil extends ModelePDFFicheinter
global $action;
$reshook=$hookmanager->executeHooks('beforePDFCreation', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
- $nblignes = count($object->lines);
+ $nblines = count($object->lines);
// Create pdf instance
$pdf=pdf_getInstance($this->format);
@@ -274,7 +274,7 @@ class pdf_soleil extends ModelePDFFicheinter
complete_substitutions_array($substitutionarray, $outputlangs, $object);
$notetoshow = make_substitutions($notetoshow, $substitutionarray, $outputlangs);
$notetoshow = convertBackOfficeMediasLinksToPublicLinks($notetoshow);
-
+
$tab_top = 88;
$pdf->SetFont('', '', $default_font_size - 1);
diff --git a/htdocs/core/modules/fichinter/mod_arctic.php b/htdocs/core/modules/fichinter/mod_arctic.php
index 1902ffc70af..1d33cb7fc83 100644
--- a/htdocs/core/modules/fichinter/mod_arctic.php
+++ b/htdocs/core/modules/fichinter/mod_arctic.php
@@ -57,7 +57,7 @@ class mod_arctic extends ModeleNumRefFicheinter
/**
- * Renvoi la description du modele de numerotation
+ * Returns the description of the numbering model
*
* @return string Texte descripif
*/
diff --git a/htdocs/core/modules/import/import_csv.modules.php b/htdocs/core/modules/import/import_csv.modules.php
index f75e5035670..606b23e2767 100644
--- a/htdocs/core/modules/import/import_csv.modules.php
+++ b/htdocs/core/modules/import/import_csv.modules.php
@@ -581,8 +581,27 @@ class ImportCsv extends ModeleImports
if (is_numeric($defaultref) && $defaultref <= 0) $defaultref='';
$newval=$defaultref;
}
-
-
+ elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='compute')
+ {
+ $file=(empty($objimport->array_import_convertvalue[0][$val]['classfile'])?$objimport->array_import_convertvalue[0][$val]['file']:$objimport->array_import_convertvalue[0][$val]['classfile']);
+ $class=$objimport->array_import_convertvalue[0][$val]['class'];
+ $method=$objimport->array_import_convertvalue[0][$val]['method'];
+ $resultload = dol_include_once($file);
+ if (empty($resultload))
+ {
+ dol_print_error('', 'Error trying to call file='.$file.', class='.$class.', method='.$method);
+ break;
+ }
+ $classinstance=new $class($this->db);
+ $res = call_user_func_array(array($classinstance, $method), array(&$arrayrecord));
+ if ($res<0) {
+ if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) $this->errors[$error]['lib']=$langs->trans('ErrorFieldValueNotIn', $key, $newval, 'code', $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
+ else $this->errors[$error]['lib']='ErrorFieldValueNotIn';
+ $this->errors[$error]['type']='FOREIGNKEY';
+ $errorforthistable++;
+ $error++;
+ }
+ }
elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='numeric')
{
$newval = price2num($newval);
@@ -594,16 +613,25 @@ class ImportCsv extends ModeleImports
// Test regexp
if (! empty($objimport->array_import_regex[0][$val]) && ($newval != ''))
{
- // If test is "Must exist in a field@table"
- if (preg_match('/^(.*)@(.*)$/', $objimport->array_import_regex[0][$val], $reg))
+ // If test is "Must exist in a field@table or field@table:..."
+ if (preg_match('/^(.+)@([^:]+)(:.+)?$/', $objimport->array_import_regex[0][$val], $reg))
{
$field=$reg[1];
$table=$reg[2];
+ $filter=!empty($reg[3])?substr($reg[3], 1):'';
+
+ $cachekey = $field.'@'.$table;
+ if(! empty($filter)) $cachekey.= ':'.$filter;
// Load content of field@table into cache array
- if (! is_array($this->cachefieldtable[$field.'@'.$table])) // If content of field@table not already loaded into cache
+ if (! is_array($this->cachefieldtable[$cachekey])) // If content of field@table not already loaded into cache
{
$sql="SELECT ".$field." as aliasfield FROM ".$table;
+ if(! empty($filter))
+ {
+ $sql.= ' WHERE ' . $filter;
+ }
+
$resql=$this->db->query($sql);
if ($resql)
{
@@ -612,7 +640,7 @@ class ImportCsv extends ModeleImports
while ($i < $num)
{
$obj=$this->db->fetch_object($resql);
- if ($obj) $this->cachefieldtable[$field.'@'.$table][]=$obj->aliasfield;
+ if ($obj) $this->cachefieldtable[$cachekey][]=$obj->aliasfield;
$i++;
}
}
@@ -623,9 +651,11 @@ class ImportCsv extends ModeleImports
}
// Now we check cache is not empty (should not) and key is into cache
- if (! is_array($this->cachefieldtable[$field.'@'.$table]) || ! in_array($newval, $this->cachefieldtable[$field.'@'.$table]))
+ if (! is_array($this->cachefieldtable[$cachekey]) || ! in_array($newval, $this->cachefieldtable[$cachekey]))
{
- $this->errors[$error]['lib']=$langs->transnoentitiesnoconv('ErrorFieldValueNotIn', $key, $newval, $field, $table);
+ $tableforerror = $table;
+ if(! empty($filter)) $tableforerror.= ':'.$filter;
+ $this->errors[$error]['lib']=$langs->transnoentitiesnoconv('ErrorFieldValueNotIn', $key, $newval, $field, $tableforerror);
$this->errors[$error]['type']='FOREIGNKEY';
$errorforthistable++;
$error++;
@@ -669,18 +699,30 @@ class ImportCsv extends ModeleImports
if (! preg_match('/^'.preg_quote($alias).'\./', $key)) continue; // Not a field of current table
if ($val == 'user->id')
{
- $listfields[] = preg_replace('/^'.preg_quote($alias).'\./', '', $key);
+ $listfields[] = preg_replace('/^'.preg_quote($alias, '/').'\./', '', $key);
$listvalues[] = $user->id;
}
elseif (preg_match('/^lastrowid-/', $val))
{
$tmp=explode('-', $val);
$lastinsertid=(isset($last_insert_id_array[$tmp[1]]))?$last_insert_id_array[$tmp[1]]:0;
- $keyfield = preg_replace('/^'.preg_quote($alias).'\./', '', $key);
+ $keyfield = preg_replace('/^'.preg_quote($alias, '/').'\./', '', $key);
$listfields[] = $keyfield;
$listvalues[] = $lastinsertid;
//print $key."-".$val."-".$listfields."-".$listvalues."
* Copyright (C) 2005-2012 Regis Houssin
* Copyright (C) 2014 Juanjo Menent
- * Copyright (C) 2014 Alexandre Spangaro
+ * Copyright (C) 2014-2019 Alexandre Spangaro
*
* 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
@@ -68,8 +68,7 @@ class modSalaries extends DolibarrModules
$this->dirs = array("/salaries/temp");
// Config pages
- //$this->config_page_url = array('salaries.php');
- $this->config_page_url = array();
+ $this->config_page_url = array('salaries.php@salaries');
// Dependencies
$this->hidden = false; // A condition to hide module
@@ -144,7 +143,7 @@ class modSalaries extends DolibarrModules
$r++;
$this->export_code[$r]=$this->rights_class.'_'.$r;
- $this->export_label[$r]='Salaries and payments';
+ $this->export_label[$r]='SalariesAndPayments';
$this->export_permission[$r]=array(array("salaries","export"));
$this->export_fields_array[$r]=array('u.firstname'=>"Firstname",'u.lastname'=>"Lastname",'u.login'=>"Login",'u.salary'=>'CurrentSalary','p.datep'=>'DatePayment','p.datesp'=>'DateStartPeriod','p.dateep'=>'DateEndPeriod','p.amount'=>'AmountPayment','p.num_payment'=>'Numero','p.label'=>'Label','p.note'=>'Note');
$this->export_TypeFields_array[$r]=array('u.firstname'=>"Text",'u.lastname'=>"Text",'u.login'=>'Text','u.salary'=>"Numeric",'p.datep'=>'Date','p.datesp'=>'Date','p.dateep'=>'Date','p.amount'=>'Numeric','p.num_payment'=>'Numeric','p.label'=>'Text');
diff --git a/htdocs/core/modules/modService.class.php b/htdocs/core/modules/modService.class.php
index 9db733e4bb2..605c48f0e6b 100644
--- a/htdocs/core/modules/modService.class.php
+++ b/htdocs/core/modules/modService.class.php
@@ -48,7 +48,7 @@ class modService extends DolibarrModules
$this->numero = 53;
$this->family = "products";
- $this->module_position = '30';
+ $this->module_position = '29';
// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
$this->name = preg_replace('/^mod/i', '', get_class($this));
$this->description = "Service management";
diff --git a/htdocs/core/modules/modSociete.class.php b/htdocs/core/modules/modSociete.class.php
index cb01019cc1b..e41e96c5add 100644
--- a/htdocs/core/modules/modSociete.class.php
+++ b/htdocs/core/modules/modSociete.class.php
@@ -49,7 +49,7 @@ class modSociete extends DolibarrModules
$this->numero = 1;
$this->family = "crm";
- $this->module_position = '10';
+ $this->module_position = '09';
// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
$this->name = preg_replace('/^mod/i', '', get_class($this));
$this->description = "Gestion des sociétés et contacts";
diff --git a/htdocs/core/modules/modSupplierProposal.class.php b/htdocs/core/modules/modSupplierProposal.class.php
index 882b02b5fb4..18cddf2a143 100644
--- a/htdocs/core/modules/modSupplierProposal.class.php
+++ b/htdocs/core/modules/modSupplierProposal.class.php
@@ -50,6 +50,7 @@ class modSupplierProposal extends DolibarrModules
$this->numero = 1120;
$this->family = "srm";
+ $this->module_position = '35';
$this->name = preg_replace('/^mod/i', '', get_class($this));
$this->description = "supplier_proposalDESC";
diff --git a/htdocs/core/modules/modSyslog.class.php b/htdocs/core/modules/modSyslog.class.php
index 1ac6ead1087..b754eae2765 100644
--- a/htdocs/core/modules/modSyslog.class.php
+++ b/htdocs/core/modules/modSyslog.class.php
@@ -46,7 +46,7 @@ class modSyslog extends DolibarrModules
// It is used to group modules in module setup page
$this->family = "base";
// Module position in the family on 2 digits ('01', '10', '20', ...)
- $this->module_position = '50';
+ $this->module_position = '75';
// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
$this->name = preg_replace('/^mod/i', '', get_class($this));
// Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
diff --git a/htdocs/core/modules/modTicket.class.php b/htdocs/core/modules/modTicket.class.php
index 9436bfa84e8..e16b6e87fd0 100644
--- a/htdocs/core/modules/modTicket.class.php
+++ b/htdocs/core/modules/modTicket.class.php
@@ -99,6 +99,7 @@ class modTicket extends DolibarrModules
$this->conflictwith = array(); // List of module class names as string this module is in conflict with
$this->phpmin = array(5,4); // Minimum version of PHP required by module
$this->langfiles = array("ticket");
+
// Constants
// List of particular constants to add when module is enabled
// (key, 'chaine', value, desc, visible, 'current' or 'allentities', deleteonunactive)
diff --git a/htdocs/core/modules/modUser.class.php b/htdocs/core/modules/modUser.class.php
index bf7b0c49896..7e31400f1ab 100644
--- a/htdocs/core/modules/modUser.class.php
+++ b/htdocs/core/modules/modUser.class.php
@@ -46,7 +46,7 @@ class modUser extends DolibarrModules
$this->numero = 0;
$this->family = "hr"; // Family for module (or "base" if core module)
- $this->module_position = '10';
+ $this->module_position = '05';
// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
$this->name = preg_replace('/^mod/i', '', get_class($this));
$this->description = "Gestion des utilisateurs (requis)";
diff --git a/htdocs/core/modules/modWebServices.class.php b/htdocs/core/modules/modWebServices.class.php
index 2aa98e80679..f031d3cc5ec 100644
--- a/htdocs/core/modules/modWebServices.class.php
+++ b/htdocs/core/modules/modWebServices.class.php
@@ -41,6 +41,7 @@ class modWebServices extends DolibarrModules
$this->numero = 2600;
$this->family = "interface";
+ $this->module_position = '25';
// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
$this->name = preg_replace('/^mod/i', '', get_class($this));
$this->description = "Enable the Dolibarr web services server";
diff --git a/htdocs/core/modules/modWebServicesClient.class.php b/htdocs/core/modules/modWebServicesClient.class.php
index 33c7bae997a..8f2ba109bd7 100644
--- a/htdocs/core/modules/modWebServicesClient.class.php
+++ b/htdocs/core/modules/modWebServicesClient.class.php
@@ -41,6 +41,7 @@ class modWebServicesClient extends DolibarrModules
$this->numero = 2660;
$this->family = "interface";
+ $this->module_position = '26';
// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
$this->name = preg_replace('/^mod/i', '', get_class($this));
$this->description = "Enable the web service client to call external supplier web services";
diff --git a/htdocs/core/modules/payment/mod_payment_ant.php b/htdocs/core/modules/payment/mod_payment_ant.php
index 21ad0d91b9e..a9cde1b86cb 100644
--- a/htdocs/core/modules/payment/mod_payment_ant.php
+++ b/htdocs/core/modules/payment/mod_payment_ant.php
@@ -55,7 +55,7 @@ class mod_payment_ant extends ModeleNumRefPayments
/**
- * Renvoi la description du modele de numerotation
+ * Returns the description of the numbering model
*
* @return string Texte descripif
*/
diff --git a/htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php b/htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php
index 7670a623c49..f6bb3bc46a7 100644
--- a/htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php
+++ b/htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php
@@ -154,7 +154,7 @@ class pdf_tcpdflabel extends CommonStickerGenerator
$widthtouse = $maxwidthtouse;
$heighttouse = $maxheighttouse;
$logoHeight = $heighttouse;
- $logoWidth = $heighttouse;
+ $logoWidth = $widthtouse;
//var_dump($this->_Width.'x'.$this->_Height.' with border and scale '.$imgscale.' => max '.$maxwidthtouse.'x'.$maxheighttouse.' => We use '.$widthtouse.'x'.$heighttouse);exit;
@@ -175,9 +175,11 @@ class pdf_tcpdflabel extends CommonStickerGenerator
}
elseif ($textleft!='' && $textright!='') // left and right part
{
+ $logoHeight = $heighttouse/2;
+ $logoWidth = $widthtouse/2;
if (($textleft == '%LOGO%' || $textleft == '%PHOTO%' || $textleft == '%BARCODE%') && !strstr($textright, '%') ) // left part logo/barcode right part text
{
- if ($textleft == '%LOGO%' && $logo) $pdf->Image($logo, $_PosX+$xleft, $_PosY+$ytop, $widthtouse/2, 0);
+ if ($textleft == '%LOGO%' && $logo) $pdf->Image($logo, $_PosX+$xleft, $_PosY+$ytop, $logoWidth, 0);
elseif ($code && !empty($encoding))
{
$this->writeBarcode($pdf, $code, $encoding, $is2d, $_PosX+$xleft, $_PosY+$ytop, $widthtouse/2, $heighttouse);
@@ -187,7 +189,7 @@ class pdf_tcpdflabel extends CommonStickerGenerator
}
elseif (($textright == '%LOGO%' || $textright == '%PHOTO%' || $textright == '%BARCODE%') && !strstr($textleft, '%')) // right part logo/barcode left part text
{
- if ($textright == '%LOGO%' && $logo) $pdf->Image($logo, $_PosX+($widthtouse/2), $_PosY+$ytop, $widthtouse/2, 0);
+ if ($textright == '%LOGO%' && $logo) $pdf->Image($logo, $_PosX+($widthtouse/2), $_PosY+$ytop, $logoWidth, 0);
elseif ($code && !empty($encoding))
{
$this->writeBarcode($pdf, $code, $encoding, $is2d, $_PosX+($widthtouse/2), $_PosY+$ytop, $widthtouse/2, $heighttouse);
@@ -203,7 +205,7 @@ class pdf_tcpdflabel extends CommonStickerGenerator
$this->writeBarcode($pdf, $code, $encoding, $is2d, $_PosX+$xleft+$logoWidth+1, $_PosY+$ytop, $widthtouse-$logoWidth-1, $heighttouse);
} else {
$pdf->SetXY($_PosX+$xleft+$logoWidth+1, $_PosY+$ytop);
- $pdf->MultiCell($widthtouse-$logoWidth1-1, $this->_Line_Height, $outputlangs->convToOutputCharset($textright), 0, 'R');
+ $pdf->MultiCell($widthtouse-$logoWidth-1, $this->_Line_Height, $outputlangs->convToOutputCharset($textright), 0, 'R');
}
}
elseif ($textright == '%LOGO%') // right part logo left part text/barcode
diff --git a/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php b/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
index 49dc1b7598c..f8861380b2f 100644
--- a/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
+++ b/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
@@ -244,7 +244,7 @@ class doc_generic_product_odt extends ModelePDFProduct
// Load translation files required by the page
$outputlangs->loadLangs(array("main", "dict", "companies", "bills"));
- if ($conf->produit->dir_output)
+ if ($conf->product->dir_output)
{
// If $object is id instead of object
if (! is_object($object))
@@ -262,7 +262,7 @@ class doc_generic_product_odt extends ModelePDFProduct
$supplierprices = $productFournisseur->list_product_fournisseur_price($object->id);
$object->supplierprices = $supplierprices;
- $dir = $conf->produit->dir_output;
+ $dir = $conf->product->dir_output;
$objectref = dol_sanitizeFileName($object->ref);
if (! preg_match('/specimen/i', $objectref)) $dir.= "/" . $objectref;
$file = $dir . "/" . $objectref . ".odt";
@@ -302,9 +302,9 @@ class doc_generic_product_odt extends ModelePDFProduct
//print "newdir=".$dir;
//print "newfile=".$newfile;
//print "file=".$file;
- //print "conf->produit->dir_temp=".$conf->produit->dir_temp;
+ //print "conf->product->dir_temp=".$conf->product->dir_temp;
- dol_mkdir($conf->produit->dir_temp);
+ dol_mkdir($conf->product->dir_temp);
// If CUSTOMER contact defined on product, we use it
@@ -357,10 +357,10 @@ class doc_generic_product_odt extends ModelePDFProduct
// Open and load template
require_once ODTPHP_PATH.'odf.php';
try {
- $odfHandler = new odf(
+ $odfHandler = new odf(
$srctemplatepath,
array(
- 'PATH_TO_TMP' => $conf->produit->dir_temp,
+ 'PATH_TO_TMP' => $conf->product->dir_temp,
'ZIP_PROXY' => 'PclZipProxy', // PhpZipProxy or PclZipProxy. Got "bad compression method" error when using PhpZipProxy.
'DELIMITER_LEFT' => '{',
'DELIMITER_RIGHT' => '}'
diff --git a/htdocs/core/modules/product/doc/pdf_standard.modules.php b/htdocs/core/modules/product/doc/pdf_standard.modules.php
index 04d566248b9..a9bc06f1021 100644
--- a/htdocs/core/modules/product/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/product/doc/pdf_standard.modules.php
@@ -172,20 +172,20 @@ class pdf_standard extends ModelePDFProduct
// Load traductions files requiredby by page
$outputlangs->loadLangs(array("main", "dict", "companies", "bills", "products", "orders", "deliveries"));
- $nblignes = count($object->lines);
+ $nblines = count($object->lines);
- if ($conf->produit->dir_output)
+ if ($conf->product->dir_output)
{
// Definition of $dir and $file
if ($object->specimen)
{
- $dir = $conf->produit->dir_output;
+ $dir = $conf->product->dir_output;
$file = $dir . "/SPECIMEN.pdf";
}
else
{
$objectref = dol_sanitizeFileName($object->ref);
- $dir = $conf->produit->dir_output . "/" . $objectref;
+ $dir = $conf->product->dir_output . "/" . $objectref;
$file = $dir . "/" . $objectref . ".pdf";
}
@@ -346,7 +346,7 @@ class pdf_standard extends ModelePDFProduct
// Loop on each lines
/*
- for ($i = 0 ; $i < $nblignes ; $i++)
+ for ($i = 0 ; $i < $nblines ; $i++)
{
$curY = $nexY;
$pdf->SetFont('','', $default_font_size - 1); // Into loop to work with multipage
@@ -375,7 +375,7 @@ class pdf_standard extends ModelePDFProduct
$posyafter=$pdf->GetY();
if ($posyafter > ($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))) // There is no space left for total+free text
{
- if ($i == ($nblignes-1)) // No more lines, and no space left to show total, so we create a new page
+ if ($i == ($nblines-1)) // No more lines, and no space left to show total, so we create a new page
{
$pdf->AddPage('','',true);
if (! empty($tplidx)) $pdf->useTemplate($tplidx);
@@ -484,7 +484,7 @@ class pdf_standard extends ModelePDFProduct
$this->tva[$vatrate] += $tvaligne;
// Add line
- if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1))
+ if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1))
{
$pdf->setPage($pageposafter);
$pdf->SetLineStyle(array('dash'=>'1,1','color'=>array(80,80,80)));
@@ -493,7 +493,7 @@ class pdf_standard extends ModelePDFProduct
$pdf->SetLineStyle(array('dash'=>0));
}
- $nexY+=2; // Passe espace entre les lignes
+ $nexY+=2; // Add space between lines
// Detect if some page were added automatically and output _tableau for past pages
while ($pagenb < $pageposafter)
diff --git a/htdocs/core/modules/project/doc/pdf_baleine.modules.php b/htdocs/core/modules/project/doc/pdf_baleine.modules.php
index c7005206fcc..257b477a8df 100644
--- a/htdocs/core/modules/project/doc/pdf_baleine.modules.php
+++ b/htdocs/core/modules/project/doc/pdf_baleine.modules.php
@@ -188,7 +188,7 @@ class pdf_baleine extends ModelePDFProjects
if ($conf->projet->dir_output)
{
- //$nblignes = count($object->lines); // This is set later with array of tasks
+ //$nblines = count($object->lines); // This is set later with array of tasks
$objectref = dol_sanitizeFileName($object->ref);
$dir = $conf->projet->dir_output;
@@ -250,7 +250,7 @@ class pdf_baleine extends ModelePDFProjects
}
$object->lines=$tasksarray;
- $nblignes=count($object->lines);
+ $nblines=count($object->lines);
$pdf->Open();
$pagenb=0;
@@ -287,7 +287,7 @@ class pdf_baleine extends ModelePDFProjects
complete_substitutions_array($substitutionarray, $outputlangs, $object);
$notetoshow = make_substitutions($notetoshow, $substitutionarray, $outputlangs);
$notetoshow = convertBackOfficeMediasLinksToPublicLinks($notetoshow);
-
+
$tab_top -= 2;
$pdf->SetFont('', '', $default_font_size - 1);
@@ -313,7 +313,7 @@ class pdf_baleine extends ModelePDFProjects
$nexY = $tab_top + $heightoftitleline + 1;
// Loop on each lines
- for ($i = 0 ; $i < $nblignes ; $i++)
+ for ($i = 0 ; $i < $nblines ; $i++)
{
$curY = $nexY;
$pdf->SetFont('', '', $default_font_size - 1); // Into loop to work with multipage
@@ -352,7 +352,7 @@ class pdf_baleine extends ModelePDFProjects
$posyafter=$pdf->GetY();
if ($posyafter > ($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))) // There is no space left for total+free text
{
- if ($i == ($nblignes-1)) // No more lines, and no space left to show total, so we create a new page
+ if ($i == ($nblines-1)) // No more lines, and no space left to show total, so we create a new page
{
$pdf->AddPage('', '', true);
if (! empty($tplidx)) $pdf->useTemplate($tplidx);
@@ -428,7 +428,7 @@ class pdf_baleine extends ModelePDFProjects
$pdf->MultiCell($this->page_largeur-$this->marge_droite-$this->posxdateend, 3, $dateend, 0, 'C');
// Add line
- if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1))
+ if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1))
{
$pdf->setPage($pageposafter);
$pdf->SetLineStyle(array('dash'=>'1,1','color'=>array(80,80,80)));
@@ -437,7 +437,7 @@ class pdf_baleine extends ModelePDFProjects
$pdf->SetLineStyle(array('dash'=>0));
}
- $nexY+=2; // Passe espace entre les lignes
+ $nexY+=2; // Add space between lines
// Detect if some page were added automatically and output _tableau for past pages
while ($pagenb < $pageposafter)
diff --git a/htdocs/core/modules/project/doc/pdf_beluga.modules.php b/htdocs/core/modules/project/doc/pdf_beluga.modules.php
index dfbe97c3fd5..381d68c16d2 100644
--- a/htdocs/core/modules/project/doc/pdf_beluga.modules.php
+++ b/htdocs/core/modules/project/doc/pdf_beluga.modules.php
@@ -160,7 +160,7 @@ class pdf_beluga extends ModelePDFProjects
if ($conf->projet->dir_output)
{
- //$nblignes = count($object->lines); // This is set later with array of tasks
+ //$nblines = count($object->lines); // This is set later with array of tasks
$objectref = dol_sanitizeFileName($object->ref);
$dir = $conf->projet->dir_output;
@@ -223,7 +223,7 @@ class pdf_beluga extends ModelePDFProjects
}
$object->lines=$tasksarray;
- $nblignes=count($object->lines);
+ $nblines=count($object->lines);
$pdf->Open();
$pagenb=0;
@@ -260,7 +260,7 @@ class pdf_beluga extends ModelePDFProjects
complete_substitutions_array($substitutionarray, $outputlangs, $object);
$notetoshow = make_substitutions($notetoshow, $substitutionarray, $outputlangs);
$notetoshow = convertBackOfficeMediasLinksToPublicLinks($notetoshow);
-
+
$tab_top -= 2;
$pdf->SetFont('', '', $default_font_size - 1);
@@ -438,7 +438,7 @@ class pdf_beluga extends ModelePDFProjects
$pdf->MultiCell($this->posxstatut - $this->posxamountht, 3, "", 1, 'R');
}
$pdf->SetXY($this->posxstatut, $curY);
- $pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxstatut, 3, $outputlangs->transnoentities("Statut"), 1, 'R');
+ $pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxstatut, 3, $outputlangs->transnoentities("Status"), 1, 'R');
if (is_array($elementarray) && count($elementarray) > 0)
{
@@ -642,7 +642,7 @@ class pdf_beluga extends ModelePDFProjects
}
}
- $nexY+=2; // Passe espace entre les lignes
+ $nexY+=2; // Add space between lines
// Detect if some page were added automatically and output _tableau for past pages
while ($pagenb < $pageposafter)
diff --git a/htdocs/core/modules/project/doc/pdf_timespent.modules.php b/htdocs/core/modules/project/doc/pdf_timespent.modules.php
index 2c69fbd6bab..14946ca5cf3 100644
--- a/htdocs/core/modules/project/doc/pdf_timespent.modules.php
+++ b/htdocs/core/modules/project/doc/pdf_timespent.modules.php
@@ -120,7 +120,7 @@ class pdf_timespent extends ModelePDFProjects
if ($conf->projet->dir_output)
{
- //$nblignes = count($object->lines); // This is set later with array of tasks
+ //$nblines = count($object->lines); // This is set later with array of tasks
$objectref = dol_sanitizeFileName($object->ref);
$dir = $conf->projet->dir_output;
@@ -181,7 +181,7 @@ class pdf_timespent extends ModelePDFProjects
}
$object->lines=$tasksarray;
- $nblignes=count($object->lines);
+ $nblines=count($object->lines);
$pdf->Open();
$pagenb=0;
@@ -218,7 +218,7 @@ class pdf_timespent extends ModelePDFProjects
complete_substitutions_array($substitutionarray, $outputlangs, $object);
$notetoshow = make_substitutions($notetoshow, $substitutionarray, $outputlangs);
$notetoshow = convertBackOfficeMediasLinksToPublicLinks($notetoshow);
-
+
$tab_top -= 2;
$pdf->SetFont('', '', $default_font_size - 1);
@@ -244,7 +244,7 @@ class pdf_timespent extends ModelePDFProjects
$nexY = $tab_top + $heightoftitleline + 1;
// Loop on each lines
- for ($i = 0 ; $i < $nblignes ; $i++)
+ for ($i = 0 ; $i < $nblines ; $i++)
{
$curY = $nexY;
$pdf->SetFont('', '', $default_font_size - 1); // Into loop to work with multipage
@@ -283,7 +283,7 @@ class pdf_timespent extends ModelePDFProjects
$posyafter=$pdf->GetY();
if ($posyafter > ($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))) // There is no space left for total+free text
{
- if ($i == ($nblignes-1)) // No more lines, and no space left to show total, so we create a new page
+ if ($i == ($nblines-1)) // No more lines, and no space left to show total, so we create a new page
{
$pdf->AddPage('', '', true);
if (! empty($tplidx)) $pdf->useTemplate($tplidx);
@@ -359,7 +359,7 @@ class pdf_timespent extends ModelePDFProjects
$pdf->MultiCell($this->page_largeur-$this->marge_droite-$this->posxdateend, 3, $dateend, 0, 'C');
// Add line
- if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1))
+ if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1))
{
$pdf->setPage($pageposafter);
$pdf->SetLineStyle(array('dash'=>'1,1','color'=>array(80,80,80)));
@@ -368,7 +368,7 @@ class pdf_timespent extends ModelePDFProjects
$pdf->SetLineStyle(array('dash'=>0));
}
- $nexY+=2; // Passe espace entre les lignes
+ $nexY+=2; // Add space between lines
// Detect if some page were added automatically and output _tableau for past pages
while ($pagenb < $pageposafter)
diff --git a/htdocs/core/modules/project/mod_project_universal.php b/htdocs/core/modules/project/mod_project_universal.php
index d9287109d6e..70394f92129 100644
--- a/htdocs/core/modules/project/mod_project_universal.php
+++ b/htdocs/core/modules/project/mod_project_universal.php
@@ -55,7 +55,7 @@ class mod_project_universal extends ModeleNumRefProjects
/**
- * Renvoi la description du modele de numerotation
+ * Returns the description of the numbering model
*
* @return string Texte descripif
*/
diff --git a/htdocs/core/modules/project/task/mod_task_universal.php b/htdocs/core/modules/project/task/mod_task_universal.php
index f08067541e8..760caaa366e 100644
--- a/htdocs/core/modules/project/task/mod_task_universal.php
+++ b/htdocs/core/modules/project/task/mod_task_universal.php
@@ -55,7 +55,7 @@ class mod_task_universal extends ModeleNumRefTask
/**
- * Renvoi la description du modele de numerotation
+ * Returns the description of the numbering model
*
* @return string Texte descripif
*/
diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
index 54fe56421ea..4ad23a1704e 100644
--- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
@@ -218,7 +218,7 @@ class pdf_azur extends ModelePDFPropales
public function write_file($object, $outputlangs, $srctemplatepath = '', $hidedetails = 0, $hidedesc = 0, $hideref = 0)
{
// phpcs:enable
- global $user,$langs,$conf,$mysoc,$db,$hookmanager,$nblignes;
+ global $user,$langs,$conf,$mysoc,$db,$hookmanager,$nblines;
if (! is_object($outputlangs)) $outputlangs=$langs;
// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
@@ -227,7 +227,7 @@ class pdf_azur extends ModelePDFPropales
// Load traductions files requiredby by page
$outputlangs->loadLangs(array("main", "dict", "companies", "bills", "propal", "products"));
- $nblignes = count($object->lines);
+ $nblines = count($object->lines);
// Loop on each lines to detect if there is at least one image to show
$realpatharray=array();
@@ -235,7 +235,7 @@ class pdf_azur extends ModelePDFPropales
{
$objphoto = new Product($this->db);
- for ($i = 0 ; $i < $nblignes ; $i++)
+ for ($i = 0 ; $i < $nblines ; $i++)
{
if (empty($object->lines[$i]->fk_product)) continue;
@@ -362,7 +362,7 @@ class pdf_azur extends ModelePDFPropales
$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
// Positionne $this->atleastonediscount si on a au moins une remise
- for ($i = 0 ; $i < $nblignes ; $i++)
+ for ($i = 0 ; $i < $nblines ; $i++)
{
if ($object->lines[$i]->remise_percent)
{
@@ -470,7 +470,7 @@ class pdf_azur extends ModelePDFPropales
$nexY = $tab_top + 7;
// Loop on each lines
- for ($i = 0; $i < $nblignes; $i++)
+ for ($i = 0; $i < $nblines; $i++)
{
$curY = $nexY;
$pdf->SetFont('', '', $default_font_size - 1); // Into loop to work with multipage
@@ -527,7 +527,7 @@ class pdf_azur extends ModelePDFPropales
//var_dump($posyafter); var_dump(($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))); exit;
if ($posyafter > ($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforsignature+$heightforinfotot))) // There is no space left for total+free text
{
- if ($i == ($nblignes-1)) // No more lines, and no space left to show total, so we create a new page
+ if ($i == ($nblines-1)) // No more lines, and no space left to show total, so we create a new page
{
$pdf->AddPage('', '', true);
if (! empty($tplidx)) $pdf->useTemplate($tplidx);
@@ -640,7 +640,7 @@ class pdf_azur extends ModelePDFPropales
if ($posYAfterImage > $posYAfterDescription) $nexY=$posYAfterImage;
// Add line
- if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1))
+ if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1))
{
$pdf->setPage($pageposafter);
$pdf->SetLineStyle(array('dash'=>'1,1','color'=>array(80,80,80)));
@@ -649,7 +649,7 @@ class pdf_azur extends ModelePDFPropales
$pdf->SetLineStyle(array('dash'=>0));
}
- $nexY+=2; // Passe espace entre les lignes
+ $nexY+=2; // Add space between lines
// Detect if some page were added automatically and output _tableau for past pages
while ($pagenb < $pageposafter)
diff --git a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
index 14a2456157a..3ddc8a45a52 100644
--- a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
@@ -193,7 +193,7 @@ class pdf_cyan extends ModelePDFPropales
public function write_file($object, $outputlangs, $srctemplatepath = '', $hidedetails = 0, $hidedesc = 0, $hideref = 0)
{
// phpcs:enable
- global $user,$langs,$conf,$mysoc,$db,$hookmanager,$nblignes;
+ global $user,$langs,$conf,$mysoc,$db,$hookmanager,$nblines;
if (! is_object($outputlangs)) $outputlangs=$langs;
// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
@@ -206,7 +206,7 @@ class pdf_cyan extends ModelePDFPropales
$outputlangs->load("propal");
$outputlangs->load("products");
- $nblignes = count($object->lines);
+ $nblines = count($object->lines);
$hidetop=0;
if(!empty($conf->global->MAIN_PDF_DISABLE_COL_HEAD_TITLE)){
@@ -220,7 +220,7 @@ class pdf_cyan extends ModelePDFPropales
{
$objphoto = new Product($this->db);
- for ($i = 0 ; $i < $nblignes ; $i++)
+ for ($i = 0 ; $i < $nblines ; $i++)
{
if (empty($object->lines[$i]->fk_product)) continue;
@@ -557,7 +557,7 @@ class pdf_cyan extends ModelePDFPropales
// Loop on each lines
$pageposbeforeprintlines=$pdf->getPage();
$pagenb = $pageposbeforeprintlines;
- for ($i = 0; $i < $nblignes; $i++)
+ for ($i = 0; $i < $nblines; $i++)
{
$curY = $nexY;
$pdf->SetFont('', '', $default_font_size - 1); // Into loop to work with multipage
@@ -617,7 +617,7 @@ class pdf_cyan extends ModelePDFPropales
//var_dump($posyafter); var_dump(($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))); exit;
if ($posyafter > ($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforsignature+$heightforinfotot))) // There is no space left for total+free text
{
- if ($i == ($nblignes-1)) // No more lines, and no space left to show total, so we create a new page
+ if ($i == ($nblines-1)) // No more lines, and no space left to show total, so we create a new page
{
$pdf->AddPage('', '', true);
if (! empty($tplidx)) $pdf->useTemplate($tplidx);
@@ -755,7 +755,7 @@ class pdf_cyan extends ModelePDFPropales
if ($posYAfterImage > $posYAfterDescription) $nexY=$posYAfterImage;
// Add line
- if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1))
+ if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1))
{
$pdf->setPage($pageposafter);
$pdf->SetLineStyle(array('dash'=>'1,1','color'=>array(80,80,80)));
@@ -764,7 +764,7 @@ class pdf_cyan extends ModelePDFPropales
$pdf->SetLineStyle(array('dash'=>0));
}
- $nexY+=2; // Passe espace entre les lignes
+ $nexY+=2; // Add space between lines
// Detect if some page were added automatically and output _tableau for past pages
while ($pagenb < $pageposafter)
diff --git a/htdocs/core/modules/reception/doc/pdf_squille.modules.php b/htdocs/core/modules/reception/doc/pdf_squille.modules.php
index dec1f35e7b0..71e78368d9c 100644
--- a/htdocs/core/modules/reception/doc/pdf_squille.modules.php
+++ b/htdocs/core/modules/reception/doc/pdf_squille.modules.php
@@ -131,7 +131,7 @@ class pdf_squille extends ModelePdfReception
$outputlangs->load("receptions");
$outputlangs->load("productbatch");
- $nblignes = count($object->lines);
+ $nblines = count($object->lines);
// Loop on each lines to detect if there is at least one image to show
$realpatharray=array();
@@ -139,7 +139,7 @@ class pdf_squille extends ModelePdfReception
{
$objphoto = new Product($this->db);
- for ($i = 0 ; $i < $nblignes ; $i++)
+ for ($i = 0 ; $i < $nblines ; $i++)
{
if (empty($object->lines[$i]->fk_product)) continue;
@@ -216,8 +216,8 @@ class pdf_squille extends ModelePdfReception
global $action;
$reshook=$hookmanager->executeHooks('beforePDFCreation', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
- // Set nblignes with the new facture lines content after hook
- $nblignes = count($object->lines);
+ // Set nblines with the new facture lines content after hook
+ $nblines = count($object->lines);
$pdf=pdf_getInstance($this->format);
$default_font_size = pdf_getPDFFontSize($outputlangs);
@@ -357,7 +357,7 @@ class pdf_squille extends ModelePdfReception
$fk_commandefourndet=0;
$totalOrdered=0;
// Loop on each lines
- for ($i = 0; $i < $nblignes; $i++)
+ for ($i = 0; $i < $nblines; $i++)
{
$curY = $nexY;
$pdf->SetFont('', '', $default_font_size - 1); // Into loop to work with multipage
@@ -416,7 +416,7 @@ class pdf_squille extends ModelePdfReception
//var_dump($posyafter); var_dump(($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))); exit;
if ($posyafter > ($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))) // There is no space left for total+free text
{
- if ($i == ($nblignes-1)) // No more lines, and no space left to show total, so we create a new page
+ if ($i == ($nblines-1)) // No more lines, and no space left to show total, so we create a new page
{
$pdf->AddPage('', '', true);
if (! empty($tplidx)) $pdf->useTemplate($tplidx);
@@ -496,7 +496,7 @@ class pdf_squille extends ModelePdfReception
if ($weighttxt && $voltxt) $nexY+=2;
// Add line
- if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1))
+ if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1))
{
$pdf->setPage($pageposafter);
$pdf->SetLineStyle(array('dash'=>'1,1','color'=>array(80,80,80)));
diff --git a/htdocs/core/modules/societe/mod_codecompta_panicum.php b/htdocs/core/modules/societe/mod_codecompta_panicum.php
index 4c5ffcd66c5..f3106cef761 100644
--- a/htdocs/core/modules/societe/mod_codecompta_panicum.php
+++ b/htdocs/core/modules/societe/mod_codecompta_panicum.php
@@ -96,8 +96,8 @@ class mod_codecompta_panicum extends ModeleAccountancyCode
$this->code='';
if (is_object($societe)) {
- if ($type == 'supplier') $this->code = (! empty($societe->code_compta_fournisseur)?$societe->code_compta_fournisseur:'');
- else $this->code = (! empty($societe->code_compta)?$societe->code_compta:'');
+ if ($type == 'supplier') $this->code = (($societe->code_compta_fournisseur != "")?$societe->code_compta_fournisseur:'');
+ else $this->code = (($societe->code_compta != "")?$societe->code_compta:'');
}
return 0; // return ok
diff --git a/htdocs/core/modules/societe/modules_societe.class.php b/htdocs/core/modules/societe/modules_societe.class.php
index d185b4cfcf7..4a873847d8a 100644
--- a/htdocs/core/modules/societe/modules_societe.class.php
+++ b/htdocs/core/modules/societe/modules_societe.class.php
@@ -393,7 +393,7 @@ abstract class ModeleAccountancyCode
* @param int $hidedesc Hide description
* @param int $hideref Hide ref
* @return int <0 if KO, >0 if OK
- * @deprecated Use the new function generateDocument of Facture class
+ * @deprecated Use the new function generateDocument of Objects class
* @see Societe::generateDocument()
*/
function thirdparty_doc_create(DoliDB $db, Societe $object, $message, $modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
diff --git a/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php b/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php
index 35c467c110c..ac9c0423694 100644
--- a/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php
+++ b/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php
@@ -244,7 +244,7 @@ class doc_generic_stock_odt extends ModelePDFStock
// Load translation files required by the page
$outputlangs->loadLangs(array("main", "dict", "companies", "bills"));
- if ($conf->produit->dir_output)
+ if ($conf->product->dir_output)
{
// If $object is id instead of object
if (! is_object($object))
@@ -262,7 +262,7 @@ class doc_generic_stock_odt extends ModelePDFStock
$supplierprices = $stockFournisseur->list_stock_fournisseur_price($object->id);
$object->supplierprices = $supplierprices;
- $dir = $conf->produit->dir_output;
+ $dir = $conf->product->dir_output;
$objectref = dol_sanitizeFileName($object->ref);
if (! preg_match('/specimen/i', $objectref)) $dir.= "/" . $objectref;
$file = $dir . "/" . $objectref . ".odt";
@@ -302,9 +302,9 @@ class doc_generic_stock_odt extends ModelePDFStock
//print "newdir=".$dir;
//print "newfile=".$newfile;
//print "file=".$file;
- //print "conf->produit->dir_temp=".$conf->produit->dir_temp;
+ //print "conf->product->dir_temp=".$conf->product->dir_temp;
- dol_mkdir($conf->produit->dir_temp);
+ dol_mkdir($conf->product->dir_temp);
// If CUSTOMER contact defined on stock, we use it
@@ -360,7 +360,7 @@ class doc_generic_stock_odt extends ModelePDFStock
$odfHandler = new odf(
$srctemplatepath,
array(
- 'PATH_TO_TMP' => $conf->produit->dir_temp,
+ 'PATH_TO_TMP' => $conf->product->dir_temp,
'ZIP_PROXY' => 'PclZipProxy', // PhpZipProxy or PclZipProxy. Got "bad compression method" error when using PhpZipProxy.
'DELIMITER_LEFT' => '{',
'DELIMITER_RIGHT' => '}'
diff --git a/htdocs/core/modules/stock/doc/pdf_standard.modules.php b/htdocs/core/modules/stock/doc/pdf_standard.modules.php
index e1181aa6fe2..6c222f96dca 100644
--- a/htdocs/core/modules/stock/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/stock/doc/pdf_standard.modules.php
@@ -201,7 +201,7 @@ class pdf_standard extends ModelePDFStock
// Load traductions files requiredby by page
$outputlangs->loadLangs(array("main", "dict", "companies", "bills", "stocks", "orders", "deliveries"));
- $nblignes = count($object->lines);
+ $nblines = count($object->lines);
if ($conf->stock->dir_output)
{
@@ -323,8 +323,8 @@ class pdf_standard extends ModelePDFStock
{
$num = $db->num_rows($resql);
$i = 0;
- $nblignes = $num;
- for ($i = 0 ; $i < $nblignes ; $i++)
+ $nblines = $num;
+ for ($i = 0 ; $i < $nblines ; $i++)
{
$objp = $db->fetch_object($resql);
@@ -372,7 +372,7 @@ class pdf_standard extends ModelePDFStock
$posyafter=$pdf->GetY();
if ($posyafter > ($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))) // There is no space left for total+free text
{
- if ($i == ($nblignes-1)) // No more lines, and no space left to show total, so we create a new page
+ if ($i == ($nblines-1)) // No more lines, and no space left to show total, so we create a new page
{
$pdf->AddPage('', '', true);
if (! empty($tplidx)) $pdf->useTemplate($tplidx);
@@ -452,7 +452,7 @@ class pdf_standard extends ModelePDFStock
$totalvaluesell+=price2num($pricemin*$objp->value, 'MT');
// Add line
- if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1))
+ if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1))
{
$pdf->setPage($pageposafter);
$pdf->SetLineStyle(array('dash'=>'1,1','color'=>array(80,80,80)));
@@ -461,7 +461,7 @@ class pdf_standard extends ModelePDFStock
$pdf->SetLineStyle(array('dash'=>0));
}
- $nexY+=2; // Passe espace entre les lignes
+ $nexY+=2; // Add space between lines
// Detect if some page were added automatically and output _tableau for past pages
while ($pagenb < $pageposafter)
@@ -550,7 +550,7 @@ class pdf_standard extends ModelePDFStock
complete_substitutions_array($substitutionarray, $outputlangs, $object);
$notetoshow = make_substitutions($notetoshow, $substitutionarray, $outputlangs);
$notetoshow = convertBackOfficeMediasLinksToPublicLinks($notetoshow);
-
+
$tab_top = 88;
$pdf->SetFont('', '', $default_font_size - 1);
@@ -576,7 +576,7 @@ class pdf_standard extends ModelePDFStock
// Loop on each lines
/*
- for ($i = 0 ; $i < $nblignes ; $i++)
+ for ($i = 0 ; $i < $nblines ; $i++)
{
$curY = $nexY;
$pdf->SetFont('','', $default_font_size - 1); // Into loop to work with multipage
@@ -605,7 +605,7 @@ class pdf_standard extends ModelePDFStock
$posyafter=$pdf->GetY();
if ($posyafter > ($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))) // There is no space left for total+free text
{
- if ($i == ($nblignes-1)) // No more lines, and no space left to show total, so we create a new page
+ if ($i == ($nblines-1)) // No more lines, and no space left to show total, so we create a new page
{
$pdf->AddPage('','',true);
if (! empty($tplidx)) $pdf->useTemplate($tplidx);
@@ -644,7 +644,7 @@ class pdf_standard extends ModelePDFStock
$pdf->MultiCell($this->posxdiscount-$this->posxqty-0.8, 4, $qty, 0, 'R');
// Add line
- if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1))
+ if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1))
{
$pdf->setPage($pageposafter);
$pdf->SetLineStyle(array('dash'=>'1,1','color'=>array(80,80,80)));
@@ -653,7 +653,7 @@ class pdf_standard extends ModelePDFStock
$pdf->SetLineStyle(array('dash'=>0));
}
- $nexY+=2; // Passe espace entre les lignes
+ $nexY+=2; // Add space between lines
// Detect if some page were added automatically and output _tableau for past pages
while ($pagenb < $pageposafter)
diff --git a/htdocs/core/modules/stock/doc/pdf_stdmovement.modules.php b/htdocs/core/modules/stock/doc/pdf_stdmovement.modules.php
index 2a1819a3aa0..5efa1b0b312 100644
--- a/htdocs/core/modules/stock/doc/pdf_stdmovement.modules.php
+++ b/htdocs/core/modules/stock/doc/pdf_stdmovement.modules.php
@@ -331,7 +331,7 @@ class pdf_stdmovement extends ModelePDFMovement
* END TODO
**/
- //$nblignes = count($object->lines);
+ //$nblines = count($object->lines);
if ($conf->stock->dir_output)
{
@@ -481,8 +481,8 @@ class pdf_stdmovement extends ModelePDFMovement
{
$num = $db->num_rows($resql);
$i = 0;
- $nblignes = $num;
- for ($i = 0 ; $i < $nblignes ; $i++)
+ $nblines = $num;
+ for ($i = 0 ; $i < $nblines ; $i++)
{
$objp = $db->fetch_object($resql);
@@ -530,7 +530,7 @@ class pdf_stdmovement extends ModelePDFMovement
$posyafter=$pdf->GetY();
if ($posyafter > ($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))) // There is no space left for total+free text
{
- if ($i == ($nblignes-1)) // No more lines, and no space left to show total, so we create a new page
+ if ($i == ($nblines-1)) // No more lines, and no space left to show total, so we create a new page
{
$pdf->AddPage('', '', true);
if (! empty($tplidx)) $pdf->useTemplate($tplidx);
@@ -639,9 +639,9 @@ class pdf_stdmovement extends ModelePDFMovement
$totalvaluesell+=price2num($pricemin*$objp->value, 'MT');
- $nexY+=3.5; // Passe espace entre les lignes
+ $nexY+=3.5; // Add space between lines
// Add line
- if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1))
+ if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1))
{
$pdf->setPage($pageposafter);
$pdf->SetLineStyle(array('dash'=>'1,1','color'=>array(80,80,80)));
@@ -650,7 +650,7 @@ class pdf_stdmovement extends ModelePDFMovement
$pdf->SetLineStyle(array('dash'=>0));
}
- $nexY+=2; // Passe espace entre les lignes
+ $nexY+=2; // Add space between lines
// Detect if some page were added automatically and output _tableau for past pages
while ($pagenb < $pageposafter)
@@ -724,7 +724,7 @@ class pdf_stdmovement extends ModelePDFMovement
complete_substitutions_array($substitutionarray, $outputlangs, $object);
$notetoshow = make_substitutions($notetoshow, $substitutionarray, $outputlangs);
$notetoshow = convertBackOfficeMediasLinksToPublicLinks($notetoshow);
-
+
$tab_top = 88;
$pdf->SetFont('', '', $default_font_size - 1);
diff --git a/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php b/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
index 5c0904baba8..4c4fe7106a7 100644
--- a/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
+++ b/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
@@ -199,7 +199,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
public function write_file($object, $outputlangs = '', $srctemplatepath = '', $hidedetails = 0, $hidedesc = 0, $hideref = 0)
{
// phpcs:enable
- global $user,$langs,$conf,$mysoc,$hookmanager,$nblignes;
+ global $user,$langs,$conf,$mysoc,$hookmanager,$nblines;
// Get source company
if (! is_object($object->thirdparty)) $object->fetch_thirdparty();
@@ -259,7 +259,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
global $action;
$reshook=$hookmanager->executeHooks('beforePDFCreation', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
- $nblignes = count($object->lines);
+ $nblines = count($object->lines);
$pdf=pdf_getInstance($this->format);
$default_font_size = pdf_getPDFFontSize($outputlangs); // Must be after pdf_getInstance
@@ -296,7 +296,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
// Positionne $this->atleastonediscount si on a au moins une remise
- for ($i = 0 ; $i < $nblignes ; $i++)
+ for ($i = 0 ; $i < $nblines ; $i++)
{
if ($object->lines[$i]->remise_percent)
{
@@ -370,7 +370,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
$nexY = $tab_top + 7;
// Loop on each lines
- for ($i = 0 ; $i < $nblignes ; $i++)
+ for ($i = 0 ; $i < $nblines ; $i++)
{
$curY = $nexY;
$pdf->SetFont('', '', $default_font_size - 1); // Into loop to work with multipage
@@ -397,7 +397,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
$posyafter=$pdf->GetY();
if ($posyafter > ($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))) // There is no space left for total+free text
{
- if ($i == ($nblignes-1)) // No more lines, and no space left to show total, so we create a new page
+ if ($i == ($nblines-1)) // No more lines, and no space left to show total, so we create a new page
{
$pdf->AddPage('', '', true);
if (! empty($tplidx)) $pdf->useTemplate($tplidx);
@@ -495,7 +495,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
$this->localtax2[$localtax2rate]+=$localtax2ligne;
// Add line
- if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1))
+ if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1))
{
$pdf->setPage($pageposafter);
$pdf->SetLineStyle(array('dash'=>'1,1','color'=>array(80,80,80)));
@@ -504,7 +504,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
$pdf->SetLineStyle(array('dash'=>0));
}
- $nexY+=2; // Passe espace entre les lignes
+ $nexY+=2; // Add space between lines
// Detect if some page were added automatically and output _tableau for past pages
while ($pagenb < $pageposafter)
diff --git a/htdocs/core/modules/supplier_order/mod_commande_fournisseur_orchidee.php b/htdocs/core/modules/supplier_order/mod_commande_fournisseur_orchidee.php
index 6154ba5e1d9..c816953a298 100644
--- a/htdocs/core/modules/supplier_order/mod_commande_fournisseur_orchidee.php
+++ b/htdocs/core/modules/supplier_order/mod_commande_fournisseur_orchidee.php
@@ -57,7 +57,7 @@ class mod_commande_fournisseur_orchidee extends ModeleNumRefSuppliersOrders
/**
- * Renvoi la description du modele de numerotation
+ * Returns the description of the numbering model
*
* @return string Texte descripif
*/
diff --git a/htdocs/core/modules/supplier_order/pdf/pdf_cornas.modules.php b/htdocs/core/modules/supplier_order/pdf/pdf_cornas.modules.php
index 612595b8c44..e96f5ef4eab 100644
--- a/htdocs/core/modules/supplier_order/pdf/pdf_cornas.modules.php
+++ b/htdocs/core/modules/supplier_order/pdf/pdf_cornas.modules.php
@@ -185,7 +185,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
public function write_file($object, $outputlangs = '', $srctemplatepath = '', $hidedetails = 0, $hidedesc = 0, $hideref = 0)
{
// phpcs:enable
- global $user,$langs,$conf,$hookmanager,$mysoc,$nblignes;
+ global $user,$langs,$conf,$hookmanager,$mysoc,$nblines;
if (! is_object($outputlangs)) $outputlangs=$langs;
// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
@@ -194,7 +194,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
// Load translation files required by the page
$outputlangs->loadLangs(array("main", "orders", "companies", "bills", "dict", "products"));
- $nblignes = count($object->lines);
+ $nblines = count($object->lines);
$hidetop=0;
if(!empty($conf->global->MAIN_PDF_DISABLE_COL_HEAD_TITLE)){
@@ -205,7 +205,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
$realpatharray=array();
if (! empty($conf->global->MAIN_GENERATE_SUPPLIER_ORDER_WITH_PICTURE))
{
- for ($i = 0 ; $i < $nblignes ; $i++)
+ for ($i = 0 ; $i < $nblines ; $i++)
{
if (empty($object->lines[$i]->fk_product)) continue;
@@ -284,7 +284,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
global $action;
$reshook=$hookmanager->executeHooks('beforePDFCreation', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
- $nblignes = count($object->lines);
+ $nblines = count($object->lines);
$pdf=pdf_getInstance($this->format);
$default_font_size = pdf_getPDFFontSize($outputlangs); // Must be after pdf_getInstance
@@ -496,7 +496,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
// Loop on each lines
$pageposbeforeprintlines=$pdf->getPage();
$pagenb = $pageposbeforeprintlines;
- for ($i = 0 ; $i < $nblignes ; $i++)
+ for ($i = 0 ; $i < $nblines ; $i++)
{
$curY = $nexY;
$pdf->SetFont('', '', $default_font_size - 1); // Into loop to work with multipage
@@ -553,7 +553,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
$posyafter=$pdf->GetY();
if ($posyafter > ($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))) // There is no space left for total+free text
{
- if ($i == ($nblignes-1)) // No more lines, and no space left to show total, so we create a new page
+ if ($i == ($nblines-1)) // No more lines, and no space left to show total, so we create a new page
{
$pdf->AddPage('', '', true);
if (! empty($tplidx)) $pdf->useTemplate($tplidx);
@@ -689,7 +689,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
if ($posYAfterImage > $posYAfterDescription) $nexY=$posYAfterImage;
// Add line
- if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1))
+ if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1))
{
$pdf->setPage($pageposafter);
$pdf->SetLineStyle(array('dash'=>'1,1', 'color'=>array(80,80,80)));
@@ -698,7 +698,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
$pdf->SetLineStyle(array('dash'=>0));
}
- $nexY+=2; // Passe espace entre les lignes
+ $nexY+=2; // Add space between lines
// Detect if some page were added automatically and output _tableau for past pages
while ($pagenb < $pageposafter)
diff --git a/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php b/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
index 0c9e8e0967a..9f9f0cfad38 100644
--- a/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
+++ b/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
@@ -213,7 +213,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
public function write_file($object, $outputlangs = '', $srctemplatepath = '', $hidedetails = 0, $hidedesc = 0, $hideref = 0)
{
// phpcs:enable
- global $user,$langs,$conf,$hookmanager,$mysoc,$nblignes;
+ global $user,$langs,$conf,$hookmanager,$mysoc,$nblines;
if (! is_object($outputlangs)) $outputlangs=$langs;
// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
@@ -222,13 +222,13 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
// Load translation files required by the page
$outputlangs->loadLangs(array("main", "orders", "companies", "bills", "dict", "products"));
- $nblignes = count($object->lines);
+ $nblines = count($object->lines);
// Loop on each lines to detect if there is at least one image to show
$realpatharray=array();
if (! empty($conf->global->MAIN_GENERATE_SUPPLIER_ORDER_WITH_PICTURE))
{
- for ($i = 0 ; $i < $nblignes ; $i++)
+ for ($i = 0 ; $i < $nblines ; $i++)
{
if (empty($object->lines[$i]->fk_product)) continue;
@@ -307,7 +307,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
global $action;
$reshook=$hookmanager->executeHooks('beforePDFCreation', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
- $nblignes = count($object->lines);
+ $nblines = count($object->lines);
$pdf=pdf_getInstance($this->format);
$default_font_size = pdf_getPDFFontSize($outputlangs); // Must be after pdf_getInstance
@@ -344,7 +344,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
// Positionne $this->atleastonediscount si on a au moins une remise
- for ($i = 0 ; $i < $nblignes ; $i++)
+ for ($i = 0 ; $i < $nblines ; $i++)
{
if ($object->lines[$i]->remise_percent)
{
@@ -418,7 +418,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
$nexY = $tab_top + 7;
// Loop on each lines
- for ($i = 0 ; $i < $nblignes ; $i++)
+ for ($i = 0 ; $i < $nblines ; $i++)
{
$curY = $nexY;
$pdf->SetFont('', '', $default_font_size - 1); // Into loop to work with multipage
@@ -481,7 +481,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
$posyafter=$pdf->GetY();
if ($posyafter > ($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))) // There is no space left for total+free text
{
- if ($i == ($nblignes-1)) // No more lines, and no space left to show total, so we create a new page
+ if ($i == ($nblines-1)) // No more lines, and no space left to show total, so we create a new page
{
$pdf->AddPage('', '', true);
if (! empty($tplidx)) $pdf->useTemplate($tplidx);
@@ -591,7 +591,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
if ($posYAfterImage > $posYAfterDescription) $nexY=$posYAfterImage;
// Add line
- if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1))
+ if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1))
{
$pdf->setPage($pageposafter);
$pdf->SetLineStyle(array('dash'=>'1,1','color'=>array(80,80,80)));
@@ -600,7 +600,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
$pdf->SetLineStyle(array('dash'=>0));
}
- $nexY+=2; // Passe espace entre les lignes
+ $nexY+=2; // Add space between lines
// Detect if some page were added automatically and output _tableau for past pages
while ($pagenb < $pageposafter)
diff --git a/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php b/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
index 79ad993ef81..e4b6b73fbc1 100644
--- a/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
@@ -264,7 +264,7 @@ class pdf_standard extends ModelePDFSuppliersPayments
global $action;
$reshook=$hookmanager->executeHooks('beforePDFCreation', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
- $nblignes = count($object->lines);
+ $nblines = count($object->lines);
$pdf=pdf_getInstance($this->format);
$default_font_size = pdf_getPDFFontSize($outputlangs); // Must be after pdf_getInstance
@@ -325,7 +325,7 @@ class pdf_standard extends ModelePDFSuppliersPayments
$nexY = $tab_top + 7;
// Loop on each lines
- for ($i = 0 ; $i < $nblignes ; $i++)
+ for ($i = 0 ; $i < $nblines ; $i++)
{
$curY = $nexY;
$pdf->SetFont('', '', $default_font_size - 1); // Into loop to work with multipage
@@ -354,7 +354,7 @@ class pdf_standard extends ModelePDFSuppliersPayments
$posyafter=$pdf->GetY();
if ($posyafter > ($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))) // There is no space left for total+free text
{
- if ($i == ($nblignes-1)) // No more lines, and no space left to show total, so we create a new page
+ if ($i == ($nblines-1)) // No more lines, and no space left to show total, so we create a new page
{
$pdf->AddPage('', '', true);
if (! empty($tplidx)) $pdf->useTemplate($tplidx);
@@ -412,7 +412,7 @@ class pdf_standard extends ModelePDFSuppliersPayments
// Add line
- if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1))
+ if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1))
{
$pdf->setPage($pageposafter);
$pdf->SetLineStyle(array('dash'=>'1,1','color'=>array(80,80,80)));
@@ -421,7 +421,7 @@ class pdf_standard extends ModelePDFSuppliersPayments
$pdf->SetLineStyle(array('dash'=>0));
}
- $nexY+=2; // Passe espace entre les lignes
+ $nexY+=2; // Add space between lines
// Detect if some page were added automatically and output _tableau for past pages
while ($pagenb < $pageposafter)
diff --git a/htdocs/core/modules/supplier_payment/mod_supplier_payment_brodator.php b/htdocs/core/modules/supplier_payment/mod_supplier_payment_brodator.php
index e2407877a7b..d06a2ccfcf3 100644
--- a/htdocs/core/modules/supplier_payment/mod_supplier_payment_brodator.php
+++ b/htdocs/core/modules/supplier_payment/mod_supplier_payment_brodator.php
@@ -55,7 +55,7 @@ class mod_supplier_payment_brodator extends ModeleNumRefSupplierPayments
/**
- * Renvoi la description du modele de numerotation
+ * Returns the description of the numbering model
*
* @return string Texte descripif
*/
diff --git a/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
index d8d489c1bbf..e486474d1d5 100644
--- a/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
+++ b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
@@ -209,7 +209,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
public function write_file($object, $outputlangs, $srctemplatepath = '', $hidedetails = 0, $hidedesc = 0, $hideref = 0)
{
// phpcs:enable
- global $user,$langs,$conf,$mysoc,$db,$hookmanager,$nblignes;
+ global $user,$langs,$conf,$mysoc,$db,$hookmanager,$nblines;
if (! is_object($outputlangs)) $outputlangs=$langs;
// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
@@ -218,13 +218,13 @@ class pdf_aurore extends ModelePDFSupplierProposal
// Load traductions files requiredby by page
$outputlangs->loadLangs(array("main", "dict", "companies", "bills", "products", "supplier_proposal"));
- $nblignes = count($object->lines);
+ $nblines = count($object->lines);
// Loop on each lines to detect if there is at least one image to show
$realpatharray=array();
if (! empty($conf->global->MAIN_GENERATE_SUPPLIER_PROPOSAL_WITH_PICTURE))
{
- for ($i = 0 ; $i < $nblignes ; $i++)
+ for ($i = 0 ; $i < $nblines ; $i++)
{
if (empty($object->lines[$i]->fk_product)) continue;
@@ -333,7 +333,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
// Positionne $this->atleastonediscount si on a au moins une remise
- for ($i = 0 ; $i < $nblignes ; $i++)
+ for ($i = 0 ; $i < $nblines ; $i++)
{
if ($object->lines[$i]->remise_percent)
{
@@ -403,7 +403,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
$nexY = $tab_top + 7;
// Loop on each lines
- for ($i = 0 ; $i < $nblignes ; $i++)
+ for ($i = 0 ; $i < $nblines ; $i++)
{
$curY = $nexY;
$pdf->SetFont('', '', $default_font_size - 1); // Into loop to work with multipage
@@ -469,7 +469,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
//var_dump($posyafter); var_dump(($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))); exit;
if ($posyafter > ($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))) // There is no space left for total+free text
{
- if ($i == ($nblignes-1)) // No more lines, and no space left to show total, so we create a new page
+ if ($i == ($nblines-1)) // No more lines, and no space left to show total, so we create a new page
{
$pdf->AddPage('', '', true);
if (! empty($tplidx)) $pdf->useTemplate($tplidx);
@@ -587,7 +587,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
if ($posYAfterImage > $posYAfterDescription) $nexY=$posYAfterImage;
// Add line
- if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1))
+ if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1))
{
$pdf->setPage($pageposafter);
$pdf->SetLineStyle(array('dash'=>'1,1','color'=>array(80,80,80)));
@@ -596,7 +596,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
$pdf->SetLineStyle(array('dash'=>0));
}
- $nexY+=2; // Passe espace entre les lignes
+ $nexY+=2; // Add space between lines
// Detect if some page were added automatically and output _tableau for past pages
while ($pagenb < $pageposafter)
diff --git a/htdocs/core/modules/ticket/mod_ticket_universal.php b/htdocs/core/modules/ticket/mod_ticket_universal.php
index 361ecdd0c9d..007e0b318cd 100644
--- a/htdocs/core/modules/ticket/mod_ticket_universal.php
+++ b/htdocs/core/modules/ticket/mod_ticket_universal.php
@@ -53,7 +53,7 @@ class mod_ticket_universal extends ModeleNumRefTicket
public $name='Universal';
/**
- * Renvoi la description du modele de numerotation
+ * Returns the description of the numbering model
*
* @return string Texte descripif
*/
diff --git a/htdocs/core/photos_resize.php b/htdocs/core/photos_resize.php
index 2ecb127f3b2..47be8cdf974 100644
--- a/htdocs/core/photos_resize.php
+++ b/htdocs/core/photos_resize.php
@@ -53,6 +53,12 @@ elseif ($modulepart == 'project')
if (! $user->rights->projet->lire) accessforbidden();
$accessallowed=1;
}
+elseif ($modulepart == 'bom')
+{
+ $result=restrictedArea($user, 'bom', $id, 'bom_bom');
+ if (! $user->rights->bom->read) accessforbidden();
+ $accessallowed=1;
+}
elseif ($modulepart == 'expensereport')
{
$result=restrictedArea($user, 'expensereport', $id, 'expensereport');
@@ -205,8 +211,19 @@ elseif ($modulepart == 'ticket')
$dir=$conf->ticket->dir_output; // By default
}
}
+elseif ($modulepart == 'bom')
+{
+ require_once DOL_DOCUMENT_ROOT.'/bom/class/bom.class.php';
+ $object = new BOM($db);
+ if ($id > 0)
+ {
+ $result = $object->fetch($id);
+ if ($result <= 0) dol_print_error($db, 'Failed to load object');
+ $dir=$conf->bom->dir_output; // By default
+ }
+}
else {
- print 'Action crop for module part '.$modulepart.' is not supported yet.';
+ print 'Action crop for modulepart = '.$modulepart.' is not supported yet.';
}
if (empty($backtourl))
@@ -220,6 +237,7 @@ if (empty($backtourl))
elseif (in_array($modulepart, array('tax'))) $backtourl=DOL_URL_ROOT."/compta/sociales/document.php?id=".$id.'&file='.urldecode($_POST["file"]);
elseif (in_array($modulepart, array('ticket'))) $backtourl=DOL_URL_ROOT."/ticket/document.php?id=".$id.'&file='.urldecode($_POST["file"]);
elseif (in_array($modulepart, array('user'))) $backtourl=DOL_URL_ROOT."/user/document.php?id=".$id.'&file='.urldecode($_POST["file"]);
+ else $backtourl=DOL_URL_ROOT."/".$modulepart."/".$modulepart."_document.php?id=".$id.'&file='.urldecode($_POST["file"]);
}
diff --git a/htdocs/core/tpl/admin_extrafields_add.tpl.php b/htdocs/core/tpl/admin_extrafields_add.tpl.php
index 45c620db456..360db1e94b0 100644
--- a/htdocs/core/tpl/admin_extrafields_add.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_add.tpl.php
@@ -44,7 +44,7 @@ $langs->load("modulebuilder");
jQuery(document).ready(function() {
function init_typeoffields(type)
{
- console.log("We select a new type = "+type);
+ console.log("select a new type (add) = "+type);
var size = jQuery("#size");
var computed_value = jQuery("#computed_value");
var langfile = jQuery("#langfile");
@@ -68,7 +68,6 @@ $langs->load("modulebuilder");
?>
// Case of computed field
- console.log(type);
if (type == '' || type == 'varchar' || type == 'int' || type == 'double' || type == 'price') {
jQuery("tr.extra_computed_value").show();
} else {
@@ -96,18 +95,19 @@ $langs->load("modulebuilder");
else if (type == 'text') { size.val('2000').removeAttr('disabled'); unique.prop('disabled', true).removeAttr('checked'); jQuery("#value_choice").hide();jQuery("#helpchkbxlst").hide(); }
else if (type == 'html') { size.val('2000').removeAttr('disabled'); unique.prop('disabled', true).removeAttr('checked'); jQuery("#value_choice").hide();jQuery("#helpchkbxlst").hide(); }
else if (type == 'varchar') { size.val('255').removeAttr('disabled'); unique.removeAttr('disabled'); jQuery("#value_choice").hide();jQuery("#helpchkbxlst").hide(); }
- else if (type == 'password') { size.val('').prop('disabled', true); unique.removeAttr('checked').prop('disabled', true); required.val('').prop('disabled', true); default_value.val('').prop('disabled', true); jQuery("#value_choice").show();jQuery("#helpselect").hide();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").hide();jQuery("#helplink").hide();jQuery("#helppassword").show();}
+ else if (type == 'password') { size.val('').prop('disabled', true); unique.removeAttr('checked').prop('disabled', true); required.val('').prop('disabled', true); default_value.val('').prop('disabled', true); jQuery("#value_choice").show(); jQuery(".spanforparamtooltip").hide(); jQuery("#helppassword").show();}
else if (type == 'boolean') { size.val('').prop('disabled', true); unique.removeAttr('checked').prop('disabled', true); jQuery("#value_choice").hide();jQuery("#helpchkbxlst").hide();}
else if (type == 'price') { size.val('').prop('disabled', true); unique.removeAttr('checked').prop('disabled', true); jQuery("#value_choice").hide();jQuery("#helpchkbxlst").hide();}
- else if (type == 'select') { size.val('').prop('disabled', true); unique.removeAttr('checked').prop('disabled', true); jQuery("#value_choice").show();jQuery("#helpselect").show();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").hide();jQuery("#helplink").hide();jQuery("#helppassword").hide();}
- else if (type == 'sellist') { size.val('').prop('disabled', true); unique.removeAttr('checked').prop('disabled', true); jQuery("#value_choice").show();jQuery("#helpselect").hide();jQuery("#helpsellist").show();jQuery("#helpchkbxlst").hide();jQuery("#helplink").hide();jQuery("#helppassword").hide();}
- else if (type == 'radio') { size.val('').prop('disabled', true); unique.removeAttr('checked').prop('disabled', true); jQuery("#value_choice").show();jQuery("#helpselect").show();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").hide();jQuery("#helplink").hide();jQuery("#helppassword").hide();}
- else if (type == 'checkbox') { size.val('').prop('disabled', true); unique.removeAttr('checked').prop('disabled', true); jQuery("#value_choice").show();jQuery("#helpselect").show();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").hide();jQuery("#helplink").hide();jQuery("#helppassword").hide();}
- else if (type == 'chkbxlst') { size.val('').prop('disabled', true); unique.removeAttr('checked').prop('disabled', true); jQuery("#value_choice").show();jQuery("#helpselect").hide();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").show();jQuery("#helplink").hide();jQuery("#helppassword").hide();}
- else if (type == 'link') { size.val('').prop('disabled', true); unique.removeAttr('disabled'); jQuery("#value_choice").show();jQuery("#helpselect").hide();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").hide();jQuery("#helplink").show();jQuery("#helppassword").hide();}
+ else if (type == 'select') { size.val('').prop('disabled', true); unique.removeAttr('checked').prop('disabled', true); jQuery("#value_choice").show(); jQuery(".spanforparamtooltip").hide(); jQuery("#helpselect").show();}
+ else if (type == 'sellist') { size.val('').prop('disabled', true); unique.removeAttr('checked').prop('disabled', true); jQuery("#value_choice").show(); jQuery(".spanforparamtooltip").hide(); jQuery("#helpsellist").show();}
+ else if (type == 'radio') { size.val('').prop('disabled', true); unique.removeAttr('checked').prop('disabled', true); jQuery("#value_choice").show(); jQuery(".spanforparamtooltip").hide(); jQuery("#helpselect").show();}
+ else if (type == 'checkbox') { size.val('').prop('disabled', true); unique.removeAttr('checked').prop('disabled', true); jQuery("#value_choice").show(); jQuery(".spanforparamtooltip").hide(); jQuery("#helpselect").show();}
+ else if (type == 'chkbxlst') { size.val('').prop('disabled', true); unique.removeAttr('checked').prop('disabled', true); jQuery("#value_choice").show(); jQuery(".spanforparamtooltip").hide(); jQuery("#helpchkbxlst").show();}
+ else if (type == 'link') { size.val('').prop('disabled', true); unique.removeAttr('disabled'); jQuery("#value_choice").show(); jQuery(".spanforparamtooltip").hide(); jQuery("#helplink").show();}
else if (type == 'separate') {
langfile.val('').prop('disabled',true);size.val('').prop('disabled', true); unique.removeAttr('checked').prop('disabled', true); required.val('').prop('disabled', true);
- jQuery("#value_choice").hide();jQuery("#helpselect").hide();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").hide();jQuery("#helplink").hide();
+ jQuery("#value_choice").show();
+ jQuery(".spanforparamtooltip").hide(); jQuery("#helpseparate").show();
}
else { // type = string
size.val('').prop('disabled', true);
@@ -165,11 +165,12 @@ $langs->load("modulebuilder");
- textwithpicto('', $langs->trans("ExtrafieldParamHelpselect"), 1, 0, '', 0, 2, 'helpvalue1')?>
- textwithpicto('', $langs->trans("ExtrafieldParamHelpsellist"), 1, 0, '', 0, 2, 'helpvalue2')?>
- textwithpicto('', $langs->trans("ExtrafieldParamHelpchkbxlst"), 1, 0, '', 0, 2, 'helpvalue3')?>
- textwithpicto('', $langs->trans("ExtrafieldParamHelplink"), 1, 0, '', 0, 2, 'helpvalue4')?>
- textwithpicto('', $langs->trans("ExtrafieldParamHelpPassword"), 1, 0, '', 0, 2, 'helpvalue5')?>
+ textwithpicto('', $langs->trans("ExtrafieldParamHelpselect"), 1, 0, '', 0, 2, 'helpvalue1')?>
+ textwithpicto('', $langs->trans("ExtrafieldParamHelpsellist"), 1, 0, '', 0, 2, 'helpvalue2')?>
+ textwithpicto('', $langs->trans("ExtrafieldParamHelpchkbxlst"), 1, 0, '', 0, 2, 'helpvalue3')?>
+ textwithpicto('', $langs->trans("ExtrafieldParamHelplink"), 1, 0, '', 0, 2, 'helpvalue4')?>
+ textwithpicto('', $langs->trans("ExtrafieldParamHelpPassword"), 1, 0, '', 0, 2, 'helpvalue5')?>
+ textwithpicto('', $langs->trans("ExtrafieldParamHelpSeparator"), 1, 0, '', 0, 2, 'helpvalue6')?>
@@ -179,7 +180,11 @@ $langs->load("modulebuilder");
trans("LanguageFile"); ?>
-
+global->MAIN_STORE_COMPUTED_EXTRAFIELDS)) { ?>
+
+
+
+
diff --git a/htdocs/core/tpl/admin_extrafields_edit.tpl.php b/htdocs/core/tpl/admin_extrafields_edit.tpl.php
index 1ba83bc393f..1c4e91a50a5 100644
--- a/htdocs/core/tpl/admin_extrafields_edit.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_edit.tpl.php
@@ -43,7 +43,7 @@ $langs->load("modulebuilder");
jQuery(document).ready(function() {
function init_typeoffields(type)
{
- console.log("select new type "+type);
+ console.log("select a new type (edit) = "+type);
var size = jQuery("#size");
var computed_value = jQuery("#computed_value");
var langfile = jQuery("#langfile");
@@ -54,7 +54,7 @@ $langs->load("modulebuilder");
var list = jQuery("#list");
var totalizable = jQuery("#totalizable");
load("modulebuilder");
else if (type == 'text') { size.removeAttr('disabled'); unique.prop('disabled', true).removeAttr('checked'); jQuery("#value_choice").hide();jQuery("#helpchkbxlst").hide(); }
else if (type == 'html') { size.removeAttr('disabled'); unique.prop('disabled', true).removeAttr('checked'); jQuery("#value_choice").hide();jQuery("#helpchkbxlst").hide(); }
else if (type == 'varchar') { size.removeAttr('disabled'); unique.removeAttr('disabled'); jQuery("#value_choice").hide();jQuery("#helpchkbxlst").hide(); }
- else if (type == 'password') { size.val('').prop('disabled', true); unique.removeAttr('checked').prop('disabled', true); required.val('').prop('disabled', true); default_value.val('').prop('disabled', true); jQuery("#value_choice").show();jQuery("#helpselect").hide();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").hide();jQuery("#helplink").hide();jQuery("#helppassword").show();}
- else if (type == 'boolean') { size.val('').prop('disabled', true); unique.removeAttr('checked').prop('disabled', true); jQuery("#value_choice").hide();jQuery("#helpchkbxlst").hide();}
- else if (type == 'price') { size.val('').prop('disabled', true); unique.removeAttr('checked').prop('disabled', true); jQuery("#value_choice").hide();jQuery("#helpchkbxlst").hide();}
- else if (type == 'select') { size.val('').prop('disabled', true); unique.removeAttr('checked').prop('disabled', true); jQuery("#value_choice").show();jQuery("#helpselect").show();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").hide();jQuery("#helplink").hide();jQuery("#helppassword").hide();}
- else if (type == 'sellist') { size.val('').prop('disabled', true); unique.removeAttr('checked').prop('disabled', true); jQuery("#value_choice").show();jQuery("#helpselect").hide();jQuery("#helpsellist").show();jQuery("#helpchkbxlst").hide();jQuery("#helplink").hide();jQuery("#helppassword").hide();}
- else if (type == 'radio') { size.val('').prop('disabled', true); unique.removeAttr('checked').prop('disabled', true); jQuery("#value_choice").show();jQuery("#helpselect").show();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").hide();jQuery("#helplink").hide();jQuery("#helppassword").hide();}
- else if (type == 'checkbox') { size.val('').prop('disabled', true); unique.removeAttr('checked').prop('disabled', true); jQuery("#value_choice").show();jQuery("#helpselect").show();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").hide();jQuery("#helplink").hide();jQuery("#helppassword").hide();}
- else if (type == 'chkbxlst') { size.val('').prop('disabled', true); unique.removeAttr('checked').prop('disabled', true); jQuery("#value_choice").show();jQuery("#helpselect").hide();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").show();jQuery("#helplink").hide();jQuery("#helppassword").hide();}
- else if (type == 'link') { size.val('').prop('disabled', true); unique.removeAttr('disabled'); jQuery("#value_choice").show();jQuery("#helpselect").hide();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").hide();jQuery("#helplink").show();jQuery("#helppassword").hide();}
- else if (type == 'separate') { size.val('').prop('disabled', true); unique.removeAttr('checked').prop('disabled', true); required.val('').prop('disabled', true); default_value.val('').prop('disabled', true); jQuery("#value_choice").hide();jQuery("#helpselect").hide();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").hide();jQuery("#helplink").hide();jQuery("#helppassword").hide();}
+ else if (type == 'password') { size.val('').prop('disabled', true); unique.removeAttr('checked').prop('disabled', true); required.val('').prop('disabled', true); default_value.val('').prop('disabled', true); jQuery("#value_choice").show(); jQuery(".spanforparamtooltip").hide(); jQuery("#helppassword").show();}
+ else if (type == 'boolean') { size.val('').prop('disabled', true); unique.removeAttr('checked').prop('disabled', true); jQuery("#value_choice").hide(); jQuery("#helpchkbxlst").hide();}
+ else if (type == 'price') { size.val('').prop('disabled', true); unique.removeAttr('checked').prop('disabled', true); jQuery("#value_choice").hide(); jQuery("#helpchkbxlst").hide();}
+ else if (type == 'select') { size.val('').prop('disabled', true); unique.removeAttr('checked').prop('disabled', true); jQuery("#value_choice").show(); jQuery(".spanforparamtooltip").hide(); jQuery("#helpselect").show();}
+ else if (type == 'sellist') { size.val('').prop('disabled', true); unique.removeAttr('checked').prop('disabled', true); jQuery("#value_choice").show(); jQuery(".spanforparamtooltip").hide(); jQuery("#helpsellist").show();}
+ else if (type == 'radio') { size.val('').prop('disabled', true); unique.removeAttr('checked').prop('disabled', true); jQuery("#value_choice").show(); jQuery(".spanforparamtooltip").hide(); jQuery("#helpselect").show();}
+ else if (type == 'checkbox') { size.val('').prop('disabled', true); unique.removeAttr('checked').prop('disabled', true); jQuery("#value_choice").show(); jQuery(".spanforparamtooltip").hide(); jQuery("#helpselect").show();}
+ else if (type == 'chkbxlst') { size.val('').prop('disabled', true); unique.removeAttr('checked').prop('disabled', true); jQuery("#value_choice").show(); jQuery(".spanforparamtooltip").hide(); jQuery("#helpchkbxlst").show();}
+ else if (type == 'link') { size.val('').prop('disabled', true); unique.removeAttr('disabled'); jQuery("#value_choice").show(); jQuery(".spanforparamtooltip").hide(); jQuery("#helplink").show();}
+ else if (type == 'separate') {
+ size.val('').prop('disabled', true); unique.removeAttr('checked').prop('disabled', true); required.val('').prop('disabled', true); default_value.val('').prop('disabled', true);
+ jQuery("#value_choice").show();
+ jQuery(".spanforparamtooltip").hide(); jQuery("#helpseparate").show();
+ }
else { // type = string
size.val('').prop('disabled', true);
unique.removeAttr('disabled');
@@ -173,7 +177,7 @@ if((($type == 'select') || ($type == 'checkbox') || ($type == 'radio')) && is_ar
}
}
}
-elseif (($type== 'sellist') || ($type == 'chkbxlst') || ($type == 'link') || ($type == 'password'))
+elseif (($type== 'sellist') || ($type == 'chkbxlst') || ($type == 'link') || ($type == 'password') || ($type == 'separate'))
{
$paramlist=array_keys($param['options']);
$param_chain = $paramlist[0];
@@ -229,11 +233,12 @@ else
- textwithpicto('', $langs->trans("ExtrafieldParamHelpselect"), 1, 0, '', 0, 2, 'helpvalue1')?>
- textwithpicto('', $langs->trans("ExtrafieldParamHelpsellist"), 1, 0, '', 0, 2, 'helpvalue2')?>
- textwithpicto('', $langs->trans("ExtrafieldParamHelpchkbxlst"), 1, 0, '', 0, 2, 'helpvalue3')?>
- textwithpicto('', $langs->trans("ExtrafieldParamHelplink"), 1, 0, '', 0, 2, 'helpvalue4')?>
- textwithpicto('', $langs->trans("ExtrafieldParamHelpPassword"), 1, 0, '', 0, 2, 'helpvalue5')?>
+ textwithpicto('', $langs->trans("ExtrafieldParamHelpselect"), 1, 0, '', 0, 2, 'helpvalue1')?>
+ textwithpicto('', $langs->trans("ExtrafieldParamHelpsellist"), 1, 0, '', 0, 2, 'helpvalue2')?>
+ textwithpicto('', $langs->trans("ExtrafieldParamHelpchkbxlst"), 1, 0, '', 0, 2, 'helpvalue3')?>
+ textwithpicto('', $langs->trans("ExtrafieldParamHelplink"), 1, 0, '', 0, 2, 'helpvalue4')?>
+ textwithpicto('', $langs->trans("ExtrafieldParamHelpPassword"), 1, 0, '', 0, 2, 'helpvalue5')?>
+ textwithpicto('', $langs->trans("ExtrafieldParamHelpSeparator"), 1, 0, '', 0, 2, 'helpvalue6')?>
trans("LanguageFile"); ?> ';
+ print '