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

Fix thirdparty popup

Browse Source
This commit is contained in:
Laurent Destailleur 2018-10-21 12:03:22 +02:00
parent fa99ea1f0f
commit f6b3bc3bdb
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
htdocs/core/boxes/box_services_contracts.php
View File

@ -41,7 +41,7 @@ class box_services_contracts extends ModeleBoxes
* @var DoliDB Database handler.
*/
public $db;
var $param;
var $info_box_head = array();
@ -88,7 +88,7 @@ class box_services_contracts extends ModeleBoxes
$thirdpartytmp = new Societe($db);
$productstatic = new Product($db);
$sql = "SELECT s.nom as name, s.rowid as socid,";
$sql = "SELECT s.nom as name, s.rowid as socid, s.email, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur,";
$sql.= " c.rowid, c.ref, c.statut as contract_status,";
$sql.= " cd.rowid as cdid, cd.label, cd.description, cd.tms as datem, cd.statut, cd.product_type as type,";
$sql.= " p.rowid as product_id, p.ref as product_ref, p.label as plabel, p.fk_product_type as ptype, p.entity";
@ -130,6 +130,13 @@ class box_services_contracts extends ModeleBoxes
$thirdpartytmp->name = $objp->name;
$thirdpartytmp->id = $objp->socid;
$thirdpartytmp->email = $objp->email;
$thirdpartytmp->client = $objp->client;
$thirdpartytmp->fournisseur = $objp->fournisseur;
$thirdpartytmp->code_client = $objp->code_client;
$thirdpartytmp->code_fournisseur = $objp->code_fournisseur;
$thirdpartytmp->code_compta = $objp->code_compta;
$thirdpartytmp->code_compta_fournisseur = $objp->code_compta_fournisseur;
// Multilangs
if (! empty($conf->global->MAIN_MULTILANGS) && $objp->product_id > 0) // if option multilang is on

13
htdocs/core/boxes/box_services_expired.php
View File

@ -39,7 +39,7 @@ class box_services_expired extends ModeleBoxes
* @var DoliDB Database handler.
*/
public $db;
var $param;
var $info_box_head = array();
@ -84,7 +84,7 @@ class box_services_expired extends ModeleBoxes
// Select contracts with at least one expired service
$sql = "SELECT ";
$sql.= " c.rowid, c.ref, c.statut as fk_statut, c.date_contrat, c.ref_customer, c.ref_supplier,";
$sql.= " s.nom as name, s.rowid as socid,";
$sql.= " s.nom as name, s.rowid as socid, s.email, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur,";
$sql.= " MIN(cd.date_fin_validite) as date_line, COUNT(cd.rowid) as nb_services";
$sql.= " FROM ".MAIN_DB_PREFIX."contrat as c, ".MAIN_DB_PREFIX."societe s, ".MAIN_DB_PREFIX."contratdet as cd";
if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@ -113,8 +113,15 @@ class box_services_expired extends ModeleBoxes
$objp = $db->fetch_object($resql);
$thirdpartytmp->id = $objp->socid;
$thirdpartytmp->name = $objp->name;
$thirdpartytmp->id = $objp->socid;
$thirdpartytmp->email = $objp->email;
$thirdpartytmp->client = $objp->client;
$thirdpartytmp->fournisseur = $objp->fournisseur;
$thirdpartytmp->code_client = $objp->code_client;
$thirdpartytmp->code_fournisseur = $objp->code_fournisseur;
$thirdpartytmp->code_compta = $objp->code_compta;
$thirdpartytmp->code_compta_fournisseur = $objp->code_compta_fournisseur;
$contract->id = $objp->rowid;
$contract->ref = $objp->ref;