Frédéric FRANCE 4 years ago
parent
commit
e1ad7013d9
2 changed files with 3 additions and 3 deletions
  1. 1 1
      htdocs/asset/card.php
  2. 2 2
      htdocs/core/boxes/box_services_contracts.php

+ 1 - 1
htdocs/asset/card.php

@@ -79,7 +79,7 @@ $permissiontoadd = $user->rights->asset->write; // Used by the include of action
 $permissiontodelete = $user->rights->asset->delete || ($permissiontoadd && isset($object->status) && $object->status == $object::STATUS_DRAFT);
 $permissionnote = $user->rights->asset->write; // Used by the include of actions_setnotes.inc.php
 $permissiondellink = $user->rights->asset->write; // Used by the include of actions_dellink.inc.php
-$upload_dir = $conf->mymodule->multidir_output[isset($object->entity) ? $object->entity : 1];
+$upload_dir = $conf->asset->multidir_output[isset($object->entity) ? $object->entity : 1];
 
 
 /*

+ 2 - 2
htdocs/core/boxes/box_services_contracts.php

@@ -90,7 +90,7 @@ class box_services_contracts extends ModeleBoxes
 			$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, c.ref_customer, c.ref_supplier,";
 			$sql .= " cd.rowid as cdid, cd.label, cd.description, cd.tms as datem, cd.statut as contractline_status, cd.product_type as type, cd.date_fin_validite as date_line,";
-			$sql .= " p.rowid as product_id, p.ref as product_ref, p.label as product_label, p.fk_product_type as product_type, p.entity, p.tobuy, p.tosell";
+			$sql .= " p.rowid as product_id, p.ref as product_ref, p.label as product_label, p.fk_product_type as product_type, p.entity as product_entity, p.tobuy, p.tosell";
 			$sql .= " FROM (".MAIN_DB_PREFIX."societe as s";
 			$sql .= " INNER JOIN ".MAIN_DB_PREFIX."contrat as c ON s.rowid = c.fk_soc";
 			$sql .= " INNER JOIN ".MAIN_DB_PREFIX."contratdet as cd ON c.rowid = cd.fk_contrat";
@@ -155,7 +155,7 @@ class box_services_contracts extends ModeleBoxes
 						$productstatic->id = $objp->product_id;
 						$productstatic->type = $objp->product_type;
 						$productstatic->ref = $objp->product_ref;
-						$productstatic->entity = $objp->pentity;
+						$productstatic->entity = $objp->product_entity;
 						$productstatic->label = $objp->product_label;
 						$productstatic->status = $objp->tosell;
 						$productstatic->status_buy = $objp->tobuy;