';
print '| '.$langs->trans("Statistics").' - '.$langs->trans("OpportunitiesStatusForOpenedProjects").' |
|---|
'."\n";
+
$listofstatus = array_keys($listofoppstatus);
+ // Complete with values found into database and not into the dictionary
+ foreach ($valsamount as $key => $val) {
+ if (!in_array($key, $listofstatus) && $key) {
+ $listofstatus[] = $key;
+ }
+ }
+
foreach ($listofstatus as $status)
{
$labelStatus = '';
@@ -74,6 +81,7 @@ if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
$code = dol_getIdFromCode($db, $status, 'c_lead_status', 'rowid', 'code');
if ($code) $labelStatus = $langs->transnoentitiesnoconv("OppStatus".$code);
if (empty($labelStatus)) $labelStatus = $listofopplabel[$status];
+ if (empty($labelStatus)) $labelStatus = $langs->transnoentitiesnoconv('OldValue', $status); // When id is id of an entry no more in dictionary for example.
//$labelStatus .= ' ('.$langs->trans("Coeff").': '.price2num($listofoppstatus[$status]).')';
//$labelStatus .= ' - '.price2num($listofoppstatus[$status]).'%';
diff --git a/htdocs/projet/info.php b/htdocs/projet/info.php
index 8cc6ff87642..96b29c42c86 100644
--- a/htdocs/projet/info.php
+++ b/htdocs/projet/info.php
@@ -162,7 +162,7 @@ $morehtmlcenter = '';
if (!empty($conf->agenda->enabled))
{
$addActionBtnRight = !empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create);
- $morehtmlcenter .= dolGetButtonTitle($langs->trans('AddAction'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.$object->id), '', $addActionBtnRight);
+ $morehtmlcenter .= dolGetButtonTitle($langs->trans('AddAction'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out.'&socid='.$object->socid.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.$object->id), '', $addActionBtnRight);
}
//print '';
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index ea121acc4c7..052d681b0a0 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -1542,12 +1542,12 @@ else
//}
// Supplier
- //if ($object->fournisseur) {
- print '| '.$form->editfieldkey('SuppliersCategoriesShort', 'suppcats', '', $object, 0).' | ';
- $cate_arbo = $form->select_all_categories(Categorie::TYPE_SUPPLIER, null, 'parent', null, null, 1);
- print $form->multiselectarray('suppcats', $cate_arbo, GETPOST('suppcats', 'array'), null, null, null, null, "90%");
- print " |
";
- //}
+ if (!empty($conf->fournisseur->enabled)) {
+ print '| '.$form->editfieldkey('SuppliersCategoriesShort', 'suppcats', '', $object, 0).' | ';
+ $cate_arbo = $form->select_all_categories(Categorie::TYPE_SUPPLIER, null, 'parent', null, null, 1);
+ print $form->multiselectarray('suppcats', $cate_arbo, GETPOST('suppcats', 'array'), null, null, null, null, "90%");
+ print " |
";
+ }
}
// Multicurrency
@@ -2180,17 +2180,19 @@ else
print "";
// Supplier
- print '| '.$form->editfieldkey('SuppliersCategoriesShort', 'suppcats', '', $object, 0).' | ';
- print '';
- $cate_arbo = $form->select_all_categories(Categorie::TYPE_SUPPLIER, null, null, null, null, 1);
- $c = new Categorie($db);
- $cats = $c->containing($object->id, Categorie::TYPE_SUPPLIER);
- $arrayselected = array();
- foreach ($cats as $cat) {
- $arrayselected[] = $cat->id;
+ if (!empty($conf->fournisseur->enabled)) {
+ print ' |
| '.$form->editfieldkey('SuppliersCategoriesShort', 'suppcats', '', $object, 0).' | ';
+ print '';
+ $cate_arbo = $form->select_all_categories(Categorie::TYPE_SUPPLIER, null, null, null, null, 1);
+ $c = new Categorie($db);
+ $cats = $c->containing($object->id, Categorie::TYPE_SUPPLIER);
+ $arrayselected = array();
+ foreach($cats as $cat) {
+ $arrayselected[] = $cat->id;
+ }
+ print $form->multiselectarray('suppcats', $cate_arbo, $arrayselected, '', 0, '', 0, '90%');
+ print " |
";
}
- print $form->multiselectarray('suppcats', $cate_arbo, $arrayselected, '', 0, '', 0, '90%');
- print "";
}
// Multicurrency
@@ -2560,7 +2562,7 @@ else
}
// Supplier
- if ($object->fournisseur) {
+ if (!empty($conf->fournisseur->enabled) && $object->fournisseur) {
print '| '.$langs->trans("SuppliersCategoriesShort").' | ';
print '';
print $form->showCategories($object->id, Categorie::TYPE_SUPPLIER, 1);
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 3842a8cd2a9..8de2ab23baf 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -3654,7 +3654,7 @@ class Societe extends CommonObject
public function create_from_member(Adherent $member, $socname = '', $socalias = '', $customercode = '')
{
// phpcs:enable
- global $user, $langs;
+ global $conf, $user, $langs;
dol_syslog(get_class($this)."::create_from_member", LOG_DEBUG);
@@ -3687,6 +3687,23 @@ class Societe extends CommonObject
$result = $this->create($user);
if ($result >= 0)
{
+ // Auto-create contact on thirdparty creation
+ if (!empty($conf->global->THIRDPARTY_DEFAULT_CREATE_CONTACT))
+ {
+ // Fill fields needed by contact
+ $this->name_bis = $member->lastname;
+ $this->firstname = $member->firstname;
+ $this->civility_id = $member->civility_id;
+ dol_syslog("We ask to create a contact/address too", LOG_DEBUG);
+ $result = $this->create_individual($user);
+ if ($result < 0)
+ {
+ setEventMessages($this->error, $this->errors, 'errors');
+ $this->db->rollback();
+ return -1;
+ }
+ }
+
$sql = "UPDATE ".MAIN_DB_PREFIX."adherent";
$sql .= " SET fk_soc=".$this->id;
$sql .= " WHERE rowid=".$member->id;
diff --git a/htdocs/stripe/class/stripe.class.php b/htdocs/stripe/class/stripe.class.php
index 83b3905de43..a691b7bff40 100644
--- a/htdocs/stripe/class/stripe.class.php
+++ b/htdocs/stripe/class/stripe.class.php
@@ -428,11 +428,11 @@ class Stripe extends CommonObject
// payment_method =
// payment_method_types = array('card')
//var_dump($dataforintent);
- if ($off_session)
- {
- unset($dataforintent['setup_future_usage']);
- $dataforintent["off_session"] = true;
- }
+ if ($off_session)
+ {
+ unset($dataforintent['setup_future_usage']);
+ $dataforintent["setup_future_usage"] = "off_session";
+ }
if (!is_null($payment_method))
{
$dataforintent["payment_method"] = $payment_method;
diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php
index 076c42867ca..aaf5b29a985 100644
--- a/htdocs/ticket/card.php
+++ b/htdocs/ticket/card.php
@@ -560,17 +560,21 @@ if (empty($reshook)) {
// Action to update one extrafield
if ($action == "update_extras" && !empty($permissiontoadd)) {
$object->fetch(GETPOST('id', 'int'), '', GETPOST('track_id', 'alpha'));
- $attributekey = GETPOST('attribute', 'alpha');
- $attributekeylong = 'options_' . $attributekey;
- $object->array_options['options_' . $attributekey] = GETPOST($attributekeylong, ' alpha');
- $result = $object->insertExtraFields(empty($triggermodname) ? '' : $triggermodname, $user);
- if ($result > 0) {
- setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
- $action = 'view';
- } else {
+ $ret = $extrafields->setOptionalsFromPost(null, $object, GETPOST('attribute', 'none'));
+ if ($ret < 0) $error++;
+ if (!$error)
+ {
+ $result = $object->insertExtraFields(empty($triggermodname) ? '' : $triggermodname, $user);
+ if ($result < 0) { $error++; }
+ }
+
+ if ($error) {
setEventMessages($object->error, $object->errors, 'errors');
$action = 'edit_extras';
+ } else {
+ setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
+ $action = 'view';
}
}
diff --git a/htdocs/ticket/list.php b/htdocs/ticket/list.php
index 90cd1fd1ec9..def67225f6a 100644
--- a/htdocs/ticket/list.php
+++ b/htdocs/ticket/list.php
@@ -346,11 +346,12 @@ foreach ($search as $key => $val)
$newarrayofstatus[] = $val2;
}
if ($search['fk_statut'] == 'openall' || in_array('openall', $search['fk_statut'])) {
- $newarrayofstatus[] = Ticket::STATUS_NOT_READ;
- $newarrayofstatus[] = Ticket::STATUS_ASSIGNED;
- $newarrayofstatus[] = Ticket::STATUS_IN_PROGRESS;
- $newarrayofstatus[] = Ticket::STATUS_NEED_MORE_INFO;
- $newarrayofstatus[] = Ticket::STATUS_WAITING;
+ $newarrayofstatus[] = Ticket::STATUS_NOT_READ;
+ $newarrayofstatus[] = Ticket::STATUS_READ;
+ $newarrayofstatus[] = Ticket::STATUS_ASSIGNED;
+ $newarrayofstatus[] = Ticket::STATUS_IN_PROGRESS;
+ $newarrayofstatus[] = Ticket::STATUS_NEED_MORE_INFO;
+ $newarrayofstatus[] = Ticket::STATUS_WAITING;
}
if ($search['fk_statut'] == 'closeall' || in_array('closeall', $search['fk_statut'])) {
$newarrayofstatus[] = Ticket::STATUS_CLOSED;
diff --git a/htdocs/user/class/usergroup.class.php b/htdocs/user/class/usergroup.class.php
index 4d858ffbaf9..2c29db85fc7 100644
--- a/htdocs/user/class/usergroup.class.php
+++ b/htdocs/user/class/usergroup.class.php
@@ -675,6 +675,10 @@ class UserGroup extends CommonObject
{
global $user, $conf;
+ if (empty($this->nom) && !empty($this->name)) {
+ $this->nom = $this->name;
+ }
+
$entity = $conf->entity;
if (!empty($conf->multicompany->enabled) && $conf->entity == 1)
{
|