\n";
if (!$i) {
$totalarray['nbfield']++;
@@ -515,7 +534,7 @@ if ($resql) {
// Account label to show (label short)
if (!empty($arrayfields['aa.labelshort']['checked'])) {
print "
\n";
if (!$i) {
$totalarray['nbfield']++;
@@ -549,10 +568,30 @@ if ($resql) {
}
}
- // Chart of accounts type
+ // Predefined group (deprecated)
if (!empty($arrayfields['aa.pcg_type']['checked'])) {
print "
';
+ if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+ $selected = 0;
+ if (in_array($obj->crowid, $arrayofselected)) {
+ $selected = 1;
+ }
+ print '';
}
- }
- // Extra fields
- include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
- // Fields from hook
- $parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
- $reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
- print $hookmanager->resPrint;
- // Date creation
- if (!empty($arrayfields['c.datec']['checked'])) {
- print '
';
- if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
- $selected = 0;
- if (in_array($obj->crowid, $arrayofselected)) {
- $selected = 1;
- }
- print '';
- }
- print '
';
if ($filtertype != 1) {
- if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+ if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
print '
' . $langs->trans('Unit') . '
';
}
diff --git a/htdocs/bom/tpl/objectline_view.tpl.php b/htdocs/bom/tpl/objectline_view.tpl.php
index b7087b27288..d20692ac99a 100644
--- a/htdocs/bom/tpl/objectline_view.tpl.php
+++ b/htdocs/bom/tpl/objectline_view.tpl.php
@@ -119,7 +119,7 @@ echo price($line->qty, 0, '', 0, 0); // Yes, it is a quantity, not a price, but
print '';
if ($filtertype != 1) {
- if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+ if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
print '
';
$label = $tmpproduct->getLabelOfUnit('long');
if ($label !== '') {
diff --git a/htdocs/bookcal/admin/setup.php b/htdocs/bookcal/admin/setup.php
index ca9d571ebfe..9772ffbbbf0 100644
--- a/htdocs/bookcal/admin/setup.php
+++ b/htdocs/bookcal/admin/setup.php
@@ -153,10 +153,10 @@ if ( versioncompare(explode('.', DOL_VERSION), array(15)) < 0 && $action == 'upd
include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
if ($action == 'updateMask') {
- $maskconst = GETPOST('maskconst', 'alpha');
+ $maskconst = GETPOST('maskconst', 'aZ09');
$maskvalue = GETPOST('maskvalue', 'alpha');
- if ($maskconst) {
+ if ($maskconst && preg_match('/_MASK$/', $maskconst)) {
$res = dolibarr_set_const($db, $maskconst, $maskvalue, 'chaine', 0, '', $conf->entity);
if (!($res > 0)) {
$error++;
diff --git a/htdocs/bookcal/class/booking.class.php b/htdocs/bookcal/class/booking.class.php
index 98cb5077844..1a4f402626b 100644
--- a/htdocs/bookcal/class/booking.class.php
+++ b/htdocs/bookcal/class/booking.class.php
@@ -104,7 +104,7 @@ class Booking extends CommonObject
public $fields=array(
'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'css'=>'left', 'comment'=>"Id"),
'ref' => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>'1', 'position'=>1.2, 'notnull'=>1, 'visible'=>1, 'index'=>1, 'searchall'=>1, 'validate'=>'1', 'comment'=>"Reference of object"),
- 'fk_soc' => array('type'=>'integer:Societe:societe/class/societe.class.php:1:status=1 AND entity IN (__SHARED_ENTITIES__)', 'label'=>'ThirdParty', 'picto'=>'company', 'enabled'=>'$conf->societe->enabled', 'position'=>50, 'notnull'=>-1, 'visible'=>1, 'index'=>1, 'css'=>'maxwidth500 widthcentpercentminusxx', 'help'=>"LinkToThirparty", 'validate'=>'1',),
+ 'fk_soc' => array('type'=>'integer:Societe:societe/class/societe.class.php:1:status=1 AND entity IN (__SHARED_ENTITIES__)', 'label'=>'ThirdParty', 'picto'=>'company', 'enabled'=>'isModEnabled("societe")', 'position'=>50, 'notnull'=>-1, 'visible'=>1, 'index'=>1, 'css'=>'maxwidth500 widthcentpercentminusxx', 'help'=>"LinkToThirparty", 'validate'=>'1',),
'fk_project' => array('type'=>'integer:Project:projet/class/project.class.php:1', 'label'=>'Project', 'picto'=>'project', 'enabled'=>'$conf->project->enabled', 'position'=>52, 'notnull'=>-1, 'visible'=>-1, 'index'=>1, 'css'=>'maxwidth500 widthcentpercentminusxx', 'validate'=>'1',),
'description' => array('type'=>'text', 'label'=>'Description', 'enabled'=>'1', 'position'=>60, 'notnull'=>0, 'visible'=>3, 'validate'=>'1',),
'note_public' => array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>'1', 'position'=>61, 'notnull'=>0, 'visible'=>0, 'cssview'=>'wordbreak', 'validate'=>'1',),
diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index 4c2842b2dcf..4d6e3e1736f 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -1189,8 +1189,6 @@ class Categorie extends CommonObject
dol_syslog(get_class($this)."::get_full_arbo dol_sort_array", LOG_DEBUG);
$this->cats = dol_sort_array($this->cats, 'fulllabel', 'asc', true, false);
- //$this->debug_cats();
-
return $this->cats;
}
@@ -1201,7 +1199,7 @@ class Categorie extends CommonObject
*
* @param int $id_categ id_categ entry to update
* @param int $protection Deep counter to avoid infinite loop
- * @return void
+ * @return int <0 if KO, >0 if OK
* @see get_full_arbo()
*/
private function buildPathFromId($id_categ, $protection = 1000)
@@ -1211,7 +1209,7 @@ class Categorie extends CommonObject
if (!empty($this->cats[$id_categ]['fullpath'])) {
// Already defined
dol_syslog(get_class($this)."::buildPathFromId fullpath and fulllabel already defined", LOG_WARNING);
- return;
+ return -1;
}
// First build full array $motherof
@@ -1238,28 +1236,7 @@ class Categorie extends CommonObject
$nbunderscore = substr_count($this->cats[$id_categ]['fullpath'], '_');
$this->cats[$id_categ]['level'] = ($nbunderscore ? $nbunderscore : null);
- return;
- }
-
- // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
- /**
- * Display content of $this->cats
- *
- * @return void
- */
- public function debug_cats()
- {
- // phpcs:enable
- // Display $this->cats
- foreach ($this->cats as $key => $val) {
- print 'id: '.$this->cats[$key]['id'];
- print ' label: '.$this->cats[$key]['label'];
- print ' mother: '.$this->cats[$key]['fk_parent'];
- //print ' children: '.(is_array($this->cats[$key]['id_children'])?join(',',$this->cats[$key]['id_children']):'');
- print ' fullpath: '.$this->cats[$key]['fullpath'];
- print ' fulllabel: '.$this->cats[$key]['fulllabel'];
- print " \n";
- }
+ return 1;
}
diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index f0399fa6350..91eb9f49516 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -1353,7 +1353,7 @@ if ($action == 'create') {
if (empty($donotclearsession)) {
$assignedtouser = GETPOST("assignedtouser") ?GETPOST("assignedtouser") : (!empty($object->userownerid) && $object->userownerid > 0 ? $object->userownerid : $user->id);
if ($assignedtouser) {
- $listofuserid[$assignedtouser] = array('id'=>$assignedtouser, 'mandatory'=>0, 'transparency'=>$object->transparency); // Owner first
+ $listofuserid[$assignedtouser] = array('id'=>$assignedtouser, 'mandatory'=>0); // Owner first
}
//$listofuserid[$user->id] = array('id'=>$user->id, 'mandatory'=>0, 'transparency'=>(GETPOSTISSET('transparency') ? GETPOST('transparency', 'alpha') : 1)); // 1 by default at first init
$listofuserid[$assignedtouser]['transparency'] = (GETPOSTISSET('transparency') ? GETPOST('transparency', 'alpha') : 1); // 1 by default at first init
@@ -1602,7 +1602,7 @@ if ($action == 'create') {
$("#select_actioncommsendmodel_mail").closest("tr").show();
} else {
$("#select_actioncommsendmodel_mail").closest("tr").hide();
- };
+ }
});
})';
print ''."\n";
@@ -2104,7 +2104,7 @@ if ($id > 0) {
$("#select_actioncommsendmodel_mail").closest("tr").show();
} else {
$("#select_actioncommsendmodel_mail").closest("tr").hide();
- };
+ }
});
})';
diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index efe9374a748..f71c75192ef 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -225,22 +225,22 @@ class ActionComm extends CommonObject
public $transparency;
/**
- * @var int (0 By default)
+ * @var int (0 By default)
*/
public $priority;
/**
- * @var int[] Array of user ids
+ * @var int[] Array of user ids
*/
public $userassigned = array();
/**
- * @var int Id of user owner = fk_user_action into table
+ * @var int Id of user owner = fk_user_action into table
*/
public $userownerid;
/**
- * @var int Id of user that has done the event. Used only if AGENDA_ENABLE_DONEBY is set.
+ * @var int Id of user that has done the event. Used only if AGENDA_ENABLE_DONEBY is set.
*/
public $userdoneid;
@@ -429,7 +429,7 @@ class ActionComm extends CommonObject
$now = dol_now();
// Check parameters
- if (!isset($this->userownerid) || $this->userownerid === '') { // $this->userownerid may be 0 (anonymous event) of > 0
+ if (!isset($this->userownerid) || (string) $this->userownerid === '') { // $this->userownerid may be 0 (anonymous event) or > 0
dol_syslog("You tried to create an event but mandatory property ownerid was not defined", LOG_WARNING);
$this->errors[] = 'ErrorActionCommPropertyUserowneridNotDefined';
return -1;
@@ -477,8 +477,8 @@ class ActionComm extends CommonObject
$this->elementtype = 'contract';
}
- if (!is_array($this->userassigned) && !empty($this->userassigned)) { // For backward compatibility when userassigned was an int instead fo array
- $tmpid = $this->userassigned;
+ if (!is_array($this->userassigned) && !empty($this->userassigned)) { // For backward compatibility when userassigned was an int instead of an array
+ $tmpid = (int) $this->userassigned;
$this->userassigned = array();
$this->userassigned[$tmpid] = array('id'=>$tmpid, 'transparency'=>$this->transparency);
}
@@ -1800,8 +1800,8 @@ class ActionComm extends CommonObject
* Adds it to non existing supplied categories.
* Existing categories are left untouch.
*
- * @param int[]|int $categories Category or categories IDs
- * @return void
+ * @param int[]|int $categories Category or categories IDs
+ * @return int <0 if KO, >0 if OK
*/
public function setCategories($categories)
{
@@ -1835,7 +1835,7 @@ class ActionComm extends CommonObject
$c->add_type($this, Categorie::TYPE_ACTIONCOMM);
}
}
- return;
+ return 1;
}
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
diff --git a/htdocs/comm/action/class/ical.class.php b/htdocs/comm/action/class/ical.class.php
index 7ab09e8d891..26db2cd5e6e 100644
--- a/htdocs/comm/action/class/ical.class.php
+++ b/htdocs/comm/action/class/ical.class.php
@@ -54,8 +54,8 @@ class ICal
/**
* Read text file, icalender text file
*
- * @param string $file File
- * @return string
+ * @param string $file File
+ * @return string|null Content of remote file read or null if error
*/
public function read_file($file)
{
@@ -65,7 +65,7 @@ class ICal
$tmpresult = getURLContent($file, 'GET');
if ($tmpresult['http_code'] != 200) {
- $file_text = '';
+ $file_text = null;
$this->error = 'Error: '.$tmpresult['http_code'].' '.$tmpresult['content'];
} else {
$file_text = preg_replace("/[\r\n]{1,} /", "", $tmpresult['content']);
@@ -102,17 +102,40 @@ class ICal
/**
* Translate Calendar
*
- * @param string $uri Url
+ * @param string $uri Url
+ * @param string $usecachefile Full path of a cache file to use a cache file
+ * @param string $delaycache Delay in seconds for cache (by default 3600 secondes)
* @return array|string
*/
- public function parse($uri)
+ public function parse($uri, $usecachefile = '', $delaycache = 3600)
{
$this->cal = array(); // new empty array
$this->event_count = -1;
+ $this->file_text = null;
+
+ // Save file into a cache
+ if ($usecachefile) {
+ include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+ $datefile = dol_filemtime($usecachefile);
+ $now = dol_now('gmt');
+ //print $datefile.' '.$now.' ...';
+ if ($datefile && $datefile > ($now - $delaycache)) {
+ // We reuse the cache file
+ $this->file_text = file_get_contents($usecachefile);
+ }
+ }
// read FILE text
- $this->file_text = $this->read_file($uri);
+ if (is_null($this->file_text)) {
+ $this->file_text = $this->read_file($uri);
+
+ if ($usecachefile && !is_null($this->file_text)) {
+ // Save the file content into cache file
+ file_put_contents($usecachefile, $this->file_text, LOCK_EX);
+ dolChmod($usecachefile);
+ }
+ }
$this->file_text = preg_split("[\n]", $this->file_text);
@@ -402,7 +425,7 @@ class ICal
public function get_event_list()
{
// phpcs:enable
- return (empty($this->cal['VEVENT']) ? '' : $this->cal['VEVENT']);
+ return (empty($this->cal['VEVENT']) ? array() : $this->cal['VEVENT']);
}
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -414,7 +437,7 @@ class ICal
public function get_freebusy_list()
{
// phpcs:enable
- return (empty($this->cal['VFREEBUSY']) ? '' : $this->cal['VFREEBUSY']);
+ return (empty($this->cal['VFREEBUSY']) ? array() : $this->cal['VFREEBUSY']);
}
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index 5b51d48392b..8ec011f5e9d 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -49,6 +49,7 @@ if (empty($conf->global->AGENDA_EXT_NB)) {
$conf->global->AGENDA_EXT_NB = 5;
}
$MAXAGENDA = $conf->global->AGENDA_EXT_NB;
+$DELAYFORCACHE = 300; // 300 seconds
$disabledefaultvalues = GETPOST('disabledefaultvalues', 'int');
@@ -299,6 +300,7 @@ if (empty($user->conf->AGENDA_DISABLE_EXT)) {
$enabled = 'AGENDA_EXT_ENABLED_'.$user->id.'_'.$i;
$default = 'AGENDA_EXT_ACTIVEBYDEFAULT_'.$user->id.'_'.$i;
$buggedfile = 'AGENDA_EXT_BUGGEDFILE_'.$user->id.'_'.$i;
+
if (getDolUserString($source) && getDolUserString($name)) {
// Note: $conf->global->buggedfile can be empty or 'uselocalandtznodaylight' or 'uselocalandtzdaylight'
$listofextcals[] = array(
@@ -427,36 +429,33 @@ if ($mode == 'show_day' || $mode == 'show_week' || $mode == 'show_month') {
}
// Show navigation bar
+$nav = '';
+$nav .= '
';
+
$viewmode .= ''; // To add a space before the navigation tools
@@ -614,7 +616,7 @@ if (!empty($conf->use_javascript_ajax)) { // If javascript on
$default = '';
}
- $s .= '
';
+ $s .= '
';
}
}
@@ -1009,9 +1011,13 @@ if ($mode == 'show_day') {
// Request only leaves for the current selected day
$sql .= " AND '".$db->escape($year)."-".$db->escape($month)."-".$db->escape($day)."' BETWEEN x.date_debut AND x.date_fin"; // date_debut and date_fin are date without time
} elseif ($mode == 'show_week') {
- // TODO: Add filter to reduce database request
+ // Restrict on current month (we get more, but we will filter later)
+ $sql .= " AND date_debut < '".dol_get_last_day($year, $month)."'";
+ $sql .= " AND date_fin >= '".dol_get_first_day($year, $month)."'";
} elseif ($mode == 'show_month') {
- // TODO: Add filter to reduce database request
+ // Restrict on current month
+ $sql .= " AND date_debut <= '".dol_get_last_day($year, $month)."'";
+ $sql .= " AND date_fin >= '".dol_get_first_day($year, $month)."'";
}
$resql = $db->query($sql);
@@ -1082,8 +1088,11 @@ if (count($listofextcals)) {
$colorcal = $extcal['color'];
$buggedfile = $extcal['buggedfile'];
+ $pathforcachefile = dol_sanitizePathName($conf->user->dir_temp).'/'.dol_sanitizeFileName('extcal_'.$namecal.'_user'.$user->id).'.cache';
+ //var_dump($pathforcachefile);exit;
+
$ical = new ICal();
- $ical->parse($url);
+ $ical->parse($url, $pathforcachefile, $DELAYFORCACHE);
// After this $ical->cal['VEVENT'] contains array of events, $ical->cal['DAYLIGHT'] contains daylight info, $ical->cal['STANDARD'] contains non daylight info, ...
//var_dump($ical->cal); exit;
diff --git a/htdocs/comm/action/list.php b/htdocs/comm/action/list.php
index 4be3195561e..ab2037d5f76 100644
--- a/htdocs/comm/action/list.php
+++ b/htdocs/comm/action/list.php
@@ -600,7 +600,7 @@ $num = $db->num_rows($resql);
$arrayofselected = is_array($toselect) ? $toselect : array();
// Local calendar
-$newtitle = '
';
+ // cache of user list (owners)
+ if ($obj->fk_user_action > 0 && !isset($cache_user_list[$obj->fk_user_action])) {
+ $userstatic = new User($db);
+ $res = $userstatic->fetch($obj->fk_user_action);
+ if ($res > 0) {
+ $cache_user_list[$obj->fk_user_action] = $userstatic;
+ }
+ }
+
+ // get event style for user owner
+ $event_owner_style = '';
+ // We decide to choose color of owner of event (event->userownerid is user id of owner, event->userassigned contains all users assigned to event)
+ if ($cache_user_list[$obj->fk_user_action]->color != '') {
+ $event_owner_style .= 'border-left: #' . $cache_user_list[$obj->fk_user_action]->color . ' 5px solid;';
+ }
+
+ // get event style for start and end date
+ $event_more_class = '';
+ $event_start_date_css = '';
+ $event_end_date_css = '';
+ $event_start_date_time = $actionstatic->datep;
+ if ($event_start_date_time > $now) {
+ // future event
+ $event_more_class = 'event-future';
+ $event_start_date_css = $event_end_date_css = $event_more_class;
+ } else {
+ if ($obj->fulldayevent == 1) {
+ $today_start_date_time = $today_start_time;
+ } else {
+ $today_start_date_time = $now;
+ }
+
+ // check event end date
+ $event_end_date_time = $db->jdate($obj->dp2);
+ if ($event_end_date_time != null && $event_end_date_time < $today_start_date_time) {
+ // past event
+ $event_more_class = 'event-past';
+ } elseif ($event_end_date_time == null && $event_start_date_time < $today_start_date_time) {
+ // past event
+ $event_more_class = 'event-past';
+ } else {
+ // current event
+ $event_more_class = 'event-current';
+ }
+ $event_start_date_css = $event_end_date_css = $event_more_class;
+ }
+ $event_start_date_css = $event_end_date_css = $event_more_class;
+
+ print '
';
// Action column
if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
print '
';
@@ -955,10 +1005,16 @@ while ($i < $imaxinloop) {
// User owner
if (!empty($arrayfields['owner']['checked'])) {
- print '
'; // With edge and chrome the td overflow is not supported correctly when content is not full text.
- if ($obj->fk_user_action > 0) {
- $userstatic->fetch($obj->fk_user_action);
- print $userstatic->getNomUrl(-1);
+ print '
'; // With edge and chrome the td overflow is not supported correctly when content is not full text.
+ if ($obj->fk_user_action > 0 && !isset($cache_user_list[$obj->fk_user_action])) {
+ $userstatic = new User($db);
+ $res = $userstatic->fetch($obj->fk_user_action);
+ if ($res > 0) {
+ $cache_user_list[$obj->fk_user_action] = $userstatic;
+ }
+ }
+ if (isset($cache_user_list[$obj->fk_user_action])) {
+ print $cache_user_list[$obj->fk_user_action]->getNomUrl(-1);
} else {
print ' ';
}
@@ -1006,13 +1062,14 @@ while ($i < $imaxinloop) {
// Start date
if (!empty($arrayfields['a.datep']['checked'])) {
- print '
';
- $note_public = $object->getDefaultCreateValueFor('note_public', (!empty($objectsrc) ? $objectsrc->note_public : null));
+ $note_public = $object->getDefaultCreateValueFor('note_public', (!empty($objectsrc) ? $objectsrc->note_public : (!empty($conf->global->PROPALE_ADDON_NOTE_PUBLIC_DEFAULT) ? $conf->global->PROPALE_ADDON_NOTE_PUBLIC_DEFAULT : null)), 'restricthtml');
$doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PUBLIC) ? 0 : 1, ROWS_3, '90%');
print $doleditor->Create(1);
@@ -2776,7 +2806,7 @@ if ($action == 'create') {
}
if (!empty($object->lines)) {
- $ret = $object->printObjectLines($action, $mysoc, $object->thirdparty, $lineid, 1);
+ $object->printObjectLines($action, $mysoc, $object->thirdparty, $lineid, 1);
}
// Form to add new line
diff --git a/htdocs/comm/propal/class/api_proposals.class.php b/htdocs/comm/propal/class/api_proposals.class.php
index cf675e01b62..5e0e2c31e19 100644
--- a/htdocs/comm/propal/class/api_proposals.class.php
+++ b/htdocs/comm/propal/class/api_proposals.class.php
@@ -49,7 +49,7 @@ class Proposals extends DolibarrApi
*/
public function __construct()
{
- global $db, $conf;
+ global $db;
$this->db = $db;
$this->propal = new Propal($this->db);
}
@@ -59,9 +59,9 @@ class Proposals extends DolibarrApi
*
* Return an array with commercial proposal informations
*
- * @param int $id ID of commercial proposal
- * @param int $contact_list 0: Returned array of contacts/addresses contains all properties, 1: Return array contains just id
- * @return array|mixed data without useless information
+ * @param int $id ID of commercial proposal
+ * @param int $contact_list 0: Returned array of contacts/addresses contains all properties, 1: Return array contains just id
+ * @return Object Object with cleaned properties
*
* @throws RestException
*/
@@ -76,8 +76,8 @@ class Proposals extends DolibarrApi
* Return an array with proposal informations
*
* @param string $ref Ref of object
- * @param int $contact_list 0: Returned array of contacts/addresses contains all properties, 1: Return array contains just id
- * @return array|mixed data without useless information
+ * @param int $contact_list 0: Returned array of contacts/addresses contains all properties, 1: Return array contains just id
+ * @return Object Object with cleaned properties
*
* @url GET ref/{ref}
*
@@ -93,9 +93,9 @@ class Proposals extends DolibarrApi
*
* Return an array with proposal informations
*
- * @param string $ref_ext External reference of object
- * @param int $contact_list 0: Returned array of contacts/addresses contains all properties, 1: Return array contains just id
- * @return array|mixed data without useless information
+ * @param string $ref_ext External reference of object
+ * @param int $contact_list 0: Returned array of contacts/addresses contains all properties, 1: Return array contains just id
+ * @return Object Object with cleaned properties
*
* @url GET ref_ext/{ref_ext}
*
@@ -111,11 +111,11 @@ class Proposals extends DolibarrApi
*
* Return an array with proposal informations
*
- * @param int $id ID of order
- * @param string $ref Ref of object
- * @param string $ref_ext External reference of object
- * @param int $contact_list 0: Returned array of contacts/addresses contains all properties, 1: Return array contains just id
- * @return array|mixed data without useless information
+ * @param int $id ID of order
+ * @param string $ref Ref of object
+ * @param string $ref_ext External reference of object
+ * @param int $contact_list 0: Returned array of contacts/addresses contains all properties, 1: Return array contains just id
+ * @return Object Object with cleaned properties
*
* @throws RestException
*/
@@ -289,7 +289,7 @@ class Proposals extends DolibarrApi
*
* @url GET {id}/lines
*
- * @return int
+ * @return array
*/
public function getLines($id, $sqlfilters = '')
{
@@ -461,7 +461,7 @@ class Proposals extends DolibarrApi
}
if (empty($errors)) {
$this->db->commit();
- return count($request_data);
+ return $updateRes;
} else {
$this->db->rollback();
throw new RestException(400, implode(", ", $errors));
@@ -471,13 +471,12 @@ class Proposals extends DolibarrApi
/**
* Update a line of given commercial proposal
*
- * @param int $id Id of commercial proposal to update
- * @param int $lineid Id of line to update
- * @param array $request_data Commercial proposal line data
+ * @param int $id Id of commercial proposal to update
+ * @param int $lineid Id of line to update
+ * @param array $request_data Commercial proposal line data
+ * @return Object|false Object with cleaned properties
*
* @url PUT {id}/lines/{lineid}
- *
- * @return object
*/
public function putLine($id, $lineid, $request_data = null)
{
@@ -548,13 +547,12 @@ class Proposals extends DolibarrApi
* Delete a line of given commercial proposal
*
*
- * @param int $id Id of commercial proposal to update
- * @param int $lineid Id of line to delete
+ * @param int $id Id of commercial proposal to update
+ * @param int $lineid Id of line to delete
+ * @return Object|false Object with cleaned properties
*
* @url DELETE {id}/lines/{lineid}
*
- * @return int
- *
* @throws RestException 401
* @throws RestException 404
*/
@@ -573,9 +571,7 @@ class Proposals extends DolibarrApi
throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
}
- // TODO Check the lineid $lineid is a line of ojbect
-
- $updateRes = $this->propal->deleteline($lineid);
+ $updateRes = $this->propal->deleteline($lineid, $id);
if ($updateRes > 0) {
return $this->get($id);
} else {
@@ -589,11 +585,10 @@ class Proposals extends DolibarrApi
* @param int $id Id of commercial proposal to update
* @param int $contactid Id of contact to add
* @param string $type Type of the contact (BILLING, SHIPPING, CUSTOMER)
+ * @return array
*
* @url POST {id}/contact/{contactid}/{type}
*
- * @return int
- *
* @throws RestException 401
* @throws RestException 404
*/
@@ -623,20 +618,24 @@ class Proposals extends DolibarrApi
throw new RestException(500, 'Error when added the contact');
}
- return $this->propal;
+ return array(
+ 'success' => array(
+ 'code' => 200,
+ 'message' => 'Contact linked to the proposal'
+ )
+ );
}
/**
* Delete a contact type of given commercial proposal
*
- * @param int $id Id of commercial proposal to update
- * @param int $contactid Row key of the contact in the array contact_ids.
- * @param string $type Type of the contact (BILLING, SHIPPING, CUSTOMER).
+ * @param int $id Id of commercial proposal to update
+ * @param int $contactid Row key of the contact in the array contact_ids.
+ * @param string $type Type of the contact (BILLING, SHIPPING, CUSTOMER).
+ * @return Object Object with cleaned properties
*
* @url DELETE {id}/contact/{contactid}/{type}
*
- * @return int
- *
* @throws RestException 401
* @throws RestException 404
* @throws RestException 500 System error
@@ -675,10 +674,9 @@ class Proposals extends DolibarrApi
/**
* Update commercial proposal general fields (won't touch lines of commercial proposal)
*
- * @param int $id Id of commercial proposal to update
- * @param array $request_data Datas
- *
- * @return int
+ * @param int $id Id of commercial proposal to update
+ * @param array $request_data Datas
+ * @return Object Object with cleaned properties
*/
public function put($id, $request_data = null)
{
@@ -722,7 +720,6 @@ class Proposals extends DolibarrApi
* Delete commercial proposal
*
* @param int $id Commercial proposal ID
- *
* @return array
*/
public function delete($id)
@@ -755,10 +752,9 @@ class Proposals extends DolibarrApi
* Set a proposal to draft
*
* @param int $id Order ID
+ * @return Object Object with cleaned properties
*
* @url POST {id}/settodraft
- *
- * @return array
*/
public function settodraft($id)
{
@@ -807,6 +803,7 @@ class Proposals extends DolibarrApi
*
* @param int $id Commercial proposal ID
* @param int $notrigger 1=Does not execute triggers, 0= execute triggers
+ * @return Object Object with cleaned properties
*
* @url POST {id}/validate
*
@@ -814,8 +811,6 @@ class Proposals extends DolibarrApi
* @throws RestException 401
* @throws RestException 404
* @throws RestException 500 System error
- *
- * @return array
*/
public function validate($id, $notrigger = 0)
{
@@ -860,10 +855,9 @@ class Proposals extends DolibarrApi
* @param int $status Must be 2 (accepted) or 3 (refused) {@min 2}{@max 3}
* @param string $note_private Add this mention at end of private note
* @param int $notrigger Disabled triggers
+ * @return Object Object with cleaned properties
*
* @url POST {id}/close
- *
- * @return array
*/
public function close($id, $status, $note_private = '', $notrigger = 0)
{
@@ -905,10 +899,9 @@ class Proposals extends DolibarrApi
* Set a commercial proposal billed. Could be also called setbilled
*
* @param int $id Commercial proposal ID
+ * @return Object Object with cleaned properties
*
* @url POST {id}/setinvoiced
- *
- * @return array
*/
public function setinvoiced($id)
{
@@ -949,6 +942,7 @@ class Proposals extends DolibarrApi
*
* @param array $data Array with data to verify
* @return array
+ *
* @throws RestException
*/
private function _validate($data)
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index a5fd221de87..150e2c99b66 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -301,7 +301,7 @@ class Propal extends CommonObject
'ref' =>array('type'=>'varchar(30)', 'label'=>'Ref', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'showoncombobox'=>1, 'position'=>20),
'ref_client' =>array('type'=>'varchar(255)', 'label'=>'RefCustomer', 'enabled'=>1, 'visible'=>-1, 'position'=>22),
'ref_ext' =>array('type'=>'varchar(255)', 'label'=>'RefExt', 'enabled'=>1, 'visible'=>0, 'position'=>40),
- 'fk_soc' =>array('type'=>'integer:Societe:societe/class/societe.class.php', 'label'=>'ThirdParty', 'enabled'=>'$conf->societe->enabled', 'visible'=>-1, 'position'=>23),
+ 'fk_soc' =>array('type'=>'integer:Societe:societe/class/societe.class.php', 'label'=>'ThirdParty', 'enabled'=>'isModEnabled("societe")', 'visible'=>-1, 'position'=>23),
'fk_projet' =>array('type'=>'integer:Project:projet/class/project.class.php:1:fk_statut=1', 'label'=>'Fk projet', 'enabled'=>"isModEnabled('project')", 'visible'=>-1, 'position'=>24),
'tms' =>array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>25),
'datec' =>array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-1, 'position'=>55),
@@ -454,6 +454,8 @@ class Propal extends CommonObject
$this->lines[] = $line;
}
+
+ return 1;
}
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -981,9 +983,10 @@ class Propal extends CommonObject
* Delete detail line
*
* @param int $lineid Id of line to delete
+ * @param int $id Id of object (for a check)
* @return int >0 if OK, <0 if KO
*/
- public function deleteline($lineid)
+ public function deleteline($lineid, $id = 0)
{
global $user;
@@ -992,9 +995,20 @@ class Propal extends CommonObject
$line = new PropaleLigne($this->db);
- // For triggers
+ $line->context = $this->context;
+
+ // Load data
$line->fetch($lineid);
+ if ($id > 0 && $line->fk_propal != $id) {
+ $this->error = 'ErrorLineIDDoesNotMatchWithObjectID';
+ return -1;
+ }
+
+ // Memorize previous line for triggers
+ $staticline = clone $line;
+ $line->oldline = $staticline;
+
if ($line->delete($user) > 0) {
$this->update_price(1);
@@ -2108,6 +2122,8 @@ class Propal extends CommonObject
return -1 * $error;
}
}
+
+ return -1;
}
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -2164,6 +2180,8 @@ class Propal extends CommonObject
return -1 * $error;
}
}
+
+ return -1;
}
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -2235,6 +2253,8 @@ class Propal extends CommonObject
return -1 * $error;
}
}
+
+ return -1;
}
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -2417,9 +2437,9 @@ class Propal extends CommonObject
$this->db->rollback();
return -1 * $error;
}
- } else {
- return -1;
}
+
+ return -1;
}
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -2480,6 +2500,8 @@ class Propal extends CommonObject
return -1 * $error;
}
}
+
+ return -1;
}
@@ -2542,6 +2564,8 @@ class Propal extends CommonObject
return -1 * $error;
}
}
+
+ return -1;
}
@@ -2879,7 +2903,7 @@ class Propal extends CommonObject
* @param int $offset For pagination
* @param string $sortfield Sort criteria
* @param string $sortorder Sort order
- * @return int -1 if KO, array with result if OK
+ * @return array|int -1 if KO, array with result if OK
*/
public function liste_array($shortlist = 0, $draft = 0, $notcurrentuser = 0, $socid = 0, $limit = 0, $offset = 0, $sortfield = 'p.datep', $sortorder = 'DESC')
{
@@ -2958,8 +2982,8 @@ class Propal extends CommonObject
/**
* Returns an array with id and ref of related invoices
*
- * @param int $id Id propal
- * @return array Array of invoices id
+ * @param int $id Id propal
+ * @return array|int Array of invoices id
*/
public function InvoiceArrayList($id)
{
@@ -3890,6 +3914,41 @@ class Propal extends CommonObject
return CommonObject::commonReplaceProduct($db, $origin_id, $dest_id, $tables);
}
+
+ /**
+ * Return clicable link of object (with eventually picto)
+ *
+ * @param string $option Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
+ * @return string HTML Code for Kanban thumb.
+ */
+ public function getKanbanView($option = '')
+ {
+ global $langs;
+ $return = '
';
- if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
- $selected = 0;
- if (in_array($obj->rowid, $arrayofselected)) {
- $selected = 1;
+ // Action column
+ if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+ print '
';
+ if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+ $selected = 0;
+ if (in_array($obj->rowid, $arrayofselected)) {
+ $selected = 1;
+ }
+ print '';
}
- print '';
- }
- print '
';
- if (!$i) {
- $totalarray['nbfield']++;
- }
- }
-
- if (!empty($arrayfields['p.ref']['checked'])) {
- print '
';
- if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
- $selected = 0;
- if (in_array($obj->rowid, $arrayofselected)) {
- $selected = 1;
+ // Date modification
+ if (!empty($arrayfields['p.tms']['checked'])) {
+ print '
';
+ if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+ $selected = 0;
+ if (in_array($obj->rowid, $arrayofselected)) {
+ $selected = 1;
+ }
+ print '';
+ }
+ print '
';
}
// Bordereau
diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index a73fd2b5f2c..ab2ecf3a030 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -1060,8 +1060,8 @@ class Account extends CommonObject
* Adds it to non existing supplied categories.
* Existing categories are left untouch.
*
- * @param int[]|int $categories Category or categories IDs
- * @return void
+ * @param int[]|int $categories Category or categories IDs
+ * @return int <0 if KO, >0 if OK
*/
public function setCategories($categories)
{
@@ -1748,6 +1748,39 @@ class Account extends CommonObject
return false;
}
}
+
+ /**
+ * Return clicable link of object (with eventually picto)
+ *
+ * @param string $option Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
+ * @return string HTML Code for Kanban thumb.
+ */
+ public function getKanbanView($option = '')
+ {
+ global $langs;
+ $return = '
';
- if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
- $selected = 0;
- if (in_array($objecttmp->id, $arrayofselected)) {
- $selected = 1;
+ if ($mode == 'kanban') {
+ if ($i == 0) {
+ print '
';
+ if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+ $selected = 0;
+ if (in_array($objecttmp->id, $arrayofselected)) {
+ $selected = 1;
+ }
+ print '';
}
- print '';
+ print '
';
- if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
- $selected = 0;
- if (in_array($objecttmp->id, $arrayofselected)) {
- $selected = 1;
+ print '
';
+ if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+ $selected = 0;
+ if (in_array($objecttmp->id, $arrayofselected)) {
+ $selected = 1;
+ }
+ print '';
+ }
+ print '