| '; print $form->textwithpicto($langs->trans("BankAccount"), $langs->trans($labelofbankfield)); print ' | '; diff --git a/htdocs/compta/prelevement/factures.php b/htdocs/compta/prelevement/factures.php index 9488380ad31..22da9e20afb 100644 --- a/htdocs/compta/prelevement/factures.php +++ b/htdocs/compta/prelevement/factures.php @@ -147,6 +147,7 @@ if ($id > 0 || $ref) { print ' | ||||||||||||
| '; print $form->textwithpicto($langs->trans("BankAccount"), $langs->trans($labelofbankfield)); print ' | '; + print ''; if ($acc->id > 0) { print $acc->getNomUrl(1); @@ -347,12 +348,12 @@ if ($resql) { } print ' | '; print ' | '; - //if ($totalinvoices != $object->amount) print img_warning("AmountOfFileDiffersFromSumOfInvoices"); // It is normal to have total that differs. For an amount of invoice of 100, request to pay may be 50 only. - if ($totalamount_requested != $object->amount) { - print img_warning("AmountOfFileDiffersFromSumOfInvoices"); - } print " | \n"; print ''; + // If the page show all record (no pagination) and total does not match total of file, we show a warning. Should not happen. + if (($nbtotalofrecords <= $num) && $totalamount_requested != $object->amount) { + print img_warning("AmountOfFileDiffersFromSumOfInvoices"); + } print price($totalamount_requested); print " | \n"; print ''; diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index e55be478e0b..7779c6e16d8 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -255,7 +255,7 @@ class Form if (empty($notabletag)) { $ret .= ' | ||||||||
| ';
}
- if (preg_match('/^(string|safehtmlstring|email)/', $typeofdata)) {
+ if (preg_match('/^(string|safehtmlstring|email|url)/', $typeofdata)) {
$tmp = explode(':', $typeofdata);
$ret .= '';
} elseif (preg_match('/^(integer)/', $typeofdata)) {
@@ -339,6 +339,8 @@ class Form
} else {
if (preg_match('/^(email)/', $typeofdata)) {
$ret .= dol_print_email($value, 0, 0, 0, 0, 1);
+ } elseif (preg_match('/^url/', $typeofdata)) {
+ $ret .= dol_print_url($value, '_blank', 32, 1);
} elseif (preg_match('/^(amount|numeric)/', $typeofdata)) {
$ret .= ($value != '' ? price($value, '', $langs, 0, -1, -1, $conf->currency) : '');
} elseif (preg_match('/^(checkbox)/', $typeofdata)) {
diff --git a/htdocs/langs/en_US/modulebuilder.lang b/htdocs/langs/en_US/modulebuilder.lang
index edcb5923af0..02fb5b5d6a9 100644
--- a/htdocs/langs/en_US/modulebuilder.lang
+++ b/htdocs/langs/en_US/modulebuilder.lang
@@ -6,7 +6,7 @@ EnterNameOfObjectDesc=Enter the name of the object to create with no spaces. Use
EnterNameOfDictionaryDesc=Enter the name of the dictionary to create with no spaces. Use uppercase to separate words (For example: MyDico...). The class file, but also the SQL file will be generated.
ModuleBuilderDesc2=Path where modules are generated/edited (first directory for external modules defined into %s): %s
ModuleBuilderDesc3=Generated/editable modules found: %s
-ModuleBuilderDesc4=A module is detected as 'editable' when the file %s exists in root of module directory
+ModuleBuilderDesc4=A module is detected as a 'module for Module Builer' when the file %s exists in the root of the module directory
NewModule=New module
NewObjectInModulebuilder=New object
NewDictionary=New dictionary
diff --git a/htdocs/loan/payment/card.php b/htdocs/loan/payment/card.php
index 309e0d99f4a..b291b313e43 100644
--- a/htdocs/loan/payment/card.php
+++ b/htdocs/loan/payment/card.php
@@ -223,7 +223,7 @@ print ' ';
if (empty($action) && !empty($user->rights->loan->delete)) {
if (!$disable_delete) {
- print dolGetButtonAction($langs->trans("Delete"), '', 'delete', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&token='.newToken(), 'delete', 1);
+ print dolGetButtonAction($langs->trans("Delete"), '', 'delete', $_SERVER["PHP_SELF"].'?id='.$id.'&action=delete&token='.newToken(), 'delete', 1);
} else {
print dolGetButtonAction($langs->trans("CantRemovePaymentWithOneInvoicePaid"), $langs->trans("Delete"), 'delete', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&token='.newToken(), 'delete', 0);
}
diff --git a/htdocs/mrp/mo_movements.php b/htdocs/mrp/mo_movements.php
index 5b30237b1b7..87cedbab0cb 100644
--- a/htdocs/mrp/mo_movements.php
+++ b/htdocs/mrp/mo_movements.php
@@ -928,20 +928,20 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
print $userstatic->getNomUrl(-1);
print " | \n";
}
+ // Inventory code
if (!empty($arrayfields['m.inventorycode']['checked'])) {
- // Inventory code
- print ''; + print ' | '; //print ''; print dol_escape_htmltag($objp->inventorycode); //print ''; print ' | '; } + // Label of movement if (!empty($arrayfields['m.label']['checked'])) { - // Label of movement print ''.dol_escape_htmltag($objp->label).' | '; } + // Type of movement if (!empty($arrayfields['m.type_mouvement']['checked'])) { - // Type of movement switch ($objp->type_mouvement) { case "0": print ''.$langs->trans('StockIncreaseAfterCorrectTransfer').' | '; @@ -972,17 +972,18 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea if (!empty($arrayfields['m.value']['checked'])) { // Qty print ''; - if ($objp->qt > 0) { - print '+'; + if ($objp->qty >0) { + print '+'.$objp->qty.''; + } else { + print ''.$objp->qty.''; } - print $objp->qty; print ' | '; } if (!empty($arrayfields['m.price']['checked'])) { // Price print ''; if ($objp->price != 0) { - print price($objp->price); + print ''.price($objp->price).''; } print ' | '; } diff --git a/htdocs/projet/class/api_tasks.class.php b/htdocs/projet/class/api_tasks.class.php index 4f1cc85ce8c..8bf6769d8fa 100644 --- a/htdocs/projet/class/api_tasks.class.php +++ b/htdocs/projet/class/api_tasks.class.php @@ -517,6 +517,7 @@ class Tasks extends DolibarrApi * @param string $note Note * * @url POST {id}/addtimespent + * NOTE: Should be "POST {id}/timespent", since POST already implies "add" * * @return array */ @@ -563,6 +564,110 @@ class Tasks extends DolibarrApi ); } + /** + * Update time spent for a task of a project. + * You can test this API with the following input message + * { "date": "2016-12-31 23:15:00", "duration": 1800, "user_id": 1, "note": "My time test" } + * + * @param int $id Task ID + * @param int $timespent_id Time spent ID (llx_projet_task_time.rowid) + * @param datetime $date Date (YYYY-MM-DD HH:MI:SS in GMT) + * @param int $duration Duration in seconds (3600 = 1h) + * @param int $user_id User (Use 0 for connected user) + * @param string $note Note + * + * @url PUT {id}/timespent/{timespent_id} + * + * @return array + */ + public function putTimeSpent($id, $timespent_id, $date, $duration, $user_id = 0, $note = '') + { + if (!DolibarrApiAccess::$user->rights->projet->creer) { + throw new RestException(401); + } + $this->timespentRecordChecks($id, $timespent_id); + + if (!DolibarrApi::_checkAccessToResource('task', $this->task->id)) { + throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login); + } + + $newdate = dol_stringtotime($date, 1); + $this->task->timespent_date = $newdate; + $this->task->timespent_datehour = $newdate; + $this->task->timespent_withhour = 1; + $this->task->timespent_duration = $duration; + $this->task->timespent_fk_user = $user_id ?? DolibarrApiAccess::$user->id; + $this->task->timespent_note = $note; + + $result = $this->task->updateTimeSpent(DolibarrApiAccess::$user, 0); + if ($result == 0) { + throw new RestException(304, 'Error nothing done.'); + } + if ($result < 0) { + throw new RestException(500, 'Error when updating time spent: '.$this->task->error); + } + + return array( + 'success' => array( + 'code' => 200, + 'message' => 'Time spent updated' + ) + ); + } + + /** + * Delete time spent for a task of a project. + * + * @param int $id Task ID + * @param int $timespent_id Time spent ID (llx_projet_task_time.rowid) + * + * @url DELETE {id}/timespent/{timespent_id} + * + * @return array + */ + public function deleteTimeSpent($id, $timespent_id) + { + if (!DolibarrApiAccess::$user->rights->projet->supprimer) { + throw new RestException(401); + } + $this->timespentRecordChecks($id, $timespent_id); + + if (!DolibarrApi::_checkAccessToResource('task', $this->task->id)) { + throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login); + } + + if ($this->task->delTimeSpent(DolibarrApiAccess::$user, 0) < 0) { + throw new RestException(500, 'Error when deleting time spent: '.$this->task->error); + } + + return array( + 'success' => array( + 'code' => 200, + 'message' => 'Time spent deleted' + ) + ); + } + + /** + * Validate task & timespent IDs for timespent API methods. + * Loads the selected task & timespent records. + * + * @param int $id Task ID + * @param int $timespent_id Time spent ID (llx_projet_task_time.rowid) + * + * @return void + */ + protected function timespentRecordChecks($id, $timespent_id) + { + if ($this->task->fetch($id) <= 0) { + throw new RestException(404, 'Task not found'); + } + if ($this->task->fetchTimeSpent($timespent_id) <= 0) { + throw new RestException(404, 'Timespent not found'); + } elseif ($this->task->id != $id) { + throw new RestException(404, 'Timespent not found in selected task'); + } + } // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore /** diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php index 43526abf0ab..c72dcbccda8 100644 --- a/htdocs/projet/element.php +++ b/htdocs/projet/element.php @@ -504,6 +504,7 @@ $listofreferent = array( 'buttonnew'=>'CreateMO', 'testnew'=>$user->hasRight('mrp', 'write'), 'project_field'=>'fk_project', + 'nototal'=>1, 'test'=>!empty($conf->mrp->enabled) && $user->hasRight('mrp', 'read')), 'trip'=>array( 'name'=>"TripsAndExpenses", @@ -992,6 +993,7 @@ foreach ($listofreferent as $key => $value) { $buttonnew = empty($value['buttonnew']) ? '' : $value['buttonnew']; $testnew = empty($value['testnew']) ? '' : $value['testnew']; $project_field = empty($value['project_field']) ? '' : $value['project_field']; + $nototal = empty($value['nototal']) ? 0 : 1; $exclude_select_element = array('payment_various'); if (!empty($value['exclude_select_element'])) { @@ -1518,47 +1520,49 @@ foreach ($listofreferent as $key => $value) { } // Total - $colspan = 4; - if (in_array($tablename, array('projet_task'))) { - $colspan = 2; - } + if (empty($nototal)) { + $colspan = 4; + if (in_array($tablename, array('projet_task'))) { + $colspan = 2; + } - print '|||||||
| '.$langs->trans("Number").': '.$i.' | '; - if (in_array($tablename, array('projet_task'))) { - print ''; - print convertSecondToTime($total_time, 'allhourmin'); - print ' | '; - print ''; - print ' | '; - } - //if (empty($value['disableamount']) && ! in_array($tablename, array('projet_task'))) print ''.$langs->trans("TotalHT").' : '.price($total_ht).' | '; - //elseif (empty($value['disableamount']) && in_array($tablename, array('projet_task'))) print ''.$langs->trans("Total").' : '.price($total_ht).' | '; - // If fichinter add the total_duration - if ($tablename == 'fichinter') { - print ''.convertSecondToTime($total_duration, 'all', $conf->global->MAIN_DURATION_OF_WORKDAY).' | '; - } - print ''; - if (empty($value['disableamount'])) { - if ($key == 'loan') { - print $langs->trans("Total").' '.$langs->trans("LoanCapital").' : '.price($total_ttc); - } elseif ($tablename != 'projet_task' || !empty($conf->salaries->enabled)) { - print ''.$langs->trans("TotalHT").' : '.price($total_ht); + print ' | |||||||
| '.$langs->trans("Number").': '.$i.' | '; + if (in_array($tablename, array('projet_task'))) { + print ''; + print convertSecondToTime($total_time, 'allhourmin'); + print ' | '; + print ''; + print ' | '; } - } - print ''; - //if (empty($value['disableamount']) && ! in_array($tablename, array('projet_task'))) print ''.$langs->trans("TotalTTC").' : '.price($total_ttc).' | '; - //elseif (empty($value['disableamount']) && in_array($tablename, array('projet_task'))) print ''; - print ' | '; - if (empty($value['disableamount'])) { - if ($key == 'loan') { - print $langs->trans("Total").' '.$langs->trans("RemainderToPay").' : '.price($total_ttc); - } elseif ($tablename != 'projet_task' || !empty($conf->salaries->enabled)) { - print $langs->trans("TotalTTC").' : '.price($total_ttc); + //if (empty($value['disableamount']) && ! in_array($tablename, array('projet_task'))) print ' | '.$langs->trans("TotalHT").' : '.price($total_ht).' | '; + //elseif (empty($value['disableamount']) && in_array($tablename, array('projet_task'))) print ''.$langs->trans("Total").' : '.price($total_ht).' | '; + // If fichinter add the total_duration + if ($tablename == 'fichinter') { + print ''.convertSecondToTime($total_duration, 'all', $conf->global->MAIN_DURATION_OF_WORKDAY).' | '; } + print ''; + if (empty($value['disableamount'])) { + if ($key == 'loan') { + print $langs->trans("Total").' '.$langs->trans("LoanCapital").' : '.price($total_ttc); + } elseif ($tablename != 'projet_task' || !empty($conf->salaries->enabled)) { + print ''.$langs->trans("TotalHT").' : '.price($total_ht); + } + } + print ' | '; + //if (empty($value['disableamount']) && ! in_array($tablename, array('projet_task'))) print ''.$langs->trans("TotalTTC").' : '.price($total_ttc).' | '; + //elseif (empty($value['disableamount']) && in_array($tablename, array('projet_task'))) print ''; + print ' | '; + if (empty($value['disableamount'])) { + if ($key == 'loan') { + print $langs->trans("Total").' '.$langs->trans("RemainderToPay").' : '.price($total_ttc); + } elseif ($tablename != 'projet_task' || !empty($conf->salaries->enabled)) { + print $langs->trans("TotalTTC").' : '.price($total_ttc); + } + } + print ' | '; + print ''; + print ' | '; - print ''; } else { if (!is_array($elementarray)) { // error print ' |
| '.$elementarray.' |