@@ -70,9 +70,9 @@ class Product extends CommonObject
* @var string
*/
var $label;
- /**
+ /**
* Product descripion
- * @var string
+ * @var string
*/
var $description;
@@ -3691,7 +3691,7 @@ class Product extends CommonObject
$filename = preg_replace('/'.preg_quote($dir,'/').'/i','',$file); // Nom du fichier
// On efface l'image d'origine
- dol_delete_file($file);
+ dol_delete_file($file, 0, 0, 0, $this); // For triggers
// Si elle existe, on efface la vignette
if (preg_match('/('.$this->regeximgext.')$/i',$filename,$regs))
diff --git a/htdocs/public/test/test_arrays.php b/htdocs/public/test/test_arrays.php
index e08eb5715c4..c2be96b4468 100644
--- a/htdocs/public/test/test_arrays.php
+++ b/htdocs/public/test/test_arrays.php
@@ -61,8 +61,9 @@ else
This page is a sample of page using tables. It is designed to make test with
-- css (add parameter &theme=newthem to test another theme or edit css of current theme)
+- css (add parameter &theme=newtheme to test another theme or edit css of current theme)
- jmobile (add parameter dol_use_jmobile=1&dol_optimize_smallscreen=1 to enable view with jmobile)
+- no javascript / usage for bind people (add parameter nojs=1 to force disable javascript)
- dataTables
- tablednd
diff --git a/htdocs/public/test/test_forms.php b/htdocs/public/test/test_forms.php
index 86db08fe148..c0c81882fe2 100644
--- a/htdocs/public/test/test_forms.php
+++ b/htdocs/public/test/test_forms.php
@@ -16,8 +16,9 @@ llxHeader();
This page is a sample of page using Dolibarr HTML widget methods. It is designed to make test with
-- css (edit page to change to test another css)
-- jmobile (add parameter dol_use_jmobile=1 to enable view with jmobile)
+- css (add parameter &theme=newtheme to test another theme or edit css of current theme)
+- jmobile (add parameter dol_use_jmobile=1&dol_optimize_smallscreen=1 to enable view with jmobile)
+- no javascript / usage for bind people (add parameter nojs=1 to force disable javascript)
@@ -44,41 +45,52 @@ print '
'."\n";
print "Test 3: We must have here 1970-01-01 00:00:00 selected (fields are mandatory)
\n";
$form->select_date(dol_get_first_day(1970,1,false), 'test3', 1, 1, 0);
-print '
'."\n";
+/*print '
'."\n";
-// Test4a: form->select_product
-print "Test 4: Select product - ";
-$form->select_produits(0,'producttest');
+print "Test 4c: a select with ajax refresh
\n";
+//$array=array(0=>'',1=>'Search into xxx',2=>'Search into yyy',3=>'Search into zzz');
+$array=array();
+$selected=-1;
+print $form->selectArrayAjax(DOL_URL_ROOT.'/core/ajax/selecsearchbox.php', 'testselectc', $array, $selected, 1, 0, 0, 'style="min-width: 250px;"', 0, 0, 0, '', '', 1);
+*/
print '
'."\n";
-// Test4b: form->selectarray
-print "Test 4: Select array - ";
+// Test4: a select
+print "Test 4a: a select
\n";
+$array=array(1=>'Value 1',2=>'Value 2',3=>'Value 3 ith a very long text. aze eazeae e ae aeae a e a ea ea ea e a e aea e ae aeaeaeaze.');
+$selected=3;
+print $form->selectarray('testselecta', $array, $selected, 1, 0, 0, 'style="min-width: 250px;"', 0, 0, 0, '', '', 1);
+print '
';
+print "Test 4b: a select
\n";
+$array=array(1=>'Value 1',2=>'Value 2',3=>'Value 3');
+$selected=3;
+print $form->selectarray('testselectb', $array, $selected, 1, 0, 0, 'style="min-width: 250px;"', 0, 0, 0, '', '', 1);
+print '
'."\n";
+print "Test 4c: Select array with no js forced
\n";
$array=array(1=>'Value 1',2=>'Value 2',3=>'Value 3');
-$arrayselected=array(1,3);
print $form->selectarray('selectarray',$array);
print '
'."\n";
+// Test4d: form->select_thirdparty
+print "Test 4d: Select thirdparty
\n";
+print $form->select_thirdparty(0,'thirdpartytest');
+
+print '
'."\n";
+
+// Test4e: form->select_product
+print "Test 4e: Select product (using ajax)
\n";
+$form->select_produits(0,'producttest');
+
+print '
'."\n";
+
// Test5: a multiselect
print "Test 5: a multiselect
\n";
$array=array(1=>'Value 1',2=>'Value 2',3=>'Value 3');
$arrayselected=array(1,3);
print $form->multiselectarray('testmulti', $array, $arrayselected, '', 0, '', 0, 250);
-print '
'."\n";
-
-// Test6: a select
-print "Test 6a: a select
\n";
-$array=array(1=>'Value 1',2=>'Value 2',3=>'Value 3 ith a very long text. aze eazeae e ae aeae a e a ea ea ea e a e aea e ae aeaeaeaze.');
-$selected=3;
-print $form->selectarray('testselecta', $array, $selected, 1, 0, 0, 'style="min-width: 250px;"', 0, 0, 0, '', '', 1);
-print '
';
-print "Test 6b: a select
\n";
-$array=array(1=>'Value 1',2=>'Value 2',3=>'Value 3');
-$selected=3;
-print $form->selectarray('testselectb', $array, $selected, 1, 0, 0, 'style="min-width: 250px;"', 0, 0, 0, '', '', 1);
-
llxFooter();
$db->close();
diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php
index 00345c87566..f8d7f05725a 100644
--- a/htdocs/societe/soc.php
+++ b/htdocs/societe/soc.php
@@ -1775,6 +1775,20 @@ else
print $form->formconfirm($_SERVER["PHP_SELF"]."?socid=".$object->id,$langs->trans("DeleteACompany"),$langs->trans("ConfirmDeleteCompany"),"confirm_delete",'',0,"action-delete");
}
+ if ($action == 'merge') {
+ $form = new Form($db);
+
+ $options = array(
+ array(
+ 'label' => $langs->trans('MergeOriginThirdparty'),
+ 'type' => 'other',
+ 'value' => $form->select_company('', 'soc_origin', 's.rowid != '.$object->id, 1)
+ )
+ );
+
+ print $form->formconfirm($_SERVER["PHP_SELF"]."?socid=".$object->id,$langs->trans("MergeThirdparties"),$langs->trans("ConfirmMergeThirdparties"),"confirm_merge",$options,'',1);
+ }
+
dol_htmloutput_errors($error,$errors);
$showlogo=$object->logo;
@@ -2225,6 +2239,8 @@ else
$reshook=$hookmanager->executeHooks('addMoreActionsButtons',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
if (empty($reshook))
{
+ print '';
+
if (! empty($object->email))
{
$langs->load("mails");
diff --git a/htdocs/user/clicktodial.php b/htdocs/user/clicktodial.php
index f72a8eb0f15..93d6587ef1e 100644
--- a/htdocs/user/clicktodial.php
+++ b/htdocs/user/clicktodial.php
@@ -46,7 +46,7 @@ $result = restrictedArea($user, 'user', $id, '&user', $feature2);
* Actions
*/
-if ($action == 'update' && ! $_POST['cancel'])
+if ($action == 'update' && ! GETPOST('cancel'))
{
$edituser = new User($db);
$edituser->fetch($id);
@@ -138,6 +138,11 @@ if ($id > 0)
print '';
}
+ print '| ClickToDial '.$langs->trans("IdPhoneCaller").' | ';
+ print '';
+ print ' | ';
+ print "
\n";
+
print '| ClickToDial '.$langs->trans("Login").' | ';
print '';
print ' | ';
@@ -148,11 +153,6 @@ if ($id > 0)
print '';
print "
\n";
- print '| ClickToDial '.$langs->trans("IdPhoneCaller").' | ';
- print '';
- print ' | ';
- print "
\n";
-
print '';
print '
';
@@ -185,15 +185,20 @@ if ($id > 0)
print '';
print '';
}
+
+ print '
| ClickToDial '.$langs->trans("IdPhoneCaller").' | ';
+ print ''.(! empty($fuser->clicktodial_poste)?$fuser->clicktodial_poste:'').' | ';
+ print "
";
+
print '| ClickToDial '.$langs->trans("Login").' | ';
print ''.(! empty($fuser->clicktodial_login)?$fuser->clicktodial_login:'').' | ';
print '
';
+
print '| ClickToDial '.$langs->trans("Password").' | ';
print ''.preg_replace('/./','*',(! empty($fuser->clicktodial_password)?$fuser->clicktodial_password:'')).' | ';
print "
\n";
- print '| ClickToDial '.$langs->trans("IdPhoneCaller").' | ';
- print ''.(! empty($fuser->clicktodial_poste)?$fuser->clicktodial_poste:'').' | ';
- print "
\n";
+
+ print "\n";
}
print "\n";