diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php index 46758f40670..ff2d9fd5aa6 100644 --- a/htdocs/comm/card.php +++ b/htdocs/comm/card.php @@ -42,6 +42,7 @@ require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; +require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php'; if (isModEnabled('invoice')) { require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture-rec.class.php'; @@ -311,6 +312,7 @@ $contactstatic = new Contact($db); $userstatic = new User($db); $form = new Form($db); $formcompany = new FormCompany($db); +$project = new Project($db); $title = $langs->trans("ThirdParty")." - ".$langs->trans('Customer'); if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/thirdpartynameonly/', getDolGlobalString('MAIN_HTML_TITLE')) && $object->name) { @@ -824,7 +826,7 @@ if ($object->id > 0) { if (isModEnabled("propal") && $user->hasRight('propal', 'lire')) { $langs->load("propal"); - $sql = "SELECT s.nom, s.rowid, p.rowid as propalid, p.fk_statut, p.total_ht"; + $sql = "SELECT s.nom, s.rowid, p.rowid as propalid, p.fk_projet, p.fk_statut, p.total_ht"; $sql .= ", p.total_tva"; $sql .= ", p.total_ttc"; $sql .= ", p.ref, p.ref_client, p.remise"; @@ -845,7 +847,7 @@ if ($object->id > 0) { print ''; print ''; - print '
'; + print ''; print ''; @@ -861,6 +863,7 @@ if ($object->id > 0) { $propal_static->ref = $objp->ref; $propal_static->ref_client = $objp->ref_client; // deprecated $propal_static->ref_customer = $objp->ref_client; + $propal_static->fk_project = $objp->fk_projet; $propal_static->total_ht = $objp->total_ht; $propal_static->total_tva = $objp->total_tva; $propal_static->total_ttc = $objp->total_ttc; @@ -891,6 +894,11 @@ if ($object->id > 0) { $relativepath = dol_sanitizeFileName($objp->ref).'/'.dol_sanitizeFileName($objp->ref).'.pdf'; print $formfile->showPreview($file_list, $propal_static->element, $relativepath, 0); } + print '
'.$langs->trans("LastPropals", ($num <= $MAXLIST ? "" : $MAXLIST)).''.$langs->trans("AllPropals").''.$num.''; print ''; print '
'.$langs->trans("LastPropals", ($num <= $MAXLIST ? "" : $MAXLIST)).''.$langs->trans("AllPropals").''.$num.''.img_picto($langs->trans("Statistics"), 'stats').'
'; + if ($propal_static->fk_project > 0) { + $project->fetch($propal_static->fk_project); + print $project->getNomUrl(1); + } // $filename = dol_sanitizeFileName($objp->ref); // $filedir = $conf->propal->multidir_output[$objp->entity].'/'.dol_sanitizeFileName($objp->ref); // $urlsource = '/comm/propal/card.php?id='.$objp->cid; @@ -921,7 +929,7 @@ if ($object->id > 0) { $param =""; $sql = "SELECT s.nom, s.rowid"; - $sql .= ", c.rowid as cid, c.entity, c.total_ht"; + $sql .= ", c.rowid as cid, c.entity, c.fk_projet, c.total_ht"; $sql .= ", c.total_tva"; $sql .= ", c.total_ttc"; $sql .= ", c.ref, c.ref_client, c.fk_statut, c.facture"; @@ -957,7 +965,7 @@ if ($object->id > 0) { print ''; print ''; - print '
'; + print ''; print ''; @@ -970,6 +978,7 @@ if ($object->id > 0) { $commande_static->id = $objp->cid; $commande_static->ref = $objp->ref; $commande_static->ref_client = $objp->ref_client; + $commande_static->fk_project = $objp->fk_projet; $commande_static->total_ht = $objp->total_ht; $commande_static->total_tva = $objp->total_tva; $commande_static->total_ttc = $objp->total_ttc; @@ -1003,6 +1012,11 @@ if ($object->id > 0) { $relativepath = dol_sanitizeFileName($objp->ref).'/'.dol_sanitizeFileName($objp->ref).'.pdf'; print $formfile->showPreview($file_list, $commande_static->element, $relativepath, 0, $param); } + print '
'.$langs->trans("LastCustomerOrders", ($num <= $MAXLIST ? "" : $MAXLIST)).''.$langs->trans("AllOrders").''.$num.''; print ''; print '
'.$langs->trans("LastCustomerOrders", ($num <= $MAXLIST ? "" : $MAXLIST)).''.$langs->trans("AllOrders").''.$num.''.img_picto($langs->trans("Statistics"), 'stats').'
'; + if ($commande_static->fk_project > 0) { + $project->fetch($commande_static->fk_project); + print $project->getNomUrl(1); + } // $filename = dol_sanitizeFileName($objp->ref); // $filedir = $conf->order->multidir_output[$objp->entity].'/'.dol_sanitizeFileName($objp->ref); // $urlsource = '/commande/card.php?id='.$objp->cid; @@ -1030,7 +1044,7 @@ if ($object->id > 0) { */ if (isModEnabled("shipping") && $user->hasRight('expedition', 'lire')) { $sql = 'SELECT e.rowid as id'; - $sql .= ', e.ref, e.entity'; + $sql .= ', e.ref, e.entity, e.fk_projet'; $sql .= ', e.date_creation'; $sql .= ', e.fk_statut as statut'; $sql .= ', s.nom'; @@ -1056,7 +1070,7 @@ if ($object->id > 0) { print ''; print ''; - print '
'; + print ''; print ''; @@ -1068,6 +1082,7 @@ if ($object->id > 0) { $sendingstatic->id = $objp->id; $sendingstatic->ref = $objp->ref; + $sendingstatic->fk_project = $objp->fk_projet; print ''; print ''; } - print ''; + print ''; print "\n"; $i++; } @@ -1127,7 +1147,7 @@ if ($object->id > 0) { * Latest contracts */ if (isModEnabled('contract') && $user->hasRight('contrat', 'lire')) { - $sql = "SELECT s.nom, s.rowid, c.rowid as id, c.ref as ref, c.statut as contract_status, c.datec as dc, c.date_contrat as dcon, c.ref_customer as refcus, c.ref_supplier as refsup, c.entity,"; + $sql = "SELECT s.nom, s.rowid, c.rowid as id, c.ref as ref, c.fk_projet, c.statut as contract_status, c.datec as dc, c.date_contrat as dcon, c.ref_customer as refcus, c.ref_supplier as refsup, c.entity,"; $sql .= " c.last_main_doc, c.model_pdf"; $sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."contrat as c"; $sql .= " WHERE c.fk_soc = s.rowid "; @@ -1145,7 +1165,7 @@ if ($object->id > 0) { print '
'.$langs->trans("LastSendings", ($num <= $MAXLIST ? "" : $MAXLIST)).''.$langs->trans("AllSendings").''.$num.''; print ''; print '
'.$langs->trans("LastSendings", ($num <= $MAXLIST ? "" : $MAXLIST)).''.$langs->trans("AllSendings").''.$num.''.img_picto($langs->trans("Statistics"), 'stats').'
'; @@ -1097,6 +1112,11 @@ if ($object->id > 0) { $relativepath = dol_sanitizeFileName($objp->ref).'/'.dol_sanitizeFileName($objp->ref).'.pdf'; print $formfile->showPreview($file_list, $sendingstatic->table_element, $relativepath, 0, $param); } + print ''; + if ($sendingstatic->fk_project > 0) { + $project->fetch($sendingstatic->fk_project); + print $project->getNomUrl(1); + } // $filename = dol_sanitizeFileName($objp->ref); // $filedir = $conf->expedition->multidir_output[$objp->entity].'/'.dol_sanitizeFileName($objp->ref); // $urlsource = '/expedition/card.php?id='.$objp->cid; @@ -1108,7 +1128,7 @@ if ($object->id > 0) { print '!!!'.$sendingstatic->LibStatut($objp->statut, 5).''.$sendingstatic->LibStatut($objp->statut, 5).'
'; print ''; - print '
'; + print ''; @@ -1160,6 +1180,7 @@ if ($object->id > 0) { $contrat->ref = $objp->ref ? $objp->ref : $objp->id; $contrat->ref_customer = $objp->refcus; $contrat->ref_supplier = $objp->refsup; + $contrat->fk_project = $objp->fk_projet; $contrat->statut = $objp->contract_status; $contrat->last_main_doc = $objp->last_main_doc; $contrat->model_pdf = $objp->model_pdf; @@ -1204,6 +1225,11 @@ if ($object->id > 0) { print $formfile->showPreview($file_list, $contrat->element, $relativepath, 0); } } + print '
'.$langs->trans("LastContracts", ($num <= $MAXLIST ? "" : $MAXLIST)).''; print ''; //print ''; print '
'.$langs->trans("LastContracts", ($num <= $MAXLIST ? "" : $MAXLIST)).''.$langs->trans("AllContracts").''.$num.''.img_picto($langs->trans("Statistics"),'stats').'
'; + if ($contrat->fk_project > 0) { + $project->fetch($contrat->fk_project); + print $project->getNomUrl(1); + } // $filename = dol_sanitizeFileName($objp->ref); // $filedir = $conf->contrat->multidir_output[$objp->entity].'/'.dol_sanitizeFileName($objp->ref); // $urlsource = '/contrat/card.php?id='.$objp->cid; @@ -1237,7 +1263,7 @@ if ($object->id > 0) { * Latest interventions */ if (isModEnabled('intervention') && $user->hasRight('ficheinter', 'lire')) { - $sql = "SELECT s.nom, s.rowid, f.rowid as id, f.ref, f.fk_statut, f.duree as duration, f.datei as startdate, f.entity"; + $sql = "SELECT s.nom, s.rowid, f.rowid as id, f.ref, f.fk_projet, f.fk_statut, f.duree as duration, f.datei as startdate, f.entity"; $sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."fichinter as f"; $sql .= " WHERE f.fk_soc = s.rowid"; $sql .= " AND s.rowid = ".((int) $object->id); @@ -1254,7 +1280,7 @@ if ($object->id > 0) { print ''; print ''; - print '
'; + print ''; print ''; @@ -1267,6 +1293,7 @@ if ($object->id > 0) { $fichinter_static->id = $objp->id; $fichinter_static->ref = $objp->ref; $fichinter_static->statut = $objp->fk_statut; + $fichinter_static->fk_project = $objp->fk_projet; print ''; print '
'.$langs->trans("LastInterventions", ($num <= $MAXLIST ? "" : $MAXLIST)).''.$langs->trans("AllInterventions").''.$num.''; print ''; print '
'.$langs->trans("LastInterventions", ($num <= $MAXLIST ? "" : $MAXLIST)).''.$langs->trans("AllInterventions").''.$num.''.img_picto($langs->trans("Statistics"), 'stats').'
'; @@ -1296,6 +1323,11 @@ if ($object->id > 0) { $relativepath = dol_sanitizeFileName($objp->ref).'/'.dol_sanitizeFileName($objp->ref).'.pdf'; print $formfile->showPreview($file_list, $fichinter_static->element, $relativepath, 0); } + print ''; + if ($fichinter_static->fk_project > 0) { + $project->fetch($fichinter_static->fk_project); + print $project->getNomUrl(1); + } // $filename = dol_sanitizeFileName($objp->ref); // $filedir = getMultidirOutput($fichinter_static).'/'.dol_sanitizeFileName($objp->ref); // $urlsource = '/fichinter/card.php?id='.$objp->cid; @@ -1323,7 +1355,7 @@ if ($object->id > 0) { * Latest invoices templates */ if (isModEnabled('invoice') && $user->hasRight('facture', 'lire')) { - $sql = 'SELECT f.rowid as id, f.titre as ref'; + $sql = 'SELECT f.rowid as id, f.titre as ref, f.fk_projet'; $sql .= ', f.total_ht'; $sql .= ', f.total_tva'; $sql .= ', f.total_ttc'; @@ -1351,7 +1383,7 @@ if ($object->id > 0) { print '
'; print ''; print ''; - $colspan = 4; + $colspan = 5; if (getDolGlobalString('MAIN_SHOW_PRICE_WITH_TAX_IN_SUMMARIES')) { $colspan++; } @@ -1369,6 +1401,7 @@ if ($object->id > 0) { $invoicetemplate->id = $objp->id; $invoicetemplate->ref = $objp->ref; + $invoicetemplate->fk_project = $objp->fk_projet; $invoicetemplate->suspended = $objp->suspended; $invoicetemplate->frequency = $objp->frequency; $invoicetemplate->unit_frequency = $objp->unit_frequency; @@ -1381,6 +1414,11 @@ if ($object->id > 0) { print ''; print ''; if ($objp->frequency && $objp->date_last_gen > 0) { @@ -1424,7 +1462,7 @@ if ($object->id > 0) { * Latest invoices */ if (isModEnabled('invoice') && $user->hasRight('facture', 'lire')) { - $sql = 'SELECT f.rowid as facid, f.ref, f.type, f.ref_client'; + $sql = 'SELECT f.rowid as facid, f.ref, f.type, f.ref_client, f.fk_projet'; $sql .= ', f.total_ht'; $sql .= ', f.total_tva'; $sql .= ', f.total_ttc'; @@ -1450,7 +1488,7 @@ if ($object->id > 0) { print '
'; print '
'; print $invoicetemplate->getNomUrl(1); + print ''; + if ($invoicetemplate->fk_project > 0) { + $project->fetch($invoicetemplate->fk_project); + print $project->getNomUrl(1); + } print '
'; print ''; - $colspan = 5; + $colspan = 6; if (getDolGlobalString('MAIN_SHOW_PRICE_WITH_TAX_IN_SUMMARIES')) { $colspan++; } @@ -1472,6 +1510,7 @@ if ($object->id > 0) { $facturestatic->id = $objp->facid; $facturestatic->ref = $objp->ref; $facturestatic->ref_client = $objp->ref_client; + $facturestatic->fk_project = $objp->fk_projet; $facturestatic->type = $objp->type; $facturestatic->total_ht = $objp->total_ht; $facturestatic->total_tva = $objp->total_tva; @@ -1512,6 +1551,11 @@ if ($object->id > 0) { $relativepath = dol_sanitizeFileName($objp->ref).'/'.dol_sanitizeFileName($objp->ref).'.pdf'; print $formfile->showPreview($file_list, $facturestatic->element, $relativepath, 0); } + print '
'; + if ($facturestatic->fk_project > 0) { + $project->fetch($facturestatic->fk_project); + print $project->getNomUrl(1); + } // $filename = dol_sanitizeFileName($objp->ref); // $filedir = $conf->facture->multidir_output[$objp->entity].'/'.dol_sanitizeFileName($objp->ref); // $urlsource = '/compta/facture/card.php?id='.$objp->cid;