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

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

Browse Source
This commit is contained in:
Laurent Destailleur 2018-03-13 18:04:59 +01:00
commit 0258d3aeeb
4 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/comm/action/class/actioncomm.class.php
View File

@ -164,6 +164,7 @@ class ActionComm extends CommonObject
// Properties for links to other objects // Properties for links to other objects
var $fk_element; // Id of record var $fk_element; // Id of record
var $elementid; // Id of record alternative for API
var $elementtype; // Type of record. This if property ->element of object linked to. var $elementtype; // Type of record. This if property ->element of object linked to.
// Ical // Ical
@ -550,7 +551,7 @@ class ActionComm extends CommonObject
$sql.= " a.fk_user_author, a.fk_user_mod,"; $sql.= " a.fk_user_author, a.fk_user_mod,";
$sql.= " a.fk_user_action, a.fk_user_done,"; $sql.= " a.fk_user_action, a.fk_user_done,";
$sql.= " a.fk_contact, a.percent as percentage,"; $sql.= " a.fk_contact, a.percent as percentage,";
$sql.= " a.fk_element, a.elementtype,"; $sql.= " a.fk_element as elementid, a.elementtype,";
$sql.= " a.priority, a.fulldayevent, a.location, a.punctual, a.transparency,"; $sql.= " a.priority, a.fulldayevent, a.location, a.punctual, a.transparency,";
$sql.= " c.id as type_id, c.code as type_code, c.libelle as type_label, c.color as type_color, c.picto as type_picto,"; $sql.= " c.id as type_id, c.code as type_code, c.libelle as type_label, c.color as type_color, c.picto as type_picto,";
$sql.= " s.nom as socname,"; $sql.= " s.nom as socname,";
@ -624,7 +625,8 @@ class ActionComm extends CommonObject
$this->societe->id = $obj->fk_soc; // deprecated $this->societe->id = $obj->fk_soc; // deprecated
$this->contact->id = $obj->fk_contact; // deprecated $this->contact->id = $obj->fk_contact; // deprecated
$this->fk_element = $obj->fk_element; $this->fk_element = $obj->elementid;
$this->elementid = $obj->elementid;
$this->elementtype = $obj->elementtype; $this->elementtype = $obj->elementtype;
$this->fetchResources(); $this->fetchResources();

6
htdocs/commande/class/commande.class.php
View File

@ -3135,6 +3135,12 @@ class Commande extends CommonOrder
// End call triggers // End call triggers
} }
if ($this->nb_expedition() != 0)
{
$this->errors[] = $langs->trans('SomeShipmentExists');
$error++;
}
if (! $error) if (! $error)
{ {
// Delete order details // Delete order details

7
htdocs/projet/element.php
View File

@ -1137,9 +1137,12 @@ foreach ($listofreferent as $key => $value)
print '<td>&nbsp;</td>'; print '<td>&nbsp;</td>';
print '</tr>'; print '</tr>';
} }
else // error else
{ {
print $elementarray; if (! is_array($elementarray)) // error
{
print $elementarray;
}
} }
print "</table>"; print "</table>";
print "<br>\n"; print "<br>\n";

6
htdocs/societe/card.php
View File

@ -74,7 +74,9 @@ $extralabels=$extrafields->fetch_name_optionals_label($object->table_element);
// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
$hookmanager->initHooks(array('thirdpartycard','globalcard')); $hookmanager->initHooks(array('thirdpartycard','globalcard'));
if ($action == 'view' && $object->fetch($socid)<=0) if ($socid > 0) $object->fetch($socid);
if (! ($object->id > 0) && $action == 'view')
{ {
$langs->load("errors"); $langs->load("errors");
print($langs->trans('ErrorRecordNotFound')); print($langs->trans('ErrorRecordNotFound'));
@ -118,8 +120,6 @@ if (empty($reshook))
if ($action == 'confirm_merge' && $confirm == 'yes' && $user->rights->societe->creer) if ($action == 'confirm_merge' && $confirm == 'yes' && $user->rights->societe->creer)
{ {
$object->fetch($socid);
$error = 0; $error = 0;
$soc_origin_id = GETPOST('soc_origin', 'int'); $soc_origin_id = GETPOST('soc_origin', 'int');
$soc_origin = new Societe($db); $soc_origin = new Societe($db);