Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

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

Browse Source
This commit is contained in:
Laurent Destailleur
2019-09-27 14:07:35 +02:00
parent 6d1a571aed ab33665f7b
commit da35e3d7cd
3 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/expedition/class/expedition.class.php
View File

@@ -602,7 +602,7 @@ class Expedition extends CommonObject
$this->fk_incoterms = $obj->fk_incoterms;
$this->location_incoterms = $obj->location_incoterms;
$this->libelle_incoterms = $obj->libelle_incoterms;
$this->db->free($result);
if ($this->statut == self::STATUS_DRAFT) $this->brouillon = 1;
@@ -1379,6 +1379,7 @@ class Expedition extends CommonObject
// phpcs:enable
global $conf, $mysoc;
// TODO: recuperer les champs du document associe a part
$this->lines=array();
$sql = "SELECT cd.rowid, cd.fk_product, cd.label as custom_label, cd.description, cd.qty as qty_asked, cd.product_type";
$sql.= ", cd.total_ht, cd.total_localtax1, cd.total_localtax2, cd.total_ttc, cd.total_tva";

9
htdocs/projet/class/project.class.php
View File

@@ -1676,9 +1676,11 @@ class Project extends CommonObject
*
* @param string $tableName Table of the element to update
* @param int $elementSelectId Key-rowid of the line of the element to update
* @param string $projectfield The column name that stores the link with the project
*
* @return int 1 if OK or < 0 if KO
*/
public function remove_element($tableName, $elementSelectId)
public function remove_element($tableName, $elementSelectId, $projectfield = 'fk_projet')
{
// phpcs:enable
$sql="UPDATE ".MAIN_DB_PREFIX.$tableName;
@@ -1687,10 +1689,9 @@ class Project extends CommonObject
{
$sql.= " SET fk_project=NULL";
$sql.= " WHERE id=".$elementSelectId;
}
else
}else
{
$sql.= " SET fk_projet=NULL";
$sql.= " SET ".$projectfield."=NULL";
$sql.= " WHERE rowid=".$elementSelectId;
}

9
htdocs/projet/element.php
View File

@@ -512,10 +512,11 @@ if ($action=="addelement")
elseif ($action == "unlink")
{
$tablename = GETPOST("tablename");
$elementselectid = GETPOST("elementselect");
$tablename = GETPOST("tablename", "aZ09");
$projectField = GETPOST("projectfield", "aZ09");
$elementselectid = GETPOST("elementselect", "int");
$result = $object->remove_element($tablename, $elementselectid);
$result = $object->remove_element($tablename, $elementselectid, $projectField);
if ($result < 0)
{
setEventMessages($object->error, $object->errors, 'errors');
@@ -889,7 +890,7 @@ foreach ($listofreferent as $key => $value)
{
if (empty($conf->global->PROJECT_DISABLE_UNLINK_FROM_OVERVIEW) || $user->admin) // PROJECT_DISABLE_UNLINK_FROM_OVERVIEW is empty by defaut, so this test true
{
print '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $projectid . '&action=unlink&tablename=' . $tablename . '&elementselect=' . $element->id . '" class="reposition">';
print '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $projectid . '&action=unlink&tablename=' . $tablename . '&elementselect=' . $element->id . ($project_field ? '&projectfield=' . $project_field : '') . '" class="reposition">';
print img_picto($langs->trans('Unlink'), 'unlink');
print '</a>';
}