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

Debug v18

Browse Source
This commit is contained in:
Laurent Destailleur 2023-04-06 11:49:28 +02:00
parent f877a978b1
commit 30e1ac2aa0
4 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
htdocs/contrat/class/contrat.class.php
View File

@ -1931,10 +1931,10 @@ class Contrat extends CommonObject
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/** /**
* Renvoi label of a given contrat status * Return the label of a given contrat status
* *
* @param int $status Id status * @param int $status Id status
* @param int $mode 0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto, 7=Same than 6 with fixed length * @param int $mode 0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label (status of services), 5=Short label + Picto, 6=Long label + Picto (status of services), 7=Same than 6 with fixed length (status of services)
* @return string Label * @return string Label
*/ */
public function LibStatut($status, $mode) public function LibStatut($status, $mode)
@ -2859,14 +2859,15 @@ class Contrat extends CommonObject
$return .= '<div class="info-box-content">'; $return .= '<div class="info-box-content">';
$return .= '<span class="info-box-ref">'.(method_exists($this, 'getNomUrl') ? $this->getNomUrl() : $this->ref).'</span>'; $return .= '<span class="info-box-ref">'.(method_exists($this, 'getNomUrl') ? $this->getNomUrl() : $this->ref).'</span>';
$return .= '<input id="cb'.$this->id.'" class="flat checkforselect fright" type="checkbox" name="toselect[]" value="'.$this->id.'"'.($selected ? ' checked="checked"' : '').'>'; $return .= '<input id="cb'.$this->id.'" class="flat checkforselect fright" type="checkbox" name="toselect[]" value="'.$this->id.'"'.($selected ? ' checked="checked"' : '').'>';
if (property_exists($this, 'societe')) { if (!empty($arraydata['thirdparty'])) {
$return .= '<br><span class="info-box-label ">'.$this->societe.'</span>'; $tmpthirdparty = $arraydata['thirdparty'];
$return .= '<br><div class="info-box-label inline-block">'.$tmpthirdparty->getNomUrl(1).'</div>';
} }
if (property_exists($this, 'date_contrat')) { if (property_exists($this, 'date_contrat')) {
$return .= '<br><span class="opacitymedium">'.$langs->trans("DateContract").' : </span><span class="info-box-label">'.dol_print_date($this->date_contrat, 'day').'</span>'; $return .= '<br><span class="opacitymedium">'.$langs->trans("DateContract").' : </span><span class="info-box-label">'.dol_print_date($this->date_contrat, 'day').'</span>';
} }
if (method_exists($this, 'getLibStatut')) { if (method_exists($this, 'getLibStatut')) {
$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(3).'</div>'; $return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(7).'</div>';
} }
$return .= '</div>'; $return .= '</div>';
$return .= '</div>'; $return .= '</div>';

17
htdocs/contrat/list.php
View File

@ -964,10 +964,12 @@ while ($i < $imaxinloop) {
$contracttmp->ref_customer = $obj->ref_customer; $contracttmp->ref_customer = $obj->ref_customer;
$contracttmp->ref_supplier = $obj->ref_supplier; $contracttmp->ref_supplier = $obj->ref_supplier;
if ($obj->socid > 0) { $contracttmp->nbofserviceswait = $obj->nb_initial;
$result = $socstatic->fetch($obj->socid); $contracttmp->nbofservicesopened = $obj->nb_running;
} $contracttmp->nbofservicesexpired = $obj->nb_expired;
/*$socstatic->id = $obj->socid; $contracttmp->nbofservicesclosed = $obj->nb_closed;
$socstatic->id = $obj->socid;
$socstatic->name = $obj->name; $socstatic->name = $obj->name;
$socstatic->name_alias = $obj->name_alias; $socstatic->name_alias = $obj->name_alias;
$socstatic->email = $obj->email; $socstatic->email = $obj->email;
@ -975,7 +977,8 @@ while ($i < $imaxinloop) {
$socstatic->logo = $obj->logo; $socstatic->logo = $obj->logo;
$socstatic->country_id = $obj->country_id; $socstatic->country_id = $obj->country_id;
$socstatic->country_code = ''; $socstatic->country_code = '';
$socstatic->country = '';*/ $socstatic->country = '';
if ($obj->country_id > 0) { if ($obj->country_id > 0) {
if (!isset($cacheCountryIDCode[$obj->country_id]['code'])) { if (!isset($cacheCountryIDCode[$obj->country_id]['code'])) {
$tmparray = getCountry($obj->country_id, 'all'); $tmparray = getCountry($obj->country_id, 'all');
@ -991,9 +994,9 @@ while ($i < $imaxinloop) {
print '<div class="box-flex-container kanban">'; print '<div class="box-flex-container kanban">';
} }
// Output Kanban // Output Kanban
$contracttmp->societe = $socstatic->getNomUrl(); $arraydata['thirdparty'] = $socstatic;
$contracttmp->date_contrat = $obj->date_contrat; $contracttmp->date_contrat = $obj->date_contrat;
print $contracttmp->getKanbanView(''); print $contracttmp->getKanbanView('', $arraydata);
if ($i == ($imaxinloop - 1)) { if ($i == ($imaxinloop - 1)) {
print '</div>'; print '</div>';
print '</td></tr>'; print '</td></tr>';

4
htdocs/langs/en_US/main.lang
View File

@ -905,8 +905,8 @@ ConfirmMassClone=Bulk clone confirmation
ConfirmMassCloneQuestion=Select project to clone to ConfirmMassCloneQuestion=Select project to clone to
ConfirmMassCloneToOneProject=Clone to project %s ConfirmMassCloneToOneProject=Clone to project %s
RelatedObjects=Related Objects RelatedObjects=Related Objects
ClassifyBilled=Classify billed ClassifyBilled=Classify Billed
ClassifyUnbilled=Classify unbilled ClassifyUnbilled=Classify Unbilled
Progress=Progress Progress=Progress
ProgressShort=Progr. ProgressShort=Progr.
FrontOffice=Front office FrontOffice=Front office

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

@ -48,7 +48,7 @@ DateDeliveryPlanned=Planned date of delivery
RefDeliveryReceipt=Ref delivery receipt RefDeliveryReceipt=Ref delivery receipt
StatusReceipt=Status delivery receipt StatusReceipt=Status delivery receipt
DateReceived=Date delivery received DateReceived=Date delivery received
ClassifyReception=Classify reception ClassifyReception=Classify Received
SendShippingByEMail=Send shipment by email SendShippingByEMail=Send shipment by email
SendShippingRef=Submission of shipment %s SendShippingRef=Submission of shipment %s
ActionsOnShipping=Events on shipment ActionsOnShipping=Events on shipment