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

Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0

Browse Source 
Conflicts:
	htdocs/comm/action/class/api_agendaevents.class.php
	htdocs/compta/sociales/card.php
	htdocs/societe/consumption.php
This commit is contained in:
Laurent Destailleur 2021-03-08 19:27:34 +01:00
commit 2f0c4038fb
4 changed files with 37 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/comm/action/class/api_agendaevents.class.php
View File

@ -16,9 +16,10 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
use Luracast\Restler\RestException; use Luracast\Restler\RestException;
require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
/** /**
* API class for Agenda Events * API class for Agenda Events
@ -53,7 +54,6 @@ class AgendaEvents extends DolibarrApi
/** /**
* Get properties of a Agenda Events object * Get properties of a Agenda Events object
*
* Return an array with Agenda Events informations * Return an array with Agenda Events informations
* *
* @param int $id ID of Agenda Events * @param int $id ID of Agenda Events
@ -66,7 +66,7 @@ class AgendaEvents extends DolibarrApi
if (!DolibarrApiAccess::$user->rights->agenda->myactions->read) { if (!DolibarrApiAccess::$user->rights->agenda->myactions->read) {
throw new RestException(401, "Insufficient rights to read an event"); throw new RestException(401, "Insufficient rights to read an event");
} }
if ($id == 0) { if ($id === 0) {
$result = $this->actioncomm->initAsSpecimen(); $result = $this->actioncomm->initAsSpecimen();
} else { } else {
$result = $this->actioncomm->fetch($id); $result = $this->actioncomm->fetch($id);

6
htdocs/compta/sociales/card.php
View File

@ -320,7 +320,7 @@ if ($action == 'create')
print $langs->trans("Date"); print $langs->trans("Date");
print '</td>'; print '</td>';
print '<td>'; print '<td>';
print $form->selectDate(!empty($dateech) ? $dateech : '-1', 'ech', 0, 0, 0, 'charge', 1); print $form->selectDate(!empty($dateech) ? $dateech : '-1', 'ech', 0, 0, 0, 'charge', 1, 1);
print '</td>'; print '</td>';
print "</tr>\n"; print "</tr>\n";
@ -521,10 +521,10 @@ if ($id > 0)
if ($action == 'edit') if ($action == 'edit')
{ {
print '<tr><td>'.$langs->trans("AmountTTC")."</td><td>"; print '<tr><td>'.$langs->trans("AmountTTC")."</td><td>";
print '<input type="text" name="amount" size="12" class="flat" value="'.$object->amount.'">'; print '<input type="text" name="amount" size="12" class="flat" value="'.price($object->amount).'">';
print "</td></tr>"; print "</td></tr>";
} else { } else {
print '<tr><td>'.$langs->trans("AmountTTC").'</td><td>'.price($object->amount, 0, $outputlangs, 1, -1, -1, $conf->currency).'</td></tr>'; print '<tr><td>'.$langs->trans("AmountTTC").'</td><td>'.price($object->amount, 0, $langs, 1, -1, -1, $conf->currency).'</td></tr>';
} }
// Mode of payment // Mode of payment

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

@ -1307,7 +1307,7 @@ class FormFile
// $section is inside $param // $section is inside $param
$newparam .= preg_replace('/&file=.*$/', '', $param); // We don't need param file= $newparam .= preg_replace('/&file=.*$/', '', $param); // We don't need param file=
$backtopage = DOL_URL_ROOT.'/ecm/index.php?&section_dir='.urlencode($relativepath).$newparam; $backtopage = DOL_URL_ROOT.'/ecm/index.php?&section_dir='.urlencode($relativepath).$newparam;
print '<a class="editfielda" href="'.DOL_URL_ROOT.'/ecm/file_card.php?urlfile='.urlencode($file['name']).$param.'&backtopage='.urlencode($backtopage).'" class="editfilelink" rel="'.urlencode($file['name']).'">'.img_edit('default', 0, 'class="paddingrightonly"').'</a>'; print '<a class="editfielda editfilelink" href="'.DOL_URL_ROOT.'/ecm/file_card.php?urlfile='.urlencode($file['name']).$param.'&backtopage='.urlencode($backtopage).'" rel="'.urlencode($file['name']).'">'.img_edit('default', 0, 'class="paddingrightonly"').'</a>';
} }
if (empty($useinecm) || $useinecm == 2 || $useinecm == 6) // 6=Media file manager if (empty($useinecm) || $useinecm == 2 || $useinecm == 6) // 6=Media file manager
@ -1333,7 +1333,7 @@ class FormFile
if ($permtoeditline) if ($permtoeditline)
{ {
$paramsectiondir = (in_array($modulepart, array('medias', 'ecm')) ? '&section_dir='.urlencode($relativepath) : ''); $paramsectiondir = (in_array($modulepart, array('medias', 'ecm')) ? '&section_dir='.urlencode($relativepath) : '');
print '<a class="editfielda reposition" href="'.(($useinecm == 1 || $useinecm == 5) ? '#' : ($url.'?action=editfile&urlfile='.urlencode($filepath).$paramsectiondir.$param)).'" class="editfilelink" rel="'.$filepath.'">'.img_edit('default', 0, 'class="paddingrightonly"').'</a>'; print '<a class="editfielda reposition editfilelink" href="'.(($useinecm == 1 || $useinecm == 5) ? '#' : ($url.'?action=editfile&urlfile='.urlencode($filepath).$paramsectiondir.$param)).'" rel="'.$filepath.'">'.img_edit('default', 0, 'class="paddingrightonly"').'</a>';
} }
} }
if ($permonobject) if ($permonobject)

3
htdocs/societe/consumption.php
View File

@ -422,6 +422,7 @@ if ($sql_select)
$documentstatic->statut = $objp->status; $documentstatic->statut = $objp->status;
$documentstatic->status = $objp->status; $documentstatic->status = $objp->status;
$documentstatic->paye = $objp->paid; $documentstatic->paye = $objp->paid;
$documentstatic->alreadypaid = $objp->paid;
if (is_object($documentstaticline)) $documentstaticline->statut = $objp->status; if (is_object($documentstaticline)) $documentstaticline->statut = $objp->status;
@ -435,6 +436,8 @@ if ($sql_select)
print '<td class="center">'; print '<td class="center">';
if ($type_element == 'contract') { if ($type_element == 'contract') {
print $documentstaticline->getLibStatut(5); print $documentstaticline->getLibStatut(5);
} elseif ($type_element == 'invoice') {
print $documentstatic->getLibStatut(5, $objp->paid);
} else { } else {
print $documentstatic->getLibStatut(5); print $documentstatic->getLibStatut(5);
} }