';
- print '';
+ print ' ';
print '';
diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index 74aba8662a6..403fedddd15 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -92,7 +92,7 @@ $result = restrictedArea($user, $module, $objectid, $dbtable);
$object = new Propal($db);
// Load object
-if ($id > 0 || ! empty($ref))
+if ($id > 0 || ! empty($ref))
{
$ret=$object->fetch($id, $ref);
}
@@ -159,29 +159,29 @@ else if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->prop
// Remove line
else if ($action == 'confirm_deleteline' && $confirm == 'yes' && $user->rights->propale->creer)
{
- $object->fetch($id);
- $object->fetch_thirdparty();
- $result = $object->deleteline($lineid);
- // reorder lines
- if ($result) $object->line_order(true);
-
- // Define output language
- $outputlangs = $langs;
- $newlang='';
- if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id'])) $newlang=$_REQUEST['lang_id'];
- if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
- if (! empty($newlang))
- {
- $outputlangs = new Translate("",$conf);
- $outputlangs->setDefaultLang($newlang);
- }
- if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
- {
- $ret=$object->fetch($id); // Reload to get new records
- propale_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager);
- }
-
- Header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
+ $object->fetch($id);
+ $object->fetch_thirdparty();
+ $result = $object->deleteline($lineid);
+ // reorder lines
+ if ($result) $object->line_order(true);
+
+ // Define output language
+ $outputlangs = $langs;
+ $newlang='';
+ if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id'])) $newlang=$_REQUEST['lang_id'];
+ if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
+ if (! empty($newlang))
+ {
+ $outputlangs = new Translate("",$conf);
+ $outputlangs->setDefaultLang($newlang);
+ }
+ if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
+ {
+ $ret=$object->fetch($id); // Reload to get new records
+ propale_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager);
+ }
+
+ Header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
exit;
}
@@ -253,18 +253,18 @@ else if ($action == 'set_ref_client' && $user->rights->propale->creer)
$object->set_ref_client($user, $_POST['ref_client']);
}
-else if ($action == 'setnote_public' && $user->rights->propale->creer)
-{
- $object->fetch($id);
- $result=$object->update_note_public(dol_html_entity_decode(GETPOST('note_public'), ENT_QUOTES));
- if ($result < 0) dol_print_error($db,$object->error);
+else if ($action == 'setnote_public' && $user->rights->propale->creer)
+{
+ $object->fetch($id);
+ $result=$object->update_note_public(dol_html_entity_decode(GETPOST('note_public'), ENT_QUOTES));
+ if ($result < 0) dol_print_error($db,$object->error);
}
-
-else if ($action == 'setnote' && $user->rights->propale->creer)
-{
- $object->fetch($id);
- $result=$object->update_note(dol_html_entity_decode(GETPOST('note'), ENT_QUOTES));
- if ($result < 0) dol_print_error($db,$object->error);
+
+else if ($action == 'setnote' && $user->rights->propale->creer)
+{
+ $object->fetch($id);
+ $result=$object->update_note(dol_html_entity_decode(GETPOST('note'), ENT_QUOTES));
+ if ($result < 0) dol_print_error($db,$object->error);
}
// Create proposal
@@ -957,21 +957,21 @@ else if ($action == 'builddoc' && $user->rights->propale->creer)
}
}
-// Remove file in doc form
-else if ($action == 'remove_file')
-{
- if ($object->fetch($id))
- {
- require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
-
- $object->fetch_thirdparty();
-
- $langs->load("other");
- $upload_dir = $conf->propal->dir_output;
- $file = $upload_dir . '/' . GETPOST('file');
- dol_delete_file($file,0,0,0,$object);
- $mesg = ''.$langs->trans("FileWasRemoved",GETPOST('file')).'
';
- }
+// Remove file in doc form
+else if ($action == 'remove_file')
+{
+ if ($object->fetch($id))
+ {
+ require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
+
+ $object->fetch_thirdparty();
+
+ $langs->load("other");
+ $upload_dir = $conf->propal->dir_output;
+ $file = $upload_dir . '/' . GETPOST('file');
+ dol_delete_file($file,0,0,0,$object);
+ $mesg = ''.$langs->trans("FileWasRemoved",GETPOST('file')).'
';
+ }
}
// Set project
@@ -1071,63 +1071,63 @@ else if ($action == 'down' && $user->rights->propale->creer)
if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
{
- if ($action == 'addcontact' && $user->rights->propale->creer)
- {
- $result = $object->fetch($id);
-
- if ($result > 0 && $id > 0)
+ if ($action == 'addcontact' && $user->rights->propale->creer)
+ {
+ $result = $object->fetch($id);
+
+ if ($result > 0 && $id > 0)
{
- $contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'));
- $result = $result = $object->add_contact($contactid, $_POST["type"], $_POST["source"]);
- }
-
- if ($result >= 0)
- {
- Header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
- exit;
- }
- else
- {
- if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
- {
- $langs->load("errors");
- $mesg = ''.$langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType").'
';
- }
- else
- {
- $mesg = ''.$object->error.'
';
- }
- }
- }
-
- // Bascule du statut d'un contact
- else if ($action == 'swapstatut' && $user->rights->propale->creer)
- {
- if ($object->fetch($id) > 0)
- {
- $result=$object->swapContactStatus(GETPOST('ligne'));
- }
- else
- {
- dol_print_error($db);
- }
- }
-
- // Efface un contact
- else if ($action == 'deletecontact' && $user->rights->propale->creer)
- {
- $object->fetch($id);
- $result = $object->delete_contact($lineid);
-
- if ($result >= 0)
- {
- Header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
- exit;
- }
- else
- {
- dol_print_error($db);
- }
+ $contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'));
+ $result = $result = $object->add_contact($contactid, $_POST["type"], $_POST["source"]);
+ }
+
+ if ($result >= 0)
+ {
+ Header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+ exit;
+ }
+ else
+ {
+ if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
+ {
+ $langs->load("errors");
+ $mesg = ''.$langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType").'
';
+ }
+ else
+ {
+ $mesg = ''.$object->error.'
';
+ }
+ }
+ }
+
+ // Bascule du statut d'un contact
+ else if ($action == 'swapstatut' && $user->rights->propale->creer)
+ {
+ if ($object->fetch($id) > 0)
+ {
+ $result=$object->swapContactStatus(GETPOST('ligne'));
+ }
+ else
+ {
+ dol_print_error($db);
+ }
+ }
+
+ // Efface un contact
+ else if ($action == 'deletecontact' && $user->rights->propale->creer)
+ {
+ $object->fetch($id);
+ $result = $object->delete_contact($lineid);
+
+ if ($result >= 0)
+ {
+ Header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+ exit;
+ }
+ else
+ {
+ dol_print_error($db);
+ }
}
}
@@ -1564,19 +1564,19 @@ print ''.$langs->trans('Status').' ';
-
- $linkback=''.$langs->trans("BackToList").' ';
-
- // Ref
- print ''.$langs->trans('Ref').' ';
- print $form->showrefnav($object,'ref',$linkback,1,'ref','ref','');
- print ' ';
- print '';
- print $langs->trans('RefCustomer').' ';
- print ' ';
- print '
';
- print ' ';
- print $object->ref_client;
- print ' ';
- print '".$langs->trans("Company")." ";
- print ''.$object->thirdparty->getNomUrl(1).' '.$langs->trans("NbOfAttachedFiles").' '.count($filearray).' '.$langs->trans("TotalSizeOfAttachedFiles").' '.$totalsize.' '.$langs->trans("bytes").'
';
-
- print '';
-
- dol_htmloutput_mesg($mesg,$mesgs);
-
- /*
- * Confirmation suppression fichier
- */
- if ($action == 'delete')
- {
- $ret=$form->form_confirm($_SERVER["PHP_SELF"].'?id='.$id.'&urlfile='.urlencode(GETPOST("urlfile")), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile', '', 0, 1);
- if ($ret == 'html') print '';
+
+ $linkback=''.$langs->trans("BackToList").' ';
+
+ // Ref
+ print ''.$langs->trans('Ref').' ';
+ print $form->showrefnav($object,'ref',$linkback,1,'ref','ref','');
+ print ' ';
+ print '';
+ print $langs->trans('RefCustomer').' ';
+ print ' ';
+ print '
';
+ print ' ';
+ print $object->ref_client;
+ print ' ';
+ print '".$langs->trans("Company")." ";
+ print ''.$object->thirdparty->getNomUrl(1).' '.$langs->trans("NbOfAttachedFiles").' '.count($filearray).' '.$langs->trans("TotalSizeOfAttachedFiles").' '.$totalsize.' '.$langs->trans("bytes").'
';
+
+ print '';
+
+ dol_htmloutput_mesg($mesg,$mesgs);
+
+ /*
+ * Confirmation suppression fichier
+ */
+ if ($action == 'delete')
+ {
+ $ret=$form->form_confirm($_SERVER["PHP_SELF"].'?id='.$id.'&urlfile='.urlencode(GETPOST("urlfile")), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile', '', 0, 1);
+ if ($ret == 'html') print '";
- $propalstatic->id=$obj->rowid;
- $propalstatic->ref=$obj->ref;
+ $propalstatic->id=$obj->rowid;
+ $propalstatic->ref=$obj->ref;
print ''.$propalstatic->getNomUrl(1).' ';
- $companystatic->id=$obj->socid;
- $companystatic->name=$obj->socname;
- $companystatic->client=$obj->client;
- $companystatic->canvas=$obj->canvas;
+ $companystatic->id=$obj->socid;
+ $companystatic->name=$obj->socname;
+ $companystatic->client=$obj->client;
+ $companystatic->canvas=$obj->canvas;
print ''.$companystatic->getNomUrl(1,'customer',24).' ';
print ' ';
@@ -265,10 +265,10 @@ if ($resql)
print '';
- $companystatic->id=$obj->socid;
- $companystatic->name=$obj->socname;
- $companystatic->client=$obj->client;
- $companystatic->canvas=$obj->canvas;
+ $companystatic->id=$obj->socid;
+ $companystatic->name=$obj->socname;
+ $companystatic->client=$obj->client;
+ $companystatic->canvas=$obj->canvas;
print ''.$companystatic->getNomUrl(1,'customer').' ';
print ''.dol_print_date($db->jdate($obj->datec),'day').' ';
@@ -340,10 +340,10 @@ if ($conf->propal->enabled && $user->rights->propale->lire)
print "";
- $companystatic->id=$obj->socid;
- $companystatic->name=$obj->socname;
- $companystatic->client=$obj->client;
- $companystatic->canvas=$obj->canvas;
+ $companystatic->id=$obj->socid;
+ $companystatic->name=$obj->socname;
+ $companystatic->client=$obj->client;
+ $companystatic->canvas=$obj->canvas;
print ''.$companystatic->getNomUrl(1,'customer',44).' '."\n";
print '';
diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index 0fbd9b060ca..f8f9f361cd0 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -86,7 +86,7 @@ $result = restrictedArea($user, $module, $objectid, $dbtable);
$object = new Propal($db);
// Load object
-if ($id > 0 || ! empty($ref))
+if ($id > 0 || ! empty($ref))
{
$ret=$object->fetch($id, $ref);
}
@@ -172,9 +172,9 @@ if ($search_ref)
{
$sql.= " AND p.ref LIKE '%".$db->escape(trim($search_ref))."%'";
}
-if ($search_refcustomer)
-{
- $sql.= " AND p.ref_client LIKE '%".$db->escape(trim($search_refcustomer))."%'";
+if ($search_refcustomer)
+{
+ $sql.= " AND p.ref_client LIKE '%".$db->escape(trim($search_refcustomer))."%'";
}
if ($search_societe)
{
@@ -284,8 +284,8 @@ if ($result)
print ' ';
print ' ';
- print '';
- print ' ';
+ print ' ';
print '';
print $langs->trans('Month').': ';
// Customer ref
- print '';
- print $objp->ref_client;
+ print ' ';
+ print $objp->ref_client;
print ' ';
// Date propale
diff --git a/htdocs/comm/propal/note.php b/htdocs/comm/propal/note.php
index d7d88029062..0c90d58b1ac 100644
--- a/htdocs/comm/propal/note.php
+++ b/htdocs/comm/propal/note.php
@@ -47,18 +47,18 @@ $object = new Propal($db);
/* Actions */
/******************************************************************************/
-if ($action == 'setnote_public' && $user->rights->propale->creer)
-{
- $object->fetch($id);
- $result=$object->update_note_public(dol_html_entity_decode(GETPOST('note_public'), ENT_QUOTES));
- if ($result < 0) dol_print_error($db,$object->error);
-}
-
-else if ($action == 'setnote' && $user->rights->propale->creer)
-{
- $object->fetch($id);
- $result=$object->update_note(dol_html_entity_decode(GETPOST('note'), ENT_QUOTES));
- if ($result < 0) dol_print_error($db,$object->error);
+if ($action == 'setnote_public' && $user->rights->propale->creer)
+{
+ $object->fetch($id);
+ $result=$object->update_note_public(dol_html_entity_decode(GETPOST('note_public'), ENT_QUOTES));
+ if ($result < 0) dol_print_error($db,$object->error);
+}
+
+else if ($action == 'setnote' && $user->rights->propale->creer)
+{
+ $object->fetch($id);
+ $result=$object->update_note(dol_html_entity_decode(GETPOST('note'), ENT_QUOTES));
+ if ($result < 0) dol_print_error($db,$object->error);
}
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index e52b96e2856..21ac189e562 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -921,13 +921,13 @@ class Commande extends CommonObject
$this->note_public = $object->note_public;
$this->origin = $object->element;
- $this->origin_id = $object->id;
-
- // Possibility to add external linked objects with hooks
- $this->linked_objects[$this->origin] = $this->origin_id;
- if (is_array($object->other_linked_objects) && ! empty($object->other_linked_objects))
- {
- $this->linked_objects = array_merge($this->linked_objects, $object->other_linked_objects);
+ $this->origin_id = $object->id;
+
+ // Possibility to add external linked objects with hooks
+ $this->linked_objects[$this->origin] = $this->origin_id;
+ if (is_array($object->other_linked_objects) && ! empty($object->other_linked_objects))
+ {
+ $this->linked_objects = array_merge($this->linked_objects, $object->other_linked_objects);
}
$ret = $this->create($user);
@@ -937,7 +937,7 @@ class Commande extends CommonObject
// Actions hooked (by external module)
if (! is_object($hookmanager))
{
- include_once(DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php');
+ include_once(DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php');
$hookmanager=new HookManager($this->db);
}
$hookmanager->initHooks(array('orderdao'));
diff --git a/htdocs/commande/customer.php b/htdocs/commande/customer.php
index dc664de96e9..8386f77d88a 100755
--- a/htdocs/commande/customer.php
+++ b/htdocs/commande/customer.php
@@ -163,7 +163,7 @@ if ($resql)
$lienfin='';
$name=$obj->nom;
$result.=($lien.img_object($langs->trans("ShowCompany").': '.$name,'company').$lienfin);
- $result.=$lien.(dol_trunc($name,$maxlen)).$lienfin;
+ $result.=$lien.(dol_trunc($name,$maxlen)).$lienfin;
print $result;
print '';
diff --git a/htdocs/commande/document.php b/htdocs/commande/document.php
index 84c2896e0e3..e158495b0c2 100644
--- a/htdocs/commande/document.php
+++ b/htdocs/commande/document.php
@@ -40,11 +40,11 @@ $confirm = GETPOST('confirm');
$id = GETPOST('id','int');
$ref = GETPOST('ref');
-$mesg='';
-if (isset($_SESSION['DolMessage']))
-{
- $mesg=$_SESSION['DolMessage'];
- unset($_SESSION['DolMessage']);
+$mesg='';
+if (isset($_SESSION['DolMessage']))
+{
+ $mesg=$_SESSION['DolMessage'];
+ unset($_SESSION['DolMessage']);
}
// Security check
@@ -130,7 +130,7 @@ else if ($action == 'confirm_deletefile' && $confirm == 'yes')
$file = $upload_dir . '/' . GETPOST('urlfile'); // Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP).
dol_delete_file($file,0,0,0,$object);
$_SESSION['DolMessage'] = ''.$langs->trans("FileWasRemoved",GETPOST('urlfile')).'
';
- Header('Location: '.$_SERVER["PHP_SELF"].'?id='.$id);
+ Header('Location: '.$_SERVER["PHP_SELF"].'?id='.$id);
exit;
}
}
diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php
index 74485eafb37..dff7aa50de9 100644
--- a/htdocs/commande/fiche.php
+++ b/htdocs/commande/fiche.php
@@ -58,7 +58,7 @@ $confirm = GETPOST('confirm');
$lineid = GETPOST('lineid');
$mesg = GETPOST('mesg');
-//PDF
+//PDF
$hidedetails = (GETPOST('hidedetails','int') ? GETPOST('hidedetails','int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS) ? 1 : 0));
$hidedesc = (GETPOST('hidedesc','int') ? GETPOST('hidedesc','int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC) ? 1 : 0));
$hideref = (GETPOST('hideref','int') ? GETPOST('hideref','int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF) ? 1 : 0));
@@ -69,10 +69,10 @@ $result=restrictedArea($user,'commande',$id,'');
$object = new Commande($db);
-// Load object
-if ($id > 0 || ! empty($ref))
-{
- $ret=$object->fetch($id, $ref);
+// Load object
+if ($id > 0 || ! empty($ref))
+{
+ $ret=$object->fetch($id, $ref);
}
// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
@@ -512,18 +512,18 @@ else if ($action == 'setremiseabsolue' && $user->rights->commande->creer)
$result = $object->set_remise_absolue($user, $_POST['remise_absolue']);
}
-else if ($action == 'setnote_public' && $user->rights->commande->creer)
-{
- $object->fetch($id);
- $result=$object->update_note_public(dol_html_entity_decode(GETPOST('note_public'), ENT_QUOTES));
- if ($result < 0) dol_print_error($db,$object->error);
-}
-
-else if ($action == 'setnote' && $user->rights->commande->creer)
-{
- $object->fetch($id);
- $result=$object->update_note(dol_html_entity_decode(GETPOST('note'), ENT_QUOTES));
- if ($result < 0) dol_print_error($db,$object->error);
+else if ($action == 'setnote_public' && $user->rights->commande->creer)
+{
+ $object->fetch($id);
+ $result=$object->update_note_public(dol_html_entity_decode(GETPOST('note_public'), ENT_QUOTES));
+ if ($result < 0) dol_print_error($db,$object->error);
+}
+
+else if ($action == 'setnote' && $user->rights->commande->creer)
+{
+ $object->fetch($id);
+ $result=$object->update_note(dol_html_entity_decode(GETPOST('note'), ENT_QUOTES));
+ if ($result < 0) dol_print_error($db,$object->error);
}
/*
@@ -1227,64 +1227,64 @@ if ($action == 'send' && ! $_POST['addfile'] && ! $_POST['removedfile'] && ! $_P
}
}
-if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
+if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
{
- if ($action == 'addcontact' && $user->rights->commande->creer)
- {
- $result = $object->fetch($id);
-
- if ($result > 0 && $id > 0)
+ if ($action == 'addcontact' && $user->rights->commande->creer)
+ {
+ $result = $object->fetch($id);
+
+ if ($result > 0 && $id > 0)
{
- $contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'));
- $result = $result = $object->add_contact($contactid, $_POST["type"], $_POST["source"]);
- }
-
- if ($result >= 0)
- {
- Header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
- exit;
- }
- else
- {
- if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
- {
- $langs->load("errors");
- $mesg = ''.$langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType").'
';
- }
- else
- {
- $mesg = ''.$object->error.'
';
- }
- }
- }
-
- // bascule du statut d'un contact
- else if ($action == 'swapstatut' && $user->rights->commande->creer)
- {
- if ($object->fetch($id))
- {
- $result=$object->swapContactStatus(GETPOST('ligne'));
- }
- else
- {
- dol_print_error($db);
- }
- }
-
- // Efface un contact
- else if ($action == 'deletecontact' && $user->rights->commande->creer)
- {
- $object->fetch($id);
- $result = $object->delete_contact($lineid);
-
- if ($result >= 0)
- {
- Header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
- exit;
- }
- else {
- dol_print_error($db);
- }
+ $contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'));
+ $result = $result = $object->add_contact($contactid, $_POST["type"], $_POST["source"]);
+ }
+
+ if ($result >= 0)
+ {
+ Header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+ exit;
+ }
+ else
+ {
+ if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
+ {
+ $langs->load("errors");
+ $mesg = ''.$langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType").'
';
+ }
+ else
+ {
+ $mesg = ''.$object->error.'
';
+ }
+ }
+ }
+
+ // bascule du statut d'un contact
+ else if ($action == 'swapstatut' && $user->rights->commande->creer)
+ {
+ if ($object->fetch($id))
+ {
+ $result=$object->swapContactStatus(GETPOST('ligne'));
+ }
+ else
+ {
+ dol_print_error($db);
+ }
+ }
+
+ // Efface un contact
+ else if ($action == 'deletecontact' && $user->rights->commande->creer)
+ {
+ $object->fetch($id);
+ $result = $object->delete_contact($lineid);
+
+ if ($result >= 0)
+ {
+ Header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+ exit;
+ }
+ else {
+ dol_print_error($db);
+ }
}
}
@@ -2052,24 +2052,24 @@ else
print ''.$object->getLibStatut(4).' ';
print '';
- print ''.$object->error.'
';
- }
+
+ // End of object creation, we show it
+ if ($id > 0 && ! $error)
+ {
+ $db->commit();
+ Header('Location: '.DOL_URL_ROOT.'/compta/facture.php?facid='.$id);
+ exit;
+ }
+ else
+ {
+ $db->rollback();
+ $action='create';
+ $_GET["origin"]=$_POST["origin"];
+ $_GET["originid"]=$_POST["originid"];
+ if (! $mesg) $mesg=''.$object->error.'
';
+ }
}
-
- /*
- * View
- */
- $html = new Form($db);
- $htmlother = new FormOther($db);
- $formfile = new FormFile($db);
- $now=dol_now();
-
- // Mode creation
- if ($action == 'create')
- {
- $facturestatic=new Facture($db);
- llxHeader();
- print_fiche_titre($langs->trans('NewBill'));
- dol_htmloutput_mesg($mesg);
- $soc = new Societe($db);
- if ($socid) $res=$soc->fetch($socid);
+
+ /*
+ * View
+ */
+ $html = new Form($db);
+ $htmlother = new FormOther($db);
+ $formfile = new FormFile($db);
+ $now=dol_now();
+
+ // Mode creation
+ if ($action == 'create')
+ {
+ $facturestatic=new Facture($db);
+ llxHeader();
+ print_fiche_titre($langs->trans('NewBill'));
+ dol_htmloutput_mesg($mesg);
+ $soc = new Societe($db);
+ if ($socid) $res=$soc->fetch($socid);
if ($res)
- {
- $cond_reglement_id = $soc->cond_reglement_id;
- $mode_reglement_id = $soc->mode_reglement_id;
+ {
+ $cond_reglement_id = $soc->cond_reglement_id;
+ $mode_reglement_id = $soc->mode_reglement_id;
$remise_percent = $soc->remise_percent;
- }
- $remise_absolue = 0;
- $dateinvoice = empty($conf->global->MAIN_AUTOFILL_DATE)?-1:0;
-
- $absolute_discount=$soc->getAvailableDiscounts();
- print '\n";
}
@@ -513,7 +513,7 @@ else
//Date filter
if ($date_start && $date_end) $sql.= " AND c.date_commande >= '".$db->idate($date_start)."' AND c.date_commande <= '".$db->idate($date_end)."'";
- if ($date_starty && $date_endy) $sql.= " AND c.date_livraison >= '".$db->idate($date_starty)."' AND c.date_livraison <= '".$db->idate($date_endy)."'";
+ if ($date_starty && $date_endy) $sql.= " AND c.date_livraison >= '".$db->idate($date_starty)."' AND c.date_livraison <= '".$db->idate($date_endy)."'";
if (!empty($sref_client))
{
@@ -538,14 +538,14 @@ else
$num = $db->num_rows($resql);
print_fiche_titre($title);
$i = 0;
- $period=$html->select_date($date_start,'date_start',0,0,1,'',1,0,1).' - '.$html->select_date($date_end,'date_end',0,0,1,'',1,0,1);
+ $period=$html->select_date($date_start,'date_start',0,0,1,'',1,0,1).' - '.$html->select_date($date_end,'date_end',0,0,1,'',1,0,1);
$periodely=$html->select_date($date_starty,'date_start_dely',0,0,1,'',1,0,1).' - '.$html->select_date($date_endy,'date_end_dely',0,0,1,'',1,0,1);
- // Company
- print '';
- $companystatic->id=$socid;
- $companystatic->nom=$soc->nom;
-
- print $companystatic->getNomUrl(1,'customer');
+ // Company
+ print '';
+ $companystatic->id=$socid;
+ $companystatic->nom=$soc->nom;
+
+ print $companystatic->getNomUrl(1,'customer');
print ' ';
print ' ';
print '';
@@ -584,8 +584,8 @@ else
print '';
- if ($conf->use_javascript_ajax) print ''.$langs->trans("All").' / '.$langs->trans("None").' ';
+ print ' ';
+ if ($conf->use_javascript_ajax) print ''.$langs->trans("All").' / '.$langs->trans("None").' ';
print ' ';
print ' ';
@@ -625,13 +625,13 @@ else
print ''.$objp->ref_client.' ';
// Order date
- print '';
- print dol_print_date($db->jdate($objp->date_commande),'day');
+ print ' ';
+ print dol_print_date($db->jdate($objp->date_commande),'day');
print ' ';
//Delivery date
- print '';
- print dol_print_date($db->jdate($objp->date_livraison),'day');
+ print ' ';
+ print dol_print_date($db->jdate($objp->date_livraison),'day');
print ' ';
// Statut
@@ -650,15 +650,15 @@ else
}
print '
';
- /*
- * Boutons actions
+ /*
+ * Boutons actions
*/
- print '';
- print '
';
- print '
';
+ print '
';
+ print '
';
+ print '
';
print '
';
- print '
'.$langs->trans("GoBack").' ';
- print '
';
+ print '
'.$langs->trans("GoBack").' ';
+ print '
';
print '';
$db->free($resql);
}
diff --git a/htdocs/compta/deplacement/fiche.php b/htdocs/compta/deplacement/fiche.php
index cf97fd8ee83..9e97c88ae1e 100644
--- a/htdocs/compta/deplacement/fiche.php
+++ b/htdocs/compta/deplacement/fiche.php
@@ -499,8 +499,8 @@ else if ($id)
print "
";
// Notes
- $blocname = 'notes';
- $title = $langs->trans('Notes');
+ $blocname = 'notes';
+ $title = $langs->trans('Notes');
include(DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php');
print '
';
diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index 6ea8b90fa01..ac5c2afde9e 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -69,7 +69,7 @@ $search_societe=GETPOST('search_societe','alpha');
$search_montant_ht=GETPOST('search_montant_ht','alpha');
$search_montant_ttc=GETPOST('search_montant_ttc','alpha');
-//PDF
+//PDF
$hidedetails = (GETPOST('hidedetails','int') ? GETPOST('hidedetails','int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS) ? 1 : 0));
$hidedesc = (GETPOST('hidedesc','int') ? GETPOST('hidedesc','int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC) ? 1 : 0));
$hideref = (GETPOST('hideref','int') ? GETPOST('hideref','int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF) ? 1 : 0));
@@ -86,10 +86,10 @@ $usehm=$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE;
$object=new Facture($db);
-// Load object
-if ($id > 0 || ! empty($ref))
-{
- $ret=$object->fetch($id, $ref);
+// Load object
+if ($id > 0 || ! empty($ref))
+{
+ $ret=$object->fetch($id, $ref);
}
// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
@@ -1524,21 +1524,21 @@ else if ($action == 'builddoc') // En get ou en post
}
}
-// Remove file in doc form
-else if ($action == 'remove_file')
-{
- if ($object->fetch($id))
- {
- require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
-
- $object->fetch_thirdparty();
-
- $langs->load("other");
- $upload_dir = $conf->facture->dir_output;
- $file = $upload_dir . '/' . GETPOST('file');
- dol_delete_file($file,0,0,0,$object);
- $mesg = '
'.$langs->trans("FileWasRemoved",GETPOST('file')).'
';
- }
+// Remove file in doc form
+else if ($action == 'remove_file')
+{
+ if ($object->fetch($id))
+ {
+ require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
+
+ $object->fetch_thirdparty();
+
+ $langs->load("other");
+ $upload_dir = $conf->facture->dir_output;
+ $file = $upload_dir . '/' . GETPOST('file');
+ dol_delete_file($file,0,0,0,$object);
+ $mesg = '
'.$langs->trans("FileWasRemoved",GETPOST('file')).'
';
+ }
}
if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index e8ecfaf74b5..4842d8f5079 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -256,30 +256,30 @@ class Facture extends CommonObject
$error++;
}
- // TODO mutualiser
- if ($origin == 'commande')
- {
- // On recupere les differents contact interne et externe
+ // TODO mutualiser
+ if ($origin == 'commande')
+ {
+ // On recupere les differents contact interne et externe
$order = new Commande($this->db);
- $order->id = $origin_id;
-
- // On recupere le commercial suivi propale
+ $order->id = $origin_id;
+
+ // On recupere le commercial suivi propale
$this->userid = $order->getIdcontact('internal', 'SALESREPFOLL');
-
- if ($this->userid)
- {
- //On passe le commercial suivi commande en commercial suivi paiement
- $this->add_contact($this->userid[0], 'SALESREPFOLL', 'internal');
- }
-
- // On recupere le contact client facturation commande
- $this->contactid = $order->getIdcontact('external', 'BILLING');
-
- if ($this->contactid)
- {
- //On passe le contact client facturation commande en contact client facturation
- $this->add_contact($this->contactid[0], 'BILLING', 'external');
- }
+
+ if ($this->userid)
+ {
+ //On passe le commercial suivi commande en commercial suivi paiement
+ $this->add_contact($this->userid[0], 'SALESREPFOLL', 'internal');
+ }
+
+ // On recupere le contact client facturation commande
+ $this->contactid = $order->getIdcontact('external', 'BILLING');
+
+ if ($this->contactid)
+ {
+ //On passe le contact client facturation commande en contact client facturation
+ $this->add_contact($this->contactid[0], 'BILLING', 'external');
+ }
}
}
}
@@ -674,11 +674,11 @@ class Facture extends CommonObject
$this->origin = $object->element;
$this->origin_id = $object->id;
- // Possibility to add external linked objects with hooks
- $this->linked_objects[$this->origin] = $this->origin_id;
- if (is_array($object->other_linked_objects) && ! empty($object->other_linked_objects))
- {
- $this->linked_objects = array_merge($this->linked_objects, $object->other_linked_objects);
+ // Possibility to add external linked objects with hooks
+ $this->linked_objects[$this->origin] = $this->origin_id;
+ if (is_array($object->other_linked_objects) && ! empty($object->other_linked_objects))
+ {
+ $this->linked_objects = array_merge($this->linked_objects, $object->other_linked_objects);
}
$ret = $this->create($user);
@@ -1240,32 +1240,32 @@ class Facture extends CommonObject
$resql=$this->db->query($sql);
if ($resql)
{
- // On efface le repertoire de pdf provisoire
- $ref = dol_sanitizeFileName($this->ref);
- if ($conf->facture->dir_output)
- {
- $dir = $conf->facture->dir_output . "/" . $ref;
- $file = $conf->facture->dir_output . "/" . $ref . "/" . $ref . ".pdf";
- if (file_exists($file)) // We must delete all files before deleting directory
- {
+ // On efface le repertoire de pdf provisoire
+ $ref = dol_sanitizeFileName($this->ref);
+ if ($conf->facture->dir_output)
+ {
+ $dir = $conf->facture->dir_output . "/" . $ref;
+ $file = $conf->facture->dir_output . "/" . $ref . "/" . $ref . ".pdf";
+ if (file_exists($file)) // We must delete all files before deleting directory
+ {
$ret=dol_delete_preview($this);
-
- if (! dol_delete_file($file,0,0,0,$this)) // For triggers
- {
- $this->error=$langs->trans("ErrorCanNotDeleteFile",$file);
- $this->db->rollback();
- return 0;
- }
- }
- if (file_exists($dir))
- {
- if (! dol_delete_dir_recursive($dir)) // For remove dir and meta
- {
- $this->error=$langs->trans("ErrorCanNotDeleteDir",$dir);
- $this->db->rollback();
- return 0;
- }
- }
+
+ if (! dol_delete_file($file,0,0,0,$this)) // For triggers
+ {
+ $this->error=$langs->trans("ErrorCanNotDeleteFile",$file);
+ $this->db->rollback();
+ return 0;
+ }
+ }
+ if (file_exists($dir))
+ {
+ if (! dol_delete_dir_recursive($dir)) // For remove dir and meta
+ {
+ $this->error=$langs->trans("ErrorCanNotDeleteDir",$dir);
+ $this->db->rollback();
+ return 0;
+ }
+ }
}
$this->db->commit();
diff --git a/htdocs/compta/facture/document.php b/htdocs/compta/facture/document.php
index bdb0990f4b3..7a789c32c4f 100644
--- a/htdocs/compta/facture/document.php
+++ b/htdocs/compta/facture/document.php
@@ -43,11 +43,11 @@ $confirm = GETPOST('confirm');
$id = GETPOST('facid','int');
$ref = GETPOST('ref');
-$mesg='';
-if (isset($_SESSION['DolMessage']))
-{
- $mesg=$_SESSION['DolMessage'];
- unset($_SESSION['DolMessage']);
+$mesg='';
+if (isset($_SESSION['DolMessage']))
+{
+ $mesg=$_SESSION['DolMessage'];
+ unset($_SESSION['DolMessage']);
}
// Security check
diff --git a/htdocs/compta/facture/note.php b/htdocs/compta/facture/note.php
index c2258ea78f8..c68ad3777d8 100644
--- a/htdocs/compta/facture/note.php
+++ b/htdocs/compta/facture/note.php
@@ -31,9 +31,9 @@ require_once(DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php');
$langs->load("companies");
$langs->load("bills");
-$id=(GETPOST('id','int')?GETPOST('id','int'):GETPOST('facid','int')); // For backward compatibility
-$ref=GETPOST('ref','alpha');
-$socid=GETPOST('socid','int');
+$id=(GETPOST('id','int')?GETPOST('id','int'):GETPOST('facid','int')); // For backward compatibility
+$ref=GETPOST('ref','alpha');
+$socid=GETPOST('socid','int');
$action=GETPOST('action','alpha');
// Security check
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index 5f343fd8944..2bdfc30a440 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -791,35 +791,35 @@ class Contrat extends CommonObject
}
}
- if (! $error)
- {
- // Appel des triggers
- include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php");
- $interface=new Interfaces($this->db);
- $result=$interface->run_triggers('CONTRACT_DELETE',$this,$user,$langs,$conf);
- if ($result < 0) {
- $error++; $this->errors=$interface->errors;
- }
- // Fin appel triggers
+ if (! $error)
+ {
+ // Appel des triggers
+ include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php");
+ $interface=new Interfaces($this->db);
+ $result=$interface->run_triggers('CONTRACT_DELETE',$this,$user,$langs,$conf);
+ if ($result < 0) {
+ $error++; $this->errors=$interface->errors;
+ }
+ // Fin appel triggers
}
- if (! $error)
- {
- // We remove directory
- $ref = dol_sanitizeFileName($this->ref);
- if ($conf->contrat->dir_output)
- {
- $dir = $conf->contrat->dir_output . "/" . $ref;
- if (file_exists($dir))
- {
- $res=@dol_delete_dir_recursive($dir);
- if (! $res)
- {
- $this->error='ErrorFailToDeleteDir';
- $error++;
- }
- }
- }
+ if (! $error)
+ {
+ // We remove directory
+ $ref = dol_sanitizeFileName($this->ref);
+ if ($conf->contrat->dir_output)
+ {
+ $dir = $conf->contrat->dir_output . "/" . $ref;
+ if (file_exists($dir))
+ {
+ $res=@dol_delete_dir_recursive($dir);
+ if (! $res)
+ {
+ $this->error='ErrorFailToDeleteDir';
+ $error++;
+ }
+ }
+ }
}
if (! $error)
diff --git a/htdocs/contrat/contact.php b/htdocs/contrat/contact.php
index 7a35a414481..915a2775b91 100644
--- a/htdocs/contrat/contact.php
+++ b/htdocs/contrat/contact.php
@@ -168,9 +168,9 @@ if ($id > 0 || ! empty($ref))
print '
'.$langs->trans("FileWasRemoved",GETPOST('urlfile')).'
';
- Header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
- exit;
- }
+// Delete
+if ($action == 'confirm_deletefile' && $confirm == 'yes')
+{
+ if ($object->id)
+ {
+ $langs->load("other");
+
+ $file = $upload_dir . '/' . GETPOST('urlfile'); // Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP).
+ $ret=dol_delete_file($file,0,0,0,$object);
+ $_SESSION['DolMessage'] = ''.$langs->trans("FileWasRemoved",GETPOST('urlfile')).'
';
+ Header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
+ exit;
+ }
}
@@ -178,13 +178,13 @@ if ($object->id)
dol_htmloutput_mesg($mesg,$mesgs);
- /*
+ /*
* Confirmation suppression fichier
- */
- if ($action == 'delete')
- {
- $ret=$form->form_confirm($_SERVER["PHP_SELF"].'?id='.$id.'&urlfile='.urlencode(GETPOST("urlfile")), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile', '', 0, 1);
- if ($ret == 'html') print ''.$object->error.'
';
+ $object->fetch_thirdparty();
+ $result=$object->delete($user);
+ if ($result >= 0)
+ {
+ Header("Location: index.php");
+ return;
+ }
+ else
+ {
+ $mesg=''.$object->error.'
';
}
}
else if ($action == 'confirm_move' && $confirm == 'yes' && $user->rights->contrat->creer)
{
- if ($_POST['newcid'] > 0)
- {
- $contractline = new ContratLigne($db);
- $result=$contractline->fetch($_GET["lineid"]);
- $contractline->fk_contrat = $_POST["newcid"];
- $result=$contractline->update($user,1);
- if ($result >= 0)
- {
- Header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
- return;
- }
- else
- {
- $mesg=''.$object->error.'
';
- }
- }
- else
- {
- $mesg=''.$langs->trans("ErrorFieldRequired",$langs->transnoentities("RefNewContract")).'
';
+ if ($_POST['newcid'] > 0)
+ {
+ $contractline = new ContratLigne($db);
+ $result=$contractline->fetch($_GET["lineid"]);
+ $contractline->fk_contrat = $_POST["newcid"];
+ $result=$contractline->update($user,1);
+ if ($result >= 0)
+ {
+ Header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
+ return;
+ }
+ else
+ {
+ $mesg=''.$object->error.'
';
+ }
+ }
+ else
+ {
+ $mesg=''.$langs->trans("ErrorFieldRequired",$langs->transnoentities("RefNewContract")).'
';
}
}
-else if ($action == 'setnote_public' && $user->rights->contrat->creer)
-{
- $result=$object->update_note_public(dol_html_entity_decode(GETPOST('note_public'), ENT_QUOTES));
- if ($result < 0) dol_print_error($db,$object->error);
-}
-
-else if ($action == 'setnote' && $user->rights->contrat->creer)
-{
- $result=$object->update_note(dol_html_entity_decode(GETPOST('note'), ENT_QUOTES));
- if ($result < 0) dol_print_error($db,$object->error);
+else if ($action == 'setnote_public' && $user->rights->contrat->creer)
+{
+ $result=$object->update_note_public(dol_html_entity_decode(GETPOST('note_public'), ENT_QUOTES));
+ if ($result < 0) dol_print_error($db,$object->error);
}
-if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
+else if ($action == 'setnote' && $user->rights->contrat->creer)
{
- if ($action == 'addcontact' && $user->rights->contrat->creer)
- {
- $result = $object->fetch($id);
-
- if ($result > 0 && $id > 0)
+ $result=$object->update_note(dol_html_entity_decode(GETPOST('note'), ENT_QUOTES));
+ if ($result < 0) dol_print_error($db,$object->error);
+}
+
+if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
+{
+ if ($action == 'addcontact' && $user->rights->contrat->creer)
+ {
+ $result = $object->fetch($id);
+
+ if ($result > 0 && $id > 0)
{
- $contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'));
- $result = $result = $object->add_contact($contactid, $_POST["type"], $_POST["source"]);
- }
-
- if ($result >= 0)
- {
- Header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
- exit;
- }
- else
- {
- if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
- {
- $langs->load("errors");
- $mesg = ''.$langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType").'
';
- }
- else
- {
- $mesg = ''.$object->error.'
';
- }
- }
- }
-
- // bascule du statut d'un contact
- else if ($action == 'swapstatut' && $user->rights->contrat->creer)
- {
- if ($object->fetch($id))
- {
- $result=$object->swapContactStatus(GETPOST('ligne'));
- }
- else
- {
- dol_print_error($db);
- }
- }
-
- // Efface un contact
- else if ($action == 'deletecontact' && $user->rights->contrat->creer)
- {
- $object->fetch($id);
- $result = $object->delete_contact($_GET["lineid"]);
-
- if ($result >= 0)
- {
- Header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
- exit;
- }
- else {
- dol_print_error($db);
- }
+ $contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'));
+ $result = $result = $object->add_contact($contactid, $_POST["type"], $_POST["source"]);
+ }
+
+ if ($result >= 0)
+ {
+ Header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+ exit;
+ }
+ else
+ {
+ if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
+ {
+ $langs->load("errors");
+ $mesg = ''.$langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType").'
';
+ }
+ else
+ {
+ $mesg = ''.$object->error.'
';
+ }
+ }
+ }
+
+ // bascule du statut d'un contact
+ else if ($action == 'swapstatut' && $user->rights->contrat->creer)
+ {
+ if ($object->fetch($id))
+ {
+ $result=$object->swapContactStatus(GETPOST('ligne'));
+ }
+ else
+ {
+ dol_print_error($db);
+ }
+ }
+
+ // Efface un contact
+ else if ($action == 'deletecontact' && $user->rights->contrat->creer)
+ {
+ $object->fetch($id);
+ $result = $object->delete_contact($_GET["lineid"]);
+
+ if ($result >= 0)
+ {
+ Header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+ exit;
+ }
+ else {
+ dol_print_error($db);
+ }
}
}
@@ -783,21 +783,21 @@ else
echo ''.$this->db->error().' ';
return -2;
- }
+ }
}
/**
@@ -2975,32 +2975,32 @@ class Form
if ($num > 0)
{
- // Definition du taux a pre-selectionner (si defaulttx non force et donc vaut -1 ou '')
- if ($defaulttx < 0 || dol_strlen($defaulttx) == 0)
- {
- $defaulttx=get_default_tva($societe_vendeuse,$societe_acheteuse,$idprod);
- $defaultnpr=get_default_npr($societe_vendeuse,$societe_acheteuse,$idprod);
- }
-
- // Si taux par defaut n'a pu etre determine, on prend dernier de la liste.
- // Comme ils sont tries par ordre croissant, dernier = plus eleve = taux courant
- if ($defaulttx < 0 || dol_strlen($defaulttx) == 0)
- {
- $defaulttx = $this->cache_vatrates[$num-1]['txtva'];
+ // Definition du taux a pre-selectionner (si defaulttx non force et donc vaut -1 ou '')
+ if ($defaulttx < 0 || dol_strlen($defaulttx) == 0)
+ {
+ $defaulttx=get_default_tva($societe_vendeuse,$societe_acheteuse,$idprod);
+ $defaultnpr=get_default_npr($societe_vendeuse,$societe_acheteuse,$idprod);
+ }
+
+ // Si taux par defaut n'a pu etre determine, on prend dernier de la liste.
+ // Comme ils sont tries par ordre croissant, dernier = plus eleve = taux courant
+ if ($defaulttx < 0 || dol_strlen($defaulttx) == 0)
+ {
+ $defaulttx = $this->cache_vatrates[$num-1]['txtva'];
}
if (! $options_only) $return.= '';
foreach ($this->cache_vatrates as $rate)
{
- $return.= ''."\n";
- if (is_array($array) && ! empty($array))
+
+ $out = ''."\n";
+ if (is_array($array) && ! empty($array))
{
if ($value_as_key) $array=array_combine($array, $array);
- if (! empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) && is_array($selected) && ! empty($selected))
+ if (! empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) && is_array($selected) && ! empty($selected))
{
foreach ($selected as $selected_value)
{
foreach($array as $key => $value)
{
- if ($selected_value == $key)
- {
- $value=$array[$selected_value];
- $out.= '';
- $newval = ($translate ? $langs->trans(ucfirst($value)) : $value);
- $newval = ($key_in_label ? $key.' - '.$newval : $newval);
- $out.= dol_htmlentitiesbr($newval);
- $out.= ' '."\n";
- unset($array[$key]);
+ if ($selected_value == $key)
+ {
+ $value=$array[$selected_value];
+ $out.= '';
+ $newval = ($translate ? $langs->trans(ucfirst($value)) : $value);
+ $newval = ($key_in_label ? $key.' - '.$newval : $newval);
+ $out.= dol_htmlentitiesbr($newval);
+ $out.= ' '."\n";
+ unset($array[$key]);
}
}
}
if (! empty($array))
{
- foreach ($array as $key => $value)
+ foreach ($array as $key => $value)
{
- $out.= '';
- $newval = ($translate ? $langs->trans(ucfirst($value)) : $value);
- $newval = ($key_in_label ? $key.' - '.$newval : $newval);
- $out.= dol_htmlentitiesbr($newval);
- $out.= ' '."\n";
+ $out.= '';
+ $newval = ($translate ? $langs->trans(ucfirst($value)) : $value);
+ $newval = ($key_in_label ? $key.' - '.$newval : $newval);
+ $out.= dol_htmlentitiesbr($newval);
+ $out.= ' '."\n";
}
}
}
else
{
- foreach ($array as $key => $value)
- {
- $out.= 'trans(ucfirst($value)) : $value);
- $newval = ($key_in_label ? $key.' - '.$newval : $newval);
- $out.= dol_htmlentitiesbr($newval);
- $out.= ' '."\n";
+ foreach ($array as $key => $value)
+ {
+ $out.= 'trans(ucfirst($value)) : $value);
+ $newval = ($key_in_label ? $key.' - '.$newval : $newval);
+ $out.= dol_htmlentitiesbr($newval);
+ $out.= ' '."\n";
}
- }
- }
- $out.= ' '."\n";
-
- return $out;
+ }
+ }
+ $out.= ' '."\n";
+
+ return $out;
}
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 50acedcac24..41508534847 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -813,7 +813,7 @@ class FormFile
// Max file size
$max_file_size = (($post_max_size < $upload_max_filesize) ? $post_max_size : $upload_max_filesize);
- // Include main
+ // Include main
include(DOL_DOCUMENT_ROOT.'/core/tpl/ajax/fileupload_main.tpl.php');
// Include template
diff --git a/htdocs/core/class/smtps.class.php b/htdocs/core/class/smtps.class.php
index 5398825a044..f65f8131ee0 100755
--- a/htdocs/core/class/smtps.class.php
+++ b/htdocs/core/class/smtps.class.php
@@ -170,9 +170,9 @@ class SMTPs
*/
var $_smtpsRelatedBoundary = null;
- /**
- * Alternative Boundary
- */
+ /**
+ * Alternative Boundary
+ */
var $_smtpsAlternativeBoundary = null;
/**
@@ -1223,8 +1223,8 @@ class SMTPs
if (key_exists('image', $this->_msgContent))
{
- $content.= 'Content-Type: multipart/alternative; boundary="'.$this->_getBoundary('alternative').'"' . "\r\n";
- $content .= "\r\n";
+ $content.= 'Content-Type: multipart/alternative; boundary="'.$this->_getBoundary('alternative').'"' . "\r\n";
+ $content .= "\r\n";
$content .= "--" . $this->_getBoundary('alternative') . "\r\n";
}
@@ -1268,21 +1268,21 @@ class SMTPs
. $_data['data'] . "\r\n";
}
- // always end related and end alternative after inline images
- $content.= "--" . $this->_getBoundary('related') . "--" . "\r\n";
- $content.= "\r\n" . "--" . $this->_getBoundary('alternative') . "--" . "\r\n";
+ // always end related and end alternative after inline images
+ $content.= "--" . $this->_getBoundary('related') . "--" . "\r\n";
+ $content.= "\r\n" . "--" . $this->_getBoundary('alternative') . "--" . "\r\n";
$content.= "\r\n";
}
else
{
- if (key_exists('image', $this->_msgContent))
- {
- $content.= "Content-Type: text/plain; charset=" . $this->getCharSet() . "\r\n";
- $content.= "\r\n" . strip_tags($_content['data']) . "\r\n"; // Add plain text message
- $content.= "--" . $this->_getBoundary('alternative') . "\r\n";
- $content.= 'Content-Type: multipart/related; boundary="' . $this->_getBoundary('related') . '"' . "\r\n";
- $content.= "\r\n";
- $content.= "--" . $this->_getBoundary('related') . "\r\n";
+ if (key_exists('image', $this->_msgContent))
+ {
+ $content.= "Content-Type: text/plain; charset=" . $this->getCharSet() . "\r\n";
+ $content.= "\r\n" . strip_tags($_content['data']) . "\r\n"; // Add plain text message
+ $content.= "--" . $this->_getBoundary('alternative') . "\r\n";
+ $content.= 'Content-Type: multipart/related; boundary="' . $this->_getBoundary('related') . '"' . "\r\n";
+ $content.= "\r\n";
+ $content.= "--" . $this->_getBoundary('related') . "\r\n";
}
$content .= 'Content-Type: ' . $_content['mimeType'] . '; '
@@ -1490,7 +1490,7 @@ class SMTPs
function _setBoundary()
{
$this->_smtpsBoundary = "multipart_x." . time() . ".x_boundary";
- $this->_smtpsRelatedBoundary = 'mul_'.dol_hash(uniqid("dolibarr2"));
+ $this->_smtpsRelatedBoundary = 'mul_'.dol_hash(uniqid("dolibarr2"));
$this->_smtpsAlternativeBoundary = 'mul_'.dol_hash(uniqid("dolibarr3"));
}
diff --git a/htdocs/core/filemanagerdol/browser/default/js/common.js b/htdocs/core/filemanagerdol/browser/default/js/common.js
index 98c4b907095..93c520609ad 100755
--- a/htdocs/core/filemanagerdol/browser/default/js/common.js
+++ b/htdocs/core/filemanagerdol/browser/default/js/common.js
@@ -1,88 +1,88 @@
-/*
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2010 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- * - GNU General Public License Version 2 or later (the "GPL")
- * http://www.gnu.org/licenses/gpl.html
- *
- * - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- * http://www.gnu.org/licenses/lgpl.html
- *
- * - Mozilla Public License Version 1.1 or later (the "MPL")
- * http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * Common objects and functions shared by all pages that compose the
- * File Browser dialog window.
- */
-
-// Automatically detect the correct document.domain (#1919).
-(function()
-{
- var d = document.domain ;
-
- while ( true )
- {
- // Test if we can access a parent property.
- try
- {
- var test = window.top.opener.document.domain ;
- break ;
- }
- catch( e )
- {}
-
- // Remove a domain part: www.mytest.example.com => mytest.example.com => example.com ...
- d = d.replace( /.*?(?:\.|$)/, '' ) ;
-
- if ( d.length == 0 )
- break ; // It was not able to detect the domain.
-
- try
- {
- document.domain = d ;
- }
- catch (e)
- {
- break ;
- }
- }
-})() ;
-
-function AddSelectOption( selectElement, optionText, optionValue )
-{
- var oOption = document.createElement("OPTION") ;
-
- oOption.text = optionText ;
- oOption.value = optionValue ;
-
- selectElement.options.add(oOption) ;
-
- return oOption ;
-}
-
-var oConnector = window.parent.oConnector ;
-var oIcons = window.parent.oIcons ;
-
-
-function StringBuilder( value )
-{
- this._Strings = new Array( value || '' ) ;
-}
-
-StringBuilder.prototype.Append = function( value )
-{
- if ( value )
- this._Strings.push( value ) ;
-}
-
-StringBuilder.prototype.ToString = function()
-{
- return this._Strings.join( '' ) ;
-}
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2010 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ * - GNU General Public License Version 2 or later (the "GPL")
+ * http://www.gnu.org/licenses/gpl.html
+ *
+ * - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ * http://www.gnu.org/licenses/lgpl.html
+ *
+ * - Mozilla Public License Version 1.1 or later (the "MPL")
+ * http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Common objects and functions shared by all pages that compose the
+ * File Browser dialog window.
+ */
+
+// Automatically detect the correct document.domain (#1919).
+(function()
+{
+ var d = document.domain ;
+
+ while ( true )
+ {
+ // Test if we can access a parent property.
+ try
+ {
+ var test = window.top.opener.document.domain ;
+ break ;
+ }
+ catch( e )
+ {}
+
+ // Remove a domain part: www.mytest.example.com => mytest.example.com => example.com ...
+ d = d.replace( /.*?(?:\.|$)/, '' ) ;
+
+ if ( d.length == 0 )
+ break ; // It was not able to detect the domain.
+
+ try
+ {
+ document.domain = d ;
+ }
+ catch (e)
+ {
+ break ;
+ }
+ }
+})() ;
+
+function AddSelectOption( selectElement, optionText, optionValue )
+{
+ var oOption = document.createElement("OPTION") ;
+
+ oOption.text = optionText ;
+ oOption.value = optionValue ;
+
+ selectElement.options.add(oOption) ;
+
+ return oOption ;
+}
+
+var oConnector = window.parent.oConnector ;
+var oIcons = window.parent.oIcons ;
+
+
+function StringBuilder( value )
+{
+ this._Strings = new Array( value || '' ) ;
+}
+
+StringBuilder.prototype.Append = function( value )
+{
+ if ( value )
+ this._Strings.push( value ) ;
+}
+
+StringBuilder.prototype.ToString = function()
+{
+ return this._Strings.join( '' ) ;
+}
diff --git a/htdocs/core/filemanagerdol/browser/default/js/fckxml.js b/htdocs/core/filemanagerdol/browser/default/js/fckxml.js
index b7eddc601e0..d10561d6d86 100755
--- a/htdocs/core/filemanagerdol/browser/default/js/fckxml.js
+++ b/htdocs/core/filemanagerdol/browser/default/js/fckxml.js
@@ -1,147 +1,147 @@
-/*
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2010 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- * - GNU General Public License Version 2 or later (the "GPL")
- * http://www.gnu.org/licenses/gpl.html
- *
- * - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- * http://www.gnu.org/licenses/lgpl.html
- *
- * - Mozilla Public License Version 1.1 or later (the "MPL")
- * http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * Defines the FCKXml object that is used for XML data calls
- * and XML processing.
- *
- * This script is shared by almost all pages that compose the
- * File Browser frameset.
- */
-
-var FCKXml = function()
-{}
-
-FCKXml.prototype.GetHttpRequest = function()
-{
- // Gecko / IE7
- try { return new XMLHttpRequest(); }
- catch(e) {}
-
- // IE6
- try { return new ActiveXObject( 'Msxml2.XMLHTTP' ) ; }
- catch(e) {}
-
- // IE5
- try { return new ActiveXObject( 'Microsoft.XMLHTTP' ) ; }
- catch(e) {}
-
- return null ;
-}
-
-FCKXml.prototype.LoadUrl = function( urlToCall, asyncFunctionPointer )
-{
- var oFCKXml = this ;
-
- var bAsync = ( typeof(asyncFunctionPointer) == 'function' ) ;
-
- var oXmlHttp = this.GetHttpRequest() ;
-
- oXmlHttp.open( "GET", urlToCall, bAsync ) ;
-
- if ( bAsync )
- {
- oXmlHttp.onreadystatechange = function()
- {
- if ( oXmlHttp.readyState == 4 )
- {
- var oXml ;
- try
- {
- // this is the same test for an FF2 bug as in fckxml_gecko.js
- // but we've moved the responseXML assignment into the try{}
- // so we don't even have to check the return status codes.
- var test = oXmlHttp.responseXML.firstChild ;
- oXml = oXmlHttp.responseXML ;
- }
- catch ( e )
- {
- try
- {
- oXml = (new DOMParser()).parseFromString( oXmlHttp.responseText, 'text/xml' ) ;
- }
- catch ( e ) {}
- }
-
- if ( !oXml || !oXml.firstChild || oXml.firstChild.nodeName == 'parsererror' )
- {
- alert( 'The server didn\'t send back a proper XML response. Please contact your system administrator.\n\n' +
- 'XML request error: ' + oXmlHttp.statusText + ' (' + oXmlHttp.status + ')\n\n' +
- 'Requested URL:\n' + urlToCall + '\n\n' +
- 'Response text:\n' + oXmlHttp.responseText ) ;
- return ;
- }
-
- oFCKXml.DOMDocument = oXml ;
- asyncFunctionPointer( oFCKXml ) ;
- }
- }
- }
-
- oXmlHttp.send( null ) ;
-
- if ( ! bAsync )
- {
- if ( oXmlHttp.status == 200 || oXmlHttp.status == 304 )
- this.DOMDocument = oXmlHttp.responseXML ;
- else
- {
- alert( 'XML request error: ' + oXmlHttp.statusText + ' (' + oXmlHttp.status + ')' ) ;
- }
- }
-}
-
-FCKXml.prototype.SelectNodes = function( xpath )
-{
- if ( navigator.userAgent.indexOf('MSIE') >= 0 ) // IE
- return this.DOMDocument.selectNodes( xpath ) ;
- else // Gecko
- {
- var aNodeArray = new Array();
-
- var xPathResult = this.DOMDocument.evaluate( xpath, this.DOMDocument,
- this.DOMDocument.createNSResolver(this.DOMDocument.documentElement), XPathResult.ORDERED_NODE_ITERATOR_TYPE, null) ;
- if ( xPathResult )
- {
- var oNode = xPathResult.iterateNext() ;
- while( oNode )
- {
- aNodeArray[aNodeArray.length] = oNode ;
- oNode = xPathResult.iterateNext();
- }
- }
- return aNodeArray ;
- }
-}
-
-FCKXml.prototype.SelectSingleNode = function( xpath )
-{
- if ( navigator.userAgent.indexOf('MSIE') >= 0 ) // IE
- return this.DOMDocument.selectSingleNode( xpath ) ;
- else // Gecko
- {
- var xPathResult = this.DOMDocument.evaluate( xpath, this.DOMDocument,
- this.DOMDocument.createNSResolver(this.DOMDocument.documentElement), 9, null);
-
- if ( xPathResult && xPathResult.singleNodeValue )
- return xPathResult.singleNodeValue ;
- else
- return null ;
- }
-}
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2010 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ * - GNU General Public License Version 2 or later (the "GPL")
+ * http://www.gnu.org/licenses/gpl.html
+ *
+ * - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ * http://www.gnu.org/licenses/lgpl.html
+ *
+ * - Mozilla Public License Version 1.1 or later (the "MPL")
+ * http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Defines the FCKXml object that is used for XML data calls
+ * and XML processing.
+ *
+ * This script is shared by almost all pages that compose the
+ * File Browser frameset.
+ */
+
+var FCKXml = function()
+{}
+
+FCKXml.prototype.GetHttpRequest = function()
+{
+ // Gecko / IE7
+ try { return new XMLHttpRequest(); }
+ catch(e) {}
+
+ // IE6
+ try { return new ActiveXObject( 'Msxml2.XMLHTTP' ) ; }
+ catch(e) {}
+
+ // IE5
+ try { return new ActiveXObject( 'Microsoft.XMLHTTP' ) ; }
+ catch(e) {}
+
+ return null ;
+}
+
+FCKXml.prototype.LoadUrl = function( urlToCall, asyncFunctionPointer )
+{
+ var oFCKXml = this ;
+
+ var bAsync = ( typeof(asyncFunctionPointer) == 'function' ) ;
+
+ var oXmlHttp = this.GetHttpRequest() ;
+
+ oXmlHttp.open( "GET", urlToCall, bAsync ) ;
+
+ if ( bAsync )
+ {
+ oXmlHttp.onreadystatechange = function()
+ {
+ if ( oXmlHttp.readyState == 4 )
+ {
+ var oXml ;
+ try
+ {
+ // this is the same test for an FF2 bug as in fckxml_gecko.js
+ // but we've moved the responseXML assignment into the try{}
+ // so we don't even have to check the return status codes.
+ var test = oXmlHttp.responseXML.firstChild ;
+ oXml = oXmlHttp.responseXML ;
+ }
+ catch ( e )
+ {
+ try
+ {
+ oXml = (new DOMParser()).parseFromString( oXmlHttp.responseText, 'text/xml' ) ;
+ }
+ catch ( e ) {}
+ }
+
+ if ( !oXml || !oXml.firstChild || oXml.firstChild.nodeName == 'parsererror' )
+ {
+ alert( 'The server didn\'t send back a proper XML response. Please contact your system administrator.\n\n' +
+ 'XML request error: ' + oXmlHttp.statusText + ' (' + oXmlHttp.status + ')\n\n' +
+ 'Requested URL:\n' + urlToCall + '\n\n' +
+ 'Response text:\n' + oXmlHttp.responseText ) ;
+ return ;
+ }
+
+ oFCKXml.DOMDocument = oXml ;
+ asyncFunctionPointer( oFCKXml ) ;
+ }
+ }
+ }
+
+ oXmlHttp.send( null ) ;
+
+ if ( ! bAsync )
+ {
+ if ( oXmlHttp.status == 200 || oXmlHttp.status == 304 )
+ this.DOMDocument = oXmlHttp.responseXML ;
+ else
+ {
+ alert( 'XML request error: ' + oXmlHttp.statusText + ' (' + oXmlHttp.status + ')' ) ;
+ }
+ }
+}
+
+FCKXml.prototype.SelectNodes = function( xpath )
+{
+ if ( navigator.userAgent.indexOf('MSIE') >= 0 ) // IE
+ return this.DOMDocument.selectNodes( xpath ) ;
+ else // Gecko
+ {
+ var aNodeArray = new Array();
+
+ var xPathResult = this.DOMDocument.evaluate( xpath, this.DOMDocument,
+ this.DOMDocument.createNSResolver(this.DOMDocument.documentElement), XPathResult.ORDERED_NODE_ITERATOR_TYPE, null) ;
+ if ( xPathResult )
+ {
+ var oNode = xPathResult.iterateNext() ;
+ while( oNode )
+ {
+ aNodeArray[aNodeArray.length] = oNode ;
+ oNode = xPathResult.iterateNext();
+ }
+ }
+ return aNodeArray ;
+ }
+}
+
+FCKXml.prototype.SelectSingleNode = function( xpath )
+{
+ if ( navigator.userAgent.indexOf('MSIE') >= 0 ) // IE
+ return this.DOMDocument.selectSingleNode( xpath ) ;
+ else // Gecko
+ {
+ var xPathResult = this.DOMDocument.evaluate( xpath, this.DOMDocument,
+ this.DOMDocument.createNSResolver(this.DOMDocument.documentElement), 9, null);
+
+ if ( xPathResult && xPathResult.singleNodeValue )
+ return xPathResult.singleNodeValue ;
+ else
+ return null ;
+ }
+}
diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php
index 1f772550ffc..c829933bf42 100644
--- a/htdocs/core/lib/admin.lib.php
+++ b/htdocs/core/lib/admin.lib.php
@@ -725,11 +725,11 @@ function activateModule($value,$withdeps=1)
$num = count($objMod->depends);
for ($i = 0; $i < $num; $i++)
{
- foreach ($modulesdir as $dir)
+ foreach ($modulesdir as $dir)
{
- if (file_exists($dir.$objMod->depends[$i].".class.php"))
- {
- activateModule($objMod->depends[$i]);
+ if (file_exists($dir.$objMod->depends[$i].".class.php"))
+ {
+ activateModule($objMod->depends[$i]);
}
}
}
@@ -741,11 +741,11 @@ function activateModule($value,$withdeps=1)
$num = count($objMod->conflictwith);
for ($i = 0; $i < $num; $i++)
{
- foreach ($modulesdir as $dir)
+ foreach ($modulesdir as $dir)
{
- if (file_exists($dir.$objMod->conflictwith[$i].".class.php"))
- {
- unActivateModule($objMod->conflictwith[$i],0);
+ if (file_exists($dir.$objMod->conflictwith[$i].".class.php"))
+ {
+ unActivateModule($objMod->conflictwith[$i],0);
}
}
}
@@ -1128,16 +1128,16 @@ function form_constantes($tableau)
print '';
}
-/**
- * Add document model used by doc generator
- *
+/**
+ * Add document model used by doc generator
+ *
* @param string $name Model name
- * @param string $type Model type
- * @param string $label Model label
- * @param string $description Model description
- * @return int <0 if KO, >0 if OK
- */
-function addDocumentModel($name, $type, $label='', $description='')
+ * @param string $type Model type
+ * @param string $label Model label
+ * @param string $description Model description
+ * @return int <0 if KO, >0 if OK
+ */
+function addDocumentModel($name, $type, $label='', $description='')
{
global $db, $conf;
@@ -1150,51 +1150,51 @@ function addDocumentModel($name, $type, $label='', $description='')
$sql.= ")";
dol_syslog("admin.lib::addDocumentModel sql=".$sql);
- $resql=$db->query($sql);
- if ($resql)
- {
+ $resql=$db->query($sql);
+ if ($resql)
+ {
$db->commit();
- return 1;
- }
- else
- {
+ return 1;
+ }
+ else
+ {
dol_print_error($db);
- $db->rollback();
- return -1;
- }
+ $db->rollback();
+ return -1;
+ }
}
-/**
- * Delete document model used by doc generator
- *
- * @param string $name Model name
- * @param string $type Model type
- * @return int <0 if KO, >0 if OK
- */
-function delDocumentModel($name, $type)
-{
+/**
+ * Delete document model used by doc generator
+ *
+ * @param string $name Model name
+ * @param string $type Model type
+ * @return int <0 if KO, >0 if OK
+ */
+function delDocumentModel($name, $type)
+{
global $db, $conf;
$db->begin();
-
+
$sql = "DELETE FROM ".MAIN_DB_PREFIX."document_model";
$sql.= " WHERE nom = '".$db->escape($name)."'";
$sql.= " AND type = '".$type."'";
- $sql.= " AND entity = ".$conf->entity;
-
- dol_syslog("admin.lib::delDocumentModel sql=".$sql);
- $resql=$db->query($sql);
- if ($resql)
- {
+ $sql.= " AND entity = ".$conf->entity;
+
+ dol_syslog("admin.lib::delDocumentModel sql=".$sql);
+ $resql=$db->query($sql);
+ if ($resql)
+ {
$db->commit();
- return 1;
- }
- else
- {
+ return 1;
+ }
+ else
+ {
dol_print_error($db);
- $db->rollback();
- return -1;
- }
+ $db->rollback();
+ return -1;
+ }
}
?>
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index 09fc90fe7c5..f8bf5d4530b 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -595,99 +595,99 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='')
return $i;
}
-/**
- * Show html area for list of addresses
- *
- * @param Conf $conf Object conf
- * @param Translate $langs Object langs
- * @param DoliDB $db Database handler
- * @param Object $object Third party object
- * @param string $backtopage Url to go once address is created
- * @return void
- */
-function show_addresses($conf,$langs,$db,$object,$backtopage='')
-{
- global $user;
+/**
+ * Show html area for list of addresses
+ *
+ * @param Conf $conf Object conf
+ * @param Translate $langs Object langs
+ * @param DoliDB $db Database handler
+ * @param Object $object Third party object
+ * @param string $backtopage Url to go once address is created
+ * @return void
+ */
+function show_addresses($conf,$langs,$db,$object,$backtopage='')
+{
+ global $user;
global $bc;
- require_once(DOL_DOCUMENT_ROOT."/societe/class/address.class.php");
-
+ require_once(DOL_DOCUMENT_ROOT."/societe/class/address.class.php");
+
$addressstatic = new Address($db);
- $num = $addressstatic->fetch_lines($object->id);
-
- $buttoncreate='';
- if ($user->rights->societe->creer)
- {
- $buttoncreate=''.$langs->trans("AddAddress").' '.img_picto($langs->trans("AddAddress"),'filenew').' '."\n";
- }
-
- print "\n";
- print_fiche_titre($langs->trans("AddressesForCompany"),$buttoncreate,'');
-
- print "\n".''."\n";
-
- print ''.$langs->trans("Label").' ';
+ $num = $addressstatic->fetch_lines($object->id);
+
+ $buttoncreate='';
+ if ($user->rights->societe->creer)
+ {
+ $buttoncreate=''.$langs->trans("AddAddress").' '.img_picto($langs->trans("AddAddress"),'filenew').' '."\n";
+ }
+
+ print "\n";
+ print_fiche_titre($langs->trans("AddressesForCompany"),$buttoncreate,'');
+
+ print "\n".''."\n";
+
+ print ''.$langs->trans("Label").' ';
print ''.$langs->trans("CompanyName").' ';
print ''.$langs->trans("Town").' ';
print ''.$langs->trans("Country").' ';
- print ''.$langs->trans("Tel").' ';
- print ''.$langs->trans("Fax").' ';
- print " ";
- print "";
-
+ print ''.$langs->trans("Tel").' ';
+ print ''.$langs->trans("Fax").' ';
+ print " ";
+ print " ";
+
+ if ($num > 0)
+ {
+ $var=true;
+
+ foreach ($addressstatic->lines as $address)
+ {
+ $var = !$var;
+
+ print "";
+
print '';
$addressstatic->id = $address->id;
- $addressstatic->label = $address->label;
- print $addressstatic->getNomUrl(1);
- print ' ';
-
+ $addressstatic->label = $address->label;
+ print $addressstatic->getNomUrl(1);
+ print '';
+
print ''.$address->name.' ';
print ''.$address->town.' ';
$img=picto_from_langcode($address->country_code);
- print ''.($img?$img.' ':'').$address->country.' ';
-
- // Lien click to dial
- print '';
- print dol_print_phone($address->phone,$address->country_code,$address->id,$object->id,'AC_TEL');
- print ' ';
- print '';
- print dol_print_phone($address->fax,$address->country_code,$address->id,$object->id,'AC_FAX');
- print ' ';
-
- if ($user->rights->societe->creer)
- {
- print '';
- print '';
- print img_edit();
- print ' ';
- }
-
- print " \n";
- }
- }
- else
- {
- //print "";
- //print ''.$langs->trans("NoAddressYetDefined").' ';
- //print " \n";
- }
- print "\n
\n";
-
- print "'.($img?$img.' ':'').$address->country.' ';
+
+ // Lien click to dial
+ print '';
+ print dol_print_phone($address->phone,$address->country_code,$address->id,$object->id,'AC_TEL');
+ print ' ';
+ print '';
+ print dol_print_phone($address->fax,$address->country_code,$address->id,$object->id,'AC_FAX');
+ print ' ';
+
+ if ($user->rights->societe->creer)
+ {
+ print '';
+ print '';
+ print img_edit();
+ print ' ';
+ }
+
+ print "";
+ //print ''.$langs->trans("NoAddressYetDefined").' ';
+ //print " \n";
+ }
+ print "\n
\n";
+
+ print "';
- }
-
- print '';
- $file=$dirtheme."/".$subdir."/thumb.png";
- $url=$urltheme."/".$subdir."/thumb.png";
- if (! file_exists($file)) $url=$urltheme."/common/nophoto.jpg";
- print ' ';
-
- $i++;
-
- if ($i % $thumbsbyrow == 0) print ' ';
- }
- }
+ $handle=opendir($dirtheme);
+ if (is_resource($handle))
+ {
+ while (($subdir = readdir($handle))!==false)
+ {
+ if (is_dir($dirtheme."/".$subdir) && substr($subdir, 0, 1) <> '.'
+ && substr($subdir, 0, 3) <> 'CVS' && ! preg_match('/common|phones/i',$subdir))
+ {
+ // Disable not stable themes
+ //if ($conf->global->MAIN_FEATURES_LEVEL < 1 && preg_match('/bureau2crea/i',$subdir)) continue;
+
+ if ($i % $thumbsbyrow == 0)
+ {
+ print '';
+ }
+
+ print '';
+ $file=$dirtheme."/".$subdir."/thumb.png";
+ $url=$urltheme."/".$subdir."/thumb.png";
+ if (! file_exists($file)) $url=$urltheme."/common/nophoto.jpg";
+ print ' ';
+
+ $i++;
+
+ if ($i % $thumbsbyrow == 0) print ' ';
+ }
+ }
}
}
}
diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index 3ff00325bff..b92e687c747 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -1370,7 +1370,7 @@ abstract class DolibarrModules
{
foreach($this->module_parts as $key => $value)
{
- // If entity is defined
+ // If entity is defined
if (is_array($value) && isset($value['entity'])) $entity = $value['entity'];
$sql = "DELETE FROM ".MAIN_DB_PREFIX."const";
diff --git a/htdocs/core/modules/commande/doc/pdf_edison.modules.php b/htdocs/core/modules/commande/doc/pdf_edison.modules.php
index 4121ffe7fe5..0ec5df0960d 100644
--- a/htdocs/core/modules/commande/doc/pdf_edison.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_edison.modules.php
@@ -300,7 +300,7 @@ class pdf_edison extends ModelePDFCommandes
// Actions on extra fields (by external module or standard code)
if (! is_object($hookmanager))
{
- include_once(DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php');
+ include_once(DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php');
$hookmanager=new HookManager($this->db);
}
$hookmanager->initHooks(array('pdfgeneration'));
@@ -651,7 +651,7 @@ class pdf_edison extends ModelePDFCommandes
$posy+=1;
-
+
// Show list of linked objects
$posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, 100, 3, 'L', $default_font_size, $hookmanager);
}
diff --git a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
index 322bc572c55..28289c90024 100644
--- a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
@@ -929,8 +929,8 @@ class pdf_einstein extends ModelePDFCommandes
$pdf->SetTextColor(0,0,60);
$pdf->MultiCell(100, 4, $outputlangs->transnoentities("OrderDate")." : " . dol_print_date($object->date,"%d %b %Y",false,$outputlangs,true), '', 'R');
- $posy+=2;
-
+ $posy+=2;
+
// Show list of linked objects
$posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, 100, 3, 'R', $default_font_size, $hookmanager);
diff --git a/htdocs/core/modules/mailings/modules_mailings.php b/htdocs/core/modules/mailings/modules_mailings.php
index 5a1b6034d42..44ad66059a8 100644
--- a/htdocs/core/modules/mailings/modules_mailings.php
+++ b/htdocs/core/modules/mailings/modules_mailings.php
@@ -154,37 +154,37 @@ class MailingTargets // This can't be abstract as it is used for some method
{
if (! empty($cibles[$i]['email'])) // avoid empty email address
{
- $sql = "INSERT INTO ".MAIN_DB_PREFIX."mailing_cibles";
- $sql .= " (fk_mailing,";
- $sql .= " fk_contact,";
- $sql .= " nom, prenom, email, other, source_url, source_id,";
- if (! empty($conf->global->MAILING_EMAIL_UNSUBSCRIBE)) $sql .= " tag,";
- $sql.= " source_type)";
- $sql .= " VALUES (".$mailing_id.",";
- $sql .= (empty($cibles[$i]['fk_contact']) ? '0' : "'".$cibles[$i]['fk_contact']."'") .",";
- $sql .= "'".$this->db->escape($cibles[$i]['name'])."',";
- $sql .= "'".$this->db->escape($cibles[$i]['firstname'])."',";
- $sql .= "'".$this->db->escape($cibles[$i]['email'])."',";
- $sql .= "'".$this->db->escape($cibles[$i]['other'])."',";
- $sql .= "'".$this->db->escape($cibles[$i]['source_url'])."',";
- $sql .= "'".$this->db->escape($cibles[$i]['source_id'])."',";
- if (! empty($conf->global->MAILING_EMAIL_UNSUBSCRIBE)) $sql .= "'".$this->db->escape(md5($cibles[$i]['email'].';'.$cibles[$i]['name'].';'.$mailing_id.';'.$conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY))."',";
- $sql .= "'".$this->db->escape($cibles[$i]['source_type'])."')";
- $result=$this->db->query($sql);
- if ($result)
- {
- $j++;
- }
- else
- {
- if ($this->db->errno() != 'DB_ERROR_RECORD_ALREADY_EXISTS')
- {
- // Si erreur autre que doublon
- dol_syslog($this->db->error());
- $this->error=$this->db->error();
- $this->db->rollback();
- return -1;
- }
+ $sql = "INSERT INTO ".MAIN_DB_PREFIX."mailing_cibles";
+ $sql .= " (fk_mailing,";
+ $sql .= " fk_contact,";
+ $sql .= " nom, prenom, email, other, source_url, source_id,";
+ if (! empty($conf->global->MAILING_EMAIL_UNSUBSCRIBE)) $sql .= " tag,";
+ $sql.= " source_type)";
+ $sql .= " VALUES (".$mailing_id.",";
+ $sql .= (empty($cibles[$i]['fk_contact']) ? '0' : "'".$cibles[$i]['fk_contact']."'") .",";
+ $sql .= "'".$this->db->escape($cibles[$i]['name'])."',";
+ $sql .= "'".$this->db->escape($cibles[$i]['firstname'])."',";
+ $sql .= "'".$this->db->escape($cibles[$i]['email'])."',";
+ $sql .= "'".$this->db->escape($cibles[$i]['other'])."',";
+ $sql .= "'".$this->db->escape($cibles[$i]['source_url'])."',";
+ $sql .= "'".$this->db->escape($cibles[$i]['source_id'])."',";
+ if (! empty($conf->global->MAILING_EMAIL_UNSUBSCRIBE)) $sql .= "'".$this->db->escape(md5($cibles[$i]['email'].';'.$cibles[$i]['name'].';'.$mailing_id.';'.$conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY))."',";
+ $sql .= "'".$this->db->escape($cibles[$i]['source_type'])."')";
+ $result=$this->db->query($sql);
+ if ($result)
+ {
+ $j++;
+ }
+ else
+ {
+ if ($this->db->errno() != 'DB_ERROR_RECORD_ALREADY_EXISTS')
+ {
+ // Si erreur autre que doublon
+ dol_syslog($this->db->error());
+ $this->error=$this->db->error();
+ $this->db->rollback();
+ return -1;
+ }
}
}
}
diff --git a/htdocs/core/modules/modMailing.class.php b/htdocs/core/modules/modMailing.class.php
index 3044dbfd7eb..ff7a97d1360 100644
--- a/htdocs/core/modules/modMailing.class.php
+++ b/htdocs/core/modules/modMailing.class.php
@@ -74,8 +74,8 @@ class modMailing extends DolibarrModules
// Permissions
$this->rights = array();
$this->rights_class = 'mailing';
- $r=0;
-
+ $r=0;
+
$r++;
$this->rights[$r][0] = 221; // id de la permission
$this->rights[$r][1] = 'Consulter les mailings'; // libelle de la permission
@@ -104,28 +104,28 @@ class modMailing extends DolibarrModules
$this->rights[$r][3] = 0;
$this->rights[$r][4] = 'supprimer';
- $r++;
- $this->rights[$r][0] = 237;
- $this->rights[$r][1] = 'View recipients and info';
- $this->rights[$r][2] = 'r';
- $this->rights[$r][3] = 0;
- $this->rights[$r][4] = 'mailing_advance'; // Visible if option MAIN_USE_ADVANCED_PERMS is on
+ $r++;
+ $this->rights[$r][0] = 237;
+ $this->rights[$r][1] = 'View recipients and info';
+ $this->rights[$r][2] = 'r';
+ $this->rights[$r][3] = 0;
+ $this->rights[$r][4] = 'mailing_advance'; // Visible if option MAIN_USE_ADVANCED_PERMS is on
$this->rights[$r][5] = 'recipient';
- $r++;
- $this->rights[$r][0] = 238;
- $this->rights[$r][1] = 'Manually send mailings';
- $this->rights[$r][2] = 'w';
- $this->rights[$r][3] = 0;
- $this->rights[$r][4] = 'mailing_advance'; // Visible if option MAIN_USE_ADVANCED_PERMS is on
+ $r++;
+ $this->rights[$r][0] = 238;
+ $this->rights[$r][1] = 'Manually send mailings';
+ $this->rights[$r][2] = 'w';
+ $this->rights[$r][3] = 0;
+ $this->rights[$r][4] = 'mailing_advance'; // Visible if option MAIN_USE_ADVANCED_PERMS is on
$this->rights[$r][5] = 'send';
- $r++;
- $this->rights[$r][0] = 239;
- $this->rights[$r][1] = 'Delete mailings after validation and/or sent';
- $this->rights[$r][2] = 'd';
- $this->rights[$r][3] = 0;
- $this->rights[$r][4] = 'mailing_advance'; // Visible if option MAIN_USE_ADVANCED_PERMS is on
+ $r++;
+ $this->rights[$r][0] = 239;
+ $this->rights[$r][1] = 'Delete mailings after validation and/or sent';
+ $this->rights[$r][2] = 'd';
+ $this->rights[$r][3] = 0;
+ $this->rights[$r][4] = 'mailing_advance'; // Visible if option MAIN_USE_ADVANCED_PERMS is on
$this->rights[$r][5] = 'delete';
}
diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
index 6736747258e..d3e82df9910 100644
--- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
@@ -982,9 +982,9 @@ class pdf_azur extends ModelePDFPropales
$pdf->MultiCell(100, 3, $outputlangs->transnoentities("CustomerCode")." : " . $outputlangs->transnoentities($object->client->code_client), '', 'R');
}
- $posy+=2;
-
- // Show list of linked objects
+ $posy+=2;
+
+ // Show list of linked objects
$posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, 100, 3, 'R', $default_font_size, $hookmanager);
if ($showaddress)
diff --git a/htdocs/core/modules/societe/modules_societe.class.php b/htdocs/core/modules/societe/modules_societe.class.php
index 269b64faf60..a627ccdc3fb 100644
--- a/htdocs/core/modules/societe/modules_societe.class.php
+++ b/htdocs/core/modules/societe/modules_societe.class.php
@@ -417,13 +417,13 @@ function thirdparty_doc_create($db, &$object, $message, $modele, $outputlangs)
{
$outputlangs->charset_output=$sav_charset_output;
- // Appel des triggers
- include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php");
- $interface=new Interfaces($db);
- $result=$interface->run_triggers('COMPANY_BUILDDOC',$object,$user,$langs,$conf);
- if ($result < 0) {
- $error++; $this->errors=$interface->errors;
- }
+ // Appel des triggers
+ include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php");
+ $interface=new Interfaces($db);
+ $result=$interface->run_triggers('COMPANY_BUILDDOC',$object,$user,$langs,$conf);
+ if ($result < 0) {
+ $error++; $this->errors=$interface->errors;
+ }
// Fin appel triggers
return 1;
diff --git a/htdocs/core/photos_resize.php b/htdocs/core/photos_resize.php
index 5724411047c..9da5a265c6f 100644
--- a/htdocs/core/photos_resize.php
+++ b/htdocs/core/photos_resize.php
@@ -42,7 +42,7 @@ require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
$langs->load("products");
$langs->load("other");
-$id=GETPOST('id','int');
+$id=GETPOST('id','int');
$action=GETPOST('action','alpha');
$modulepart=GETPOST('modulepart','alpha')?GETPOST('modulepart','alpha'):'produit|service';
$original_file = isset($_REQUEST["file"])?urldecode($_REQUEST["file"]):'';
@@ -65,12 +65,12 @@ if (! $accessallowed)
}
$object = new Product($db);
-if ($id > 0)
-{
+if ($id > 0)
+{
$result = $object->fetch($id);
if ($result <= 0) dol_print_error($db,'Failed to load object');
- $dir=$conf->product->multidir_output[$object->entity]; // By default
- if ($object->type == 0) $dir=$conf->product->multidir_output[$object->entity];
+ $dir=$conf->product->multidir_output[$object->entity]; // By default
+ if ($object->type == 0) $dir=$conf->product->multidir_output[$object->entity];
if ($object->type == 1) $dir=$conf->service->multidir_output[$object->entity];
}
diff --git a/htdocs/core/tpl/contacts.tpl.php b/htdocs/core/tpl/contacts.tpl.php
index 35f173fc572..53b19977b7d 100644
--- a/htdocs/core/tpl/contacts.tpl.php
+++ b/htdocs/core/tpl/contacts.tpl.php
@@ -16,17 +16,17 @@
*
*/
-$module = $object->element;
-$permission=(isset($permission)?$permission:$user->rights->$module->creer); // If already defined by caller page
-
-// Special cases
-if ($module == 'propal') { $permission=$user->rights->propale->creer; }
-elseif ($module == 'fichinter') { $permission=$user->rights->ficheinter->creer; }
-elseif ($module == 'invoice_supplier') { $permission=$user->rights->fournisseur->facture->creer; }
+$module = $object->element;
+$permission=(isset($permission)?$permission:$user->rights->$module->creer); // If already defined by caller page
+
+// Special cases
+if ($module == 'propal') { $permission=$user->rights->propale->creer; }
+elseif ($module == 'fichinter') { $permission=$user->rights->ficheinter->creer; }
+elseif ($module == 'invoice_supplier') { $permission=$user->rights->fournisseur->facture->creer; }
elseif ($module == 'order_supplier') { $permission=$user->rights->fournisseur->commande->creer; }
$companystatic=new Societe($db);
-$contactstatic=new Contact($db);
+$contactstatic=new Contact($db);
$userstatic=new User($db);
?>
@@ -73,8 +73,8 @@ $userstatic=new User($db);
use_javascript_ajax && $conf->global->COMPANY_USE_SEARCH_TO_SELECT) { ?>
'getContacts', 'url' => dol_buildpath('/core/ajax/contacts.php',1), 'htmlname' => 'contactid', 'params' => array('add-customer-contact' => 'disabled'));
+ $events=array();
+ $events[]=array('method' => 'getContacts', 'url' => dol_buildpath('/core/ajax/contacts.php',1), 'htmlname' => 'contactid', 'params' => array('add-customer-contact' => 'disabled'));
print $form->select_company($object->socid,'socid','',1,0,0,$events);
?>
@@ -113,12 +113,12 @@ $userstatic=new User($db);
liste_contact(-1,$source);
- $num=count($tab);
-
- $i = 0;
- while ($i < $num) {
+ foreach(array('internal','external') as $source) {
+ $tab = $object->liste_contact(-1,$source);
+ $num=count($tab);
+
+ $i = 0;
+ while ($i < $num) {
$var = !$var;
?>
@@ -129,36 +129,36 @@ $userstatic=new User($db);
0)
- {
- $companystatic->fetch($tab[$i]['socid']);
- echo $companystatic->getNomUrl(1);
- }
- if ($tab[$i]['socid'] < 0)
- {
- echo $conf->global->MAIN_INFO_SOCIETE_NOM;
- }
- if (! $tab[$i]['socid'])
- {
- echo ' ';
+ if ($tab[$i]['socid'] > 0)
+ {
+ $companystatic->fetch($tab[$i]['socid']);
+ echo $companystatic->getNomUrl(1);
+ }
+ if ($tab[$i]['socid'] < 0)
+ {
+ echo $conf->global->MAIN_INFO_SOCIETE_NOM;
+ }
+ if (! $tab[$i]['socid'])
+ {
+ echo ' ';
}
?>
id=$tab[$i]['id'];
- $userstatic->lastname=$tab[$i]['lastname'];
- $userstatic->firstname=$tab[$i]['firstname'];
- echo $userstatic->getNomUrl(1);
- }
- if ($tab[$i]['source']=='external')
- {
- $contactstatic->id=$tab[$i]['id'];
- $contactstatic->lastname=$tab[$i]['lastname'];
- $contactstatic->firstname=$tab[$i]['firstname'];
- echo $contactstatic->getNomUrl(1);
+ if ($tab[$i]['source']=='internal')
+ {
+ $userstatic->id=$tab[$i]['id'];
+ $userstatic->lastname=$tab[$i]['lastname'];
+ $userstatic->firstname=$tab[$i]['firstname'];
+ echo $userstatic->getNomUrl(1);
+ }
+ if ($tab[$i]['source']=='external')
+ {
+ $contactstatic->id=$tab[$i]['id'];
+ $contactstatic->lastname=$tab[$i]['lastname'];
+ $contactstatic->firstname=$tab[$i]['firstname'];
+ echo $contactstatic->getNomUrl(1);
}
?>
diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php
index 27c0944f8db..277194635f5 100644
--- a/htdocs/core/tpl/login.tpl.php
+++ b/htdocs/core/tpl/login.tpl.php
@@ -35,7 +35,7 @@ print ''."\n";
if (constant('JS_JQUERY_UI')) print '';
- print '';
- print ' ';
-
- if ($action == 'editdelivery_address')
- {
- $formother->form_address($_SERVER['PHP_SELF'].'?id='.$object->id,$object->fk_delivery_address,$object->socid,'fk_address','shipping',$object->id);
- }
- else
- {
- $formother->form_address($_SERVER['PHP_SELF'].'?id='.$object->id,$object->fk_delivery_address,$object->socid,'none','shipping',$object->id);
- }
- print ' ';
+ print '';
+ print ' ';
+
+ if ($action == 'editdelivery_address')
+ {
+ $formother->form_address($_SERVER['PHP_SELF'].'?id='.$object->id,$object->fk_delivery_address,$object->socid,'fk_address','shipping',$object->id);
+ }
+ else
+ {
+ $formother->form_address($_SERVER['PHP_SELF'].'?id='.$object->id,$object->fk_delivery_address,$object->socid,'none','shipping',$object->id);
+ }
+ print ' '.$langs->trans("FileWasRemoved",GETPOST('urlfile')).'
';
- Header('Location: '.$_SERVER["PHP_SELF"].'?id='.$id);
- exit;
- }
+// Delete
+else if ($action == 'confirm_deletefile' && $confirm == 'yes')
+{
+ if ($object->id > 0)
+ {
+ $langs->load("other");
+ $object->fetch_thirdparty();
+
+ $file = $upload_dir . '/' . GETPOST('urlfile'); // Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP).
+ dol_delete_file($file,0,0,0,$object);
+ $_SESSION['DolMessage'] = ''.$langs->trans("FileWasRemoved",GETPOST('urlfile')).'
';
+ Header('Location: '.$_SERVER["PHP_SELF"].'?id='.$id);
+ exit;
+ }
}
@@ -178,15 +178,15 @@ if ($object->id)
print '';
- dol_htmloutput_mesg($mesg,$mesgs);
-
- /*
+ dol_htmloutput_mesg($mesg,$mesgs);
+
+ /*
* Confirmation suppression fichier
- */
- if ($action == 'delete')
- {
- $ret=$form->form_confirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&urlfile='.urlencode($_GET["urlfile"]), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile', '', 0, 1);
- if ($ret == 'html') print ''.$langs->trans("FileWasRemoved",GETPOST('file')).'
';
- }
+// Remove file in doc form
+else if ($action == 'remove_file')
+{
+ if ($object->fetch($id))
+ {
+ require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
+
+ $object->fetch_thirdparty();
+
+ $langs->load("other");
+ $upload_dir = $conf->ficheinter->dir_output;
+ $file = $upload_dir . '/' . GETPOST('file');
+ dol_delete_file($file,0,0,0,$object);
+ $mesg = ''.$langs->trans("FileWasRemoved",GETPOST('file')).'
';
+ }
}
// Set into a project
@@ -228,7 +228,7 @@ else if ($action == 'classin' && $user->rights->ficheinter->creer)
else if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->ficheinter->supprimer)
{
$object->fetch($id);
- $object->fetch_thirdparty();
+ $object->fetch_thirdparty();
$object->delete($user);
Header('Location: '.DOL_URL_ROOT.'/fichinter/list.php?leftmenu=ficheinter');
@@ -382,30 +382,30 @@ else if ($action == 'updateline' && $user->rights->ficheinter->creer && GETPOST(
*/
else if ($action == 'confirm_deleteline' && $confirm == 'yes' && $user->rights->ficheinter->creer)
{
- $objectline = new FichinterLigne($db);
- if ($objectline->fetch(GETPOST('line_id','int')) <= 0)
- {
- dol_print_error($db);
- exit;
- }
- $result=$objectline->deleteline();
-
- if ($object->fetch($objectline->fk_fichinter) <= 0)
- {
- dol_print_error($db);
- exit;
- }
-
- // Define output language
- $outputlangs = $langs;
- $newlang='';
- if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','alpha')) $newlang=GETPOST('lang_id','alpha');
- if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
- if (! empty($newlang))
- {
- $outputlangs = new Translate("",$conf);
- $outputlangs->setDefaultLang($newlang);
- }
+ $objectline = new FichinterLigne($db);
+ if ($objectline->fetch(GETPOST('line_id','int')) <= 0)
+ {
+ dol_print_error($db);
+ exit;
+ }
+ $result=$objectline->deleteline();
+
+ if ($object->fetch($objectline->fk_fichinter) <= 0)
+ {
+ dol_print_error($db);
+ exit;
+ }
+
+ // Define output language
+ $outputlangs = $langs;
+ $newlang='';
+ if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','alpha')) $newlang=GETPOST('lang_id','alpha');
+ if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
+ if (! empty($newlang))
+ {
+ $outputlangs = new Translate("",$conf);
+ $outputlangs->setDefaultLang($newlang);
+ }
fichinter_create($db, $object, $object->modelpdf, $outputlangs);
}
@@ -644,64 +644,64 @@ if ($action == 'send' && ! GETPOST('cancel','alpha') && (empty($conf->global->MA
$action='presend';
}
-if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
+if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
{
- if ($action == 'addcontact' && $user->rights->ficheinter->creer)
- {
- $result = $object->fetch($id);
-
- if ($result > 0 && $id > 0)
+ if ($action == 'addcontact' && $user->rights->ficheinter->creer)
+ {
+ $result = $object->fetch($id);
+
+ if ($result > 0 && $id > 0)
{
- $contactid = (GETPOST('userid','int') ? GETPOST('userid','int') : GETPOST('contactid','int'));
- $result = $object->add_contact($contactid, GETPOST('type','int'), GETPOST('source','alpha'));
- }
-
- if ($result >= 0)
- {
- Header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
- exit;
- }
- else
- {
- if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
- {
- $langs->load("errors");
- $mesg = ''.$langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType").'
';
- }
- else
- {
- $mesg = ''.$object->error.'
';
- }
- }
- }
-
- // bascule du statut d'un contact
- else if ($action == 'swapstatut' && $user->rights->ficheinter->creer)
- {
- if ($object->fetch($id))
- {
- $result=$object->swapContactStatus(GETPOST('ligne','int'));
- }
- else
- {
- dol_print_error($db);
- }
- }
-
- // Efface un contact
- else if ($action == 'deletecontact' && $user->rights->ficheinter->creer)
- {
- $object->fetch($id);
- $result = $object->delete_contact(GETPOST('lineid','int'));
-
- if ($result >= 0)
- {
- Header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
- exit;
- }
- else {
- dol_print_error($db);
- }
+ $contactid = (GETPOST('userid','int') ? GETPOST('userid','int') : GETPOST('contactid','int'));
+ $result = $object->add_contact($contactid, GETPOST('type','int'), GETPOST('source','alpha'));
+ }
+
+ if ($result >= 0)
+ {
+ Header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+ exit;
+ }
+ else
+ {
+ if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
+ {
+ $langs->load("errors");
+ $mesg = ''.$langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType").'
';
+ }
+ else
+ {
+ $mesg = ''.$object->error.'
';
+ }
+ }
+ }
+
+ // bascule du statut d'un contact
+ else if ($action == 'swapstatut' && $user->rights->ficheinter->creer)
+ {
+ if ($object->fetch($id))
+ {
+ $result=$object->swapContactStatus(GETPOST('ligne','int'));
+ }
+ else
+ {
+ dol_print_error($db);
+ }
+ }
+
+ // Efface un contact
+ else if ($action == 'deletecontact' && $user->rights->ficheinter->creer)
+ {
+ $object->fetch($id);
+ $result = $object->delete_contact(GETPOST('lineid','int'));
+
+ if ($result >= 0)
+ {
+ Header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+ exit;
+ }
+ else {
+ dol_print_error($db);
+ }
}
}
@@ -941,15 +941,15 @@ else if ($id > 0 || ! empty($ref))
print "'.$langs->trans("FileWasRemoved",GETPOST('urlfile')).'
';
- Header('Location: '.$_SERVER["PHP_SELF"].'?id='.$id);
- exit;
- }
+else if ($action == 'confirm_deletefile' && $confirm == 'yes')
+{
+ if ($object->id > 0)
+ {
+ $langs->load("other");
+
+ $file = $upload_dir . '/' . GETPOST('urlfile'); // Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP).
+ dol_delete_file($file,0,0,0,$object);
+ $_SESSION['DolMessage'] = ''.$langs->trans("FileWasRemoved",GETPOST('urlfile')).'
';
+ Header('Location: '.$_SERVER["PHP_SELF"].'?id='.$id);
+ exit;
+ }
}
@@ -211,15 +211,15 @@ if ($object->id > 0)
print "\n";
- dol_htmloutput_mesg($mesg,$mesgs);
-
- /*
- * Confirmation suppression fichier
- */
- if ($action == 'delete')
- {
- $ret=$form->form_confirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&urlfile='.urlencode($_GET["urlfile"]), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile', '', 0, 1);
- if ($ret == 'html') print ''.$langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType").'
';
- }
- else
- {
- $mesg = ''.$object->error.'
';
- }
- }
- }
-
- // bascule du statut d'un contact
- else if ($action == 'swapstatut' && $user->rights->fournisseur->facture->creer)
- {
- if ($object->fetch($id))
- {
- $result=$object->swapContactStatus(GETPOST('ligne'));
- }
- else
- {
- dol_print_error($db);
- }
- }
-
- // Efface un contact
- else if ($action == 'deletecontact' && $user->rights->fournisseur->facture->creer)
- {
- $object->fetch($id);
- $result = $object->delete_contact($_GET["lineid"]);
-
- if ($result >= 0)
- {
- Header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
- exit;
- }
- else {
- dol_print_error($db);
- }
+ $contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'));
+ $result = $result = $object->add_contact($contactid, $_POST["type"], $_POST["source"]);
+ }
+
+ if ($result >= 0)
+ {
+ Header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+ exit;
+ }
+ else
+ {
+ if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
+ {
+ $langs->load("errors");
+ $mesg = ''.$langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType").'
';
+ }
+ else
+ {
+ $mesg = ''.$object->error.'
';
+ }
+ }
+ }
+
+ // bascule du statut d'un contact
+ else if ($action == 'swapstatut' && $user->rights->fournisseur->facture->creer)
+ {
+ if ($object->fetch($id))
+ {
+ $result=$object->swapContactStatus(GETPOST('ligne'));
+ }
+ else
+ {
+ dol_print_error($db);
+ }
+ }
+
+ // Efface un contact
+ else if ($action == 'deletecontact' && $user->rights->fournisseur->facture->creer)
+ {
+ $object->fetch($id);
+ $result = $object->delete_contact($_GET["lineid"]);
+
+ if ($result >= 0)
+ {
+ Header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+ exit;
+ }
+ else {
+ dol_print_error($db);
+ }
}
}
@@ -1504,23 +1504,23 @@ else
print '';
- $lienfin=' ';
-
- if ($withpicto) $result.=($lien.img_object($langs->trans("ShowAddress").': '.$this->label,'address').$lienfin.' ');
- $result.=$lien.$this->label.$lienfin;
- return $result;
+ /**
+ * Return name of address with link (and eventually picto)
+ * Use $this->id, $this->label, $this->socid
+ *
+ * @param int $withpicto Include picto with link
+ * @param string $option Where the link point to
+ * @return string String with URL
+ */
+ function getNomUrl($withpicto=0,$option='')
+ {
+ global $langs;
+
+ $result='';
+
+ $lien = '';
+ $lienfin=' ';
+
+ if ($withpicto) $result.=($lien.img_object($langs->trans("ShowAddress").': '.$this->label,'address').$lienfin.' ');
+ $result.=$lien.$this->label.$lienfin;
+ return $result;
}
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 1cbf1cfc0d7..eee2d8d49c2 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -446,10 +446,10 @@ class Societe extends CommonObject
}
if (! is_numeric($this->client) && ! is_numeric($this->fournisseur))
{
- $langs->load("errors");
- $this->error = $langs->trans("BadValueForParameterClientOrSupplier");
+ $langs->load("errors");
+ $this->error = $langs->trans("BadValueForParameterClientOrSupplier");
return -1;
- }
+ }
$this->db->begin();
@@ -481,8 +481,8 @@ class Societe extends CommonObject
$sql .= ",siret = '". $this->db->escape($this->idprof2) ."'";
$sql .= ",ape = '". $this->db->escape($this->idprof3) ."'";
$sql .= ",idprof4 = '". $this->db->escape($this->idprof4) ."'";
- $sql .= ",idprof5 = '". $this->db->escape($this->idprof5) ."'";
- $sql .= ",idprof6 = '". $this->db->escape($this->idprof6) ."'";
+ $sql .= ",idprof5 = '". $this->db->escape($this->idprof5) ."'";
+ $sql .= ",idprof6 = '". $this->db->escape($this->idprof6) ."'";
$sql .= ",tva_assuj = ".($this->tva_assuj!=''?"'".$this->tva_assuj."'":"null");
$sql .= ",tva_intra = '" . $this->db->escape($this->tva_intra) ."'";
@@ -731,8 +731,8 @@ class Societe extends CommonObject
$this->idprof2 = $obj->idprof2;
$this->idprof3 = $obj->idprof3;
$this->idprof4 = $obj->idprof4;
- $this->idprof5 = $obj->idprof5;
- $this->idprof6 = $obj->idprof6;
+ $this->idprof5 = $obj->idprof5;
+ $this->idprof6 = $obj->idprof6;
$this->capital = $obj->capital;
diff --git a/htdocs/societe/document.php b/htdocs/societe/document.php
index a0a10011946..26aad2de1dd 100644
--- a/htdocs/societe/document.php
+++ b/htdocs/societe/document.php
@@ -36,14 +36,14 @@ $langs->load('other');
$action=GETPOST('action');
$confirm=GETPOST('confirm');
-$id=(GETPOST('socid','int') ? GETPOST('socid','int') : GETPOST('id','int'));
+$id=(GETPOST('socid','int') ? GETPOST('socid','int') : GETPOST('id','int'));
$ref = GETPOST('ref', 'alpha');
-$mesg='';
-if (isset($_SESSION['DolMessage']))
-{
- $mesg=$_SESSION['DolMessage'];
- unset($_SESSION['DolMessage']);
+$mesg='';
+if (isset($_SESSION['DolMessage']))
+{
+ $mesg=$_SESSION['DolMessage'];
+ unset($_SESSION['DolMessage']);
}
// Security check
@@ -67,11 +67,11 @@ if (! $sortorder) $sortorder="ASC";
if (! $sortfield) $sortfield="name";
$object = new Societe($db);
-if ($id > 0 || ! empty($ref))
-{
+if ($id > 0 || ! empty($ref))
+{
$result = $object->fetch($id, $ref);
- $upload_dir = $conf->societe->multidir_output[$object->entity] . "/" . $object->id ;
+ $upload_dir = $conf->societe->multidir_output[$object->entity] . "/" . $object->id ;
$courrier_dir = $conf->societe->multidir_output[$object->entity] . "/courrier/" . get_exdir($object->id);
}
@@ -149,88 +149,88 @@ llxHeader('',$langs->trans("ThirdParty").' - '.$langs->trans("Files"),$help_url)
if ($object->id)
{
- /*
+ /*
* Affichage onglets
- */
- if ($conf->notification->enabled) $langs->load("mails");
- $head = societe_prepare_head($object);
-
- $form=new Form($db);
-
- dol_fiche_head($head, 'document', $langs->trans("ThirdParty"),0,'company');
-
-
- // Construit liste des fichiers
- $filearray=dol_dir_list($upload_dir,"files",0,'','\.meta$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
- $totalsize=0;
- foreach($filearray as $key => $file)
- {
- $totalsize+=$file['size'];
- }
-
-
- print '';
-
- // Ref
- print ''.$langs->trans("ThirdPartyName").' ';
- print '';
- print $form->showrefnav($object,'socid','',($user->societe_id?0:1),'rowid','nom');
- print ' '.$langs->trans('Prefix').' '.$object->prefix_comm.' ';
- print $langs->trans('CustomerCode').' ';
- print $object->code_client;
- if ($object->check_codeclient() <> 0) print ' ('.$langs->trans("WrongCustomerCode").') ';
- print ' ';
- print $langs->trans('SupplierCode').' ';
- print $object->code_fournisseur;
- if ($object->check_codefournisseur() <> 0) print ' ('.$langs->trans("WrongSupplierCode").') ';
- print ' '.$langs->trans("NbOfAttachedFiles").' '.count($filearray).' '.$langs->trans("TotalSizeOfAttachedFiles").' '.$totalsize.' '.$langs->trans("bytes").'
';
-
- print '';
-
- dol_htmloutput_mesg($mesg,$mesgs);
-
- /*
- * Confirmation suppression fichier
- */
- if ($action == 'delete')
+ */
+ if ($conf->notification->enabled) $langs->load("mails");
+ $head = societe_prepare_head($object);
+
+ $form=new Form($db);
+
+ dol_fiche_head($head, 'document', $langs->trans("ThirdParty"),0,'company');
+
+
+ // Construit liste des fichiers
+ $filearray=dol_dir_list($upload_dir,"files",0,'','\.meta$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
+ $totalsize=0;
+ foreach($filearray as $key => $file)
{
- $ret=$form->form_confirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&urlfile='.urlencode(GETPOST("urlfile")), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile', '', 0, 1);
- if ($ret == 'html') print '';
+
+ // Ref
+ print ''.$langs->trans("ThirdPartyName").' ';
+ print '';
+ print $form->showrefnav($object,'socid','',($user->societe_id?0:1),'rowid','nom');
+ print ' '.$langs->trans('Prefix').' '.$object->prefix_comm.' ';
+ print $langs->trans('CustomerCode').' ';
+ print $object->code_client;
+ if ($object->check_codeclient() <> 0) print ' ('.$langs->trans("WrongCustomerCode").') ';
+ print ' ';
+ print $langs->trans('SupplierCode').' ';
+ print $object->code_fournisseur;
+ if ($object->check_codefournisseur() <> 0) print ' ('.$langs->trans("WrongSupplierCode").') ';
+ print ' '.$langs->trans("NbOfAttachedFiles").' '.count($filearray).' '.$langs->trans("TotalSizeOfAttachedFiles").' '.$totalsize.' '.$langs->trans("bytes").'
';
+
+ print '';
+
+ dol_htmloutput_mesg($mesg,$mesgs);
+
+ /*
+ * Confirmation suppression fichier
+ */
+ if ($action == 'delete')
+ {
+ $ret=$form->form_confirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&urlfile='.urlencode(GETPOST("urlfile")), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile', '', 0, 1);
+ if ($ret == 'html') print ''.$langs->trans("FileWasRemoved",GETPOST('file')).'
';
- }
+ // Remove file in doc form
+ else if ($action == 'remove_file')
+ {
+ if ($object->fetch($socid))
+ {
+ require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
+
+ $langs->load("other");
+ $upload_dir = $conf->societe->dir_output;
+ $file = $upload_dir . '/' . GETPOST('file');
+ dol_delete_file($file,0,0,0,$object);
+ $mesg = ''.$langs->trans("FileWasRemoved",GETPOST('file')).'
';
+ }
}
}
@@ -1836,10 +1836,10 @@ else
$result=show_contacts($conf,$langs,$db,$object,$_SERVER["PHP_SELF"].'?socid='.$object->id);
}
- // Addresses list
- if (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT))
- {
- $result=show_addresses($conf,$langs,$db,$object,$_SERVER["PHP_SELF"].'?socid='.$object->id);
+ // Addresses list
+ if (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT))
+ {
+ $result=show_addresses($conf,$langs,$db,$object,$_SERVER["PHP_SELF"].'?socid='.$object->id);
}
// Projects list
diff --git a/htdocs/webservices/server_thirdparty.php b/htdocs/webservices/server_thirdparty.php
index d9663e867bc..d6a72b0e4e7 100755
--- a/htdocs/webservices/server_thirdparty.php
+++ b/htdocs/webservices/server_thirdparty.php
@@ -124,46 +124,46 @@ $server->wsdl->addComplexType(
)
);
-// Define other specific objects
-$server->wsdl->addComplexType(
- 'filterthirdparty',
- 'complexType',
- 'struct',
- 'all',
- '',
- array(
- //'limit' => array('name'=>'limit','type'=>'xsd:string'),
- 'client' => array('name'=>'client','type'=>'xsd:string'),
+// Define other specific objects
+$server->wsdl->addComplexType(
+ 'filterthirdparty',
+ 'complexType',
+ 'struct',
+ 'all',
+ '',
+ array(
+ //'limit' => array('name'=>'limit','type'=>'xsd:string'),
+ 'client' => array('name'=>'client','type'=>'xsd:string'),
'supplier' => array('name'=>'supplier','type'=>'xsd:string')
- )
-);
-
-$server->wsdl->addComplexType(
- 'ThirdPartiesArray',
- 'complexType',
- 'array',
- '',
- 'SOAP-ENC:Array',
- array(),
- array(
- array('ref'=>'SOAP-ENC:arrayType','wsdl:arrayType'=>'tns:thirdparty[]')
- ),
- 'tns:thirdparty'
+ )
);
-$server->wsdl->addComplexType(
- 'ThirdPartiesArray2',
- 'complexType',
- 'array',
- 'sequence',
- '',
- array(
- 'thirdparty' => array(
- 'name' => 'thirdparty',
- 'type' => 'tns:thirdparty',
- 'minOccurs' => '0',
- 'maxOccurs' => 'unbounded'
- )
- )
+
+$server->wsdl->addComplexType(
+ 'ThirdPartiesArray',
+ 'complexType',
+ 'array',
+ '',
+ 'SOAP-ENC:Array',
+ array(),
+ array(
+ array('ref'=>'SOAP-ENC:arrayType','wsdl:arrayType'=>'tns:thirdparty[]')
+ ),
+ 'tns:thirdparty'
+);
+$server->wsdl->addComplexType(
+ 'ThirdPartiesArray2',
+ 'complexType',
+ 'array',
+ 'sequence',
+ '',
+ array(
+ 'thirdparty' => array(
+ 'name' => 'thirdparty',
+ 'type' => 'tns:thirdparty',
+ 'minOccurs' => '0',
+ 'maxOccurs' => 'unbounded'
+ )
+ )
);
@@ -188,33 +188,33 @@ $server->register(
'WS to get a thirdparty from its id, ref or ref_ext'
);
-// Register WSDL
-$server->register(
- 'createThirdParty',
- // Entry values
- array('authentication'=>'tns:authentication','thirdparty'=>'tns:thirdparty'),
- // Exit values
- array('result'=>'tns:result','id'=>'xsd:string'),
- $ns,
- $ns.'#createThirdParty',
- $styledoc,
- $styleuse,
- 'WS to create a thirdparty'
+// Register WSDL
+$server->register(
+ 'createThirdParty',
+ // Entry values
+ array('authentication'=>'tns:authentication','thirdparty'=>'tns:thirdparty'),
+ // Exit values
+ array('result'=>'tns:result','id'=>'xsd:string'),
+ $ns,
+ $ns.'#createThirdParty',
+ $styledoc,
+ $styleuse,
+ 'WS to create a thirdparty'
);
-
-// Register WSDL
-$server->register(
- 'getListOfThirdParties',
- // Entry values
- array('authentication'=>'tns:authentication','filterthirdparty'=>'tns:filterthirdparty'),
- // Exit values
- array('result'=>'tns:result','thirdparties'=>'tns:ThirdPartiesArray2'),
- $ns,
- $ns.'#getListOfThirdParties',
- $styledoc,
- $styleuse,
- 'WS to get list of thirdparties id and ref'
+
+// Register WSDL
+$server->register(
+ 'getListOfThirdParties',
+ // Entry values
+ array('authentication'=>'tns:authentication','filterthirdparty'=>'tns:filterthirdparty'),
+ // Exit values
+ array('result'=>'tns:result','thirdparties'=>'tns:ThirdPartiesArray2'),
+ $ns,
+ $ns.'#getListOfThirdParties',
+ $styledoc,
+ $styleuse,
+ 'WS to get list of thirdparties id and ref'
);
@@ -311,187 +311,187 @@ function getThirdParty($authentication,$id='',$ref='',$ref_ext='')
}
-
-/**
- * Create a thirdparty
- *
- * @param array $authentication Array of authentication information
- * @param Societe $thirdparty Thirdparty
- * @return array Array result
- */
-function createThirdParty($authentication,$thirdparty)
-{
- global $db,$conf,$langs;
-
- $now=dol_now();
-
- dol_syslog("Function: createThirdParty login=".$authentication['login']);
-
- if ($authentication['entity']) $conf->entity=$authentication['entity'];
-
- // Init and check authentication
- $objectresp=array();
- $errorcode='';$errorlabel='';
- $error=0;
- $fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
- // Check parameters
- if (empty($thirdparty['ref']))
- {
- $error++; $errorcode='KO'; $errorlabel="Name is mandatory.";
- }
-
-
- if (! $error)
- {
- include_once(DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php');
-
- $newobject=new Societe($db);
- $newobject->ref=$thirdparty['ref'];
+
+/**
+ * Create a thirdparty
+ *
+ * @param array $authentication Array of authentication information
+ * @param Societe $thirdparty Thirdparty
+ * @return array Array result
+ */
+function createThirdParty($authentication,$thirdparty)
+{
+ global $db,$conf,$langs;
+
+ $now=dol_now();
+
+ dol_syslog("Function: createThirdParty login=".$authentication['login']);
+
+ if ($authentication['entity']) $conf->entity=$authentication['entity'];
+
+ // Init and check authentication
+ $objectresp=array();
+ $errorcode='';$errorlabel='';
+ $error=0;
+ $fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
+ // Check parameters
+ if (empty($thirdparty['ref']))
+ {
+ $error++; $errorcode='KO'; $errorlabel="Name is mandatory.";
+ }
+
+
+ if (! $error)
+ {
+ include_once(DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php');
+
+ $newobject=new Societe($db);
+ $newobject->ref=$thirdparty['ref'];
$newobject->name=$thirdparty['ref'];
- $newobject->ref_ext=$thirdparty['ref_ext'];
+ $newobject->ref_ext=$thirdparty['ref_ext'];
$newobject->status=$thirdparty['status'];
- $newobject->client=$thirdparty['client'];
+ $newobject->client=$thirdparty['client'];
$newobject->fournisseur=$thirdparty['supplier'];
$newobject->code_client=$thirdparty['customer_code'];
$newobject->code_fournisseur=$thirdparty['supplier_code'];
$newobject->code_compta=$thirdparty['customer_code_accountancy'];
$newobject->code_compta_fournisseur=$thirdparty['supplier_code_accountancy'];
- $newobject->date_creation=$now;
+ $newobject->date_creation=$now;
$newobject->note=$thirdparty['note'];
- $newobject->address=$thirdparty['address'];
- $newobject->zip=$thirdparty['zip'];
- $newobject->town=$thirdparty['town'];
-
- $newobject->country_id=$thirdparty['country_id'];
- if ($thirdparty['country_code']) $newobject->country_id=getCountry($thirdparty['country_code'],3);
- $newobject->province_id=$thirdparty['province_id'];
- //if ($thirdparty['province_code']) $newobject->province_code=getCountry($thirdparty['province_code'],3);
-
+ $newobject->address=$thirdparty['address'];
+ $newobject->zip=$thirdparty['zip'];
+ $newobject->town=$thirdparty['town'];
+
+ $newobject->country_id=$thirdparty['country_id'];
+ if ($thirdparty['country_code']) $newobject->country_id=getCountry($thirdparty['country_code'],3);
+ $newobject->province_id=$thirdparty['province_id'];
+ //if ($thirdparty['province_code']) $newobject->province_code=getCountry($thirdparty['province_code'],3);
+
$newobject->phone=$thirdparty['phone'];
$newobject->fax=$thirdparty['fax'];
$newobject->email=$thirdparty['email'];
$newobject->url=$thirdparty['url'];
- $newobject->idprof1=$thirdparty['profid1'];
- $newobject->idprof2=$thirdparty['profid2'];
- $newobject->idprof3=$thirdparty['profid3'];
- $newobject->idprof4=$thirdparty['profid4'];
- $newobject->idprof5=$thirdparty['profid5'];
- $newobject->idprof6=$thirdparty['profid6'];
+ $newobject->idprof1=$thirdparty['profid1'];
+ $newobject->idprof2=$thirdparty['profid2'];
+ $newobject->idprof3=$thirdparty['profid3'];
+ $newobject->idprof4=$thirdparty['profid4'];
+ $newobject->idprof5=$thirdparty['profid5'];
+ $newobject->idprof6=$thirdparty['profid6'];
$newobject->capital=$thirdparty['capital'];
$newobject->barcode=$thirdparty['barcode'];
- $newobject->tva_assuj=$thirdparty['vat_used'];
- $newobject->tva_intra=$thirdparty['vat_number'];
+ $newobject->tva_assuj=$thirdparty['vat_used'];
+ $newobject->tva_intra=$thirdparty['vat_number'];
- $newobject->canvas=$thirdparty['canvas'];
-
- $db->begin();
-
- $result=$newobject->create($fuser);
- if ($result <= 0)
- {
- $error++;
- }
-
- if (! $error)
- {
- $db->commit();
- $objectresp=array('result'=>array('result_code'=>'OK', 'result_label'=>''),'id'=>$newobject->id,'ref'=>$newobject->ref);
- }
- else
- {
- $db->rollback();
- $error++;
- $errorcode='KO';
- $errorlabel=$newobject->error;
- }
- }
-
- if ($error)
- {
- $objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
- }
-
- return $objectresp;
-}
+ $newobject->canvas=$thirdparty['canvas'];
+ $db->begin();
+ $result=$newobject->create($fuser);
+ if ($result <= 0)
+ {
+ $error++;
+ }
-/**
- * getListOfThirdParties
- *
- * @param array $authentication Array of authentication information
- * @param array $filterthirdparty Filter fields
- * @return array Array result
- */
-function getListOfThirdParties($authentication,$filterthirdparty)
-{
- global $db,$conf,$langs;
-
- $now=dol_now();
-
- dol_syslog("Function: getListOfThirdParties login=".$authentication['login']);
-
- if ($authentication['entity']) $conf->entity=$authentication['entity'];
-
- // Init and check authentication
- $objectresp=array();
- $arraythirdparties=array();
- $errorcode='';$errorlabel='';
- $error=0;
- $fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
- // Check parameters
-
- if (! $error)
- {
- $sql ="SELECT rowid, nom as ref, ref_ext";
- $sql.=" FROM ".MAIN_DB_PREFIX."societe";
- $sql.=" WHERE entity=".$conf->entity;
- foreach($filterthirdparty as $key => $val)
- {
- if ($key == 'client' && $val != '') $sql.=" AND client = ".$db->escape($val);
- if ($key == 'supplier' && $val != '') $sql.=" AND fournisseur = ".$db->escape($val);
- }
- $resql=$db->query($sql);
- if ($resql)
- {
- $num=$db->num_rows($resql);
-
- $i=0;
- while ($i < $num)
- {
- $obj=$db->fetch_object($resql);
- $arraythirdparties[]=array('id'=>$obj->rowid,'ref'=>$obj->ref,'ref_ext'=>$obj->ref_ext);
- $i++;
- }
- }
- else
- {
- $error++;
- $errorcode=$db->lasterrno();
- $errorlabel=$db->lasterror();
- }
- }
-
- if ($error)
- {
- $objectresp = array(
- 'result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel),
- 'thirdparties'=>$arraythirdparties
- );
- }
- else
- {
- $objectresp = array(
- 'result'=>array('result_code' => 'OK', 'result_label' => ''),
- 'thirdparties'=>$arraythirdparties
- );
- }
-
- return $objectresp;
+ if (! $error)
+ {
+ $db->commit();
+ $objectresp=array('result'=>array('result_code'=>'OK', 'result_label'=>''),'id'=>$newobject->id,'ref'=>$newobject->ref);
+ }
+ else
+ {
+ $db->rollback();
+ $error++;
+ $errorcode='KO';
+ $errorlabel=$newobject->error;
+ }
+ }
+
+ if ($error)
+ {
+ $objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
+ }
+
+ return $objectresp;
}
-
+
+
+
+/**
+ * getListOfThirdParties
+ *
+ * @param array $authentication Array of authentication information
+ * @param array $filterthirdparty Filter fields
+ * @return array Array result
+ */
+function getListOfThirdParties($authentication,$filterthirdparty)
+{
+ global $db,$conf,$langs;
+
+ $now=dol_now();
+
+ dol_syslog("Function: getListOfThirdParties login=".$authentication['login']);
+
+ if ($authentication['entity']) $conf->entity=$authentication['entity'];
+
+ // Init and check authentication
+ $objectresp=array();
+ $arraythirdparties=array();
+ $errorcode='';$errorlabel='';
+ $error=0;
+ $fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
+ // Check parameters
+
+ if (! $error)
+ {
+ $sql ="SELECT rowid, nom as ref, ref_ext";
+ $sql.=" FROM ".MAIN_DB_PREFIX."societe";
+ $sql.=" WHERE entity=".$conf->entity;
+ foreach($filterthirdparty as $key => $val)
+ {
+ if ($key == 'client' && $val != '') $sql.=" AND client = ".$db->escape($val);
+ if ($key == 'supplier' && $val != '') $sql.=" AND fournisseur = ".$db->escape($val);
+ }
+ $resql=$db->query($sql);
+ if ($resql)
+ {
+ $num=$db->num_rows($resql);
+
+ $i=0;
+ while ($i < $num)
+ {
+ $obj=$db->fetch_object($resql);
+ $arraythirdparties[]=array('id'=>$obj->rowid,'ref'=>$obj->ref,'ref_ext'=>$obj->ref_ext);
+ $i++;
+ }
+ }
+ else
+ {
+ $error++;
+ $errorcode=$db->lasterrno();
+ $errorlabel=$db->lasterror();
+ }
+ }
+
+ if ($error)
+ {
+ $objectresp = array(
+ 'result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel),
+ 'thirdparties'=>$arraythirdparties
+ );
+ }
+ else
+ {
+ $objectresp = array(
+ 'result'=>array('result_code' => 'OK', 'result_label' => ''),
+ 'thirdparties'=>$arraythirdparties
+ );
+ }
+
+ return $objectresp;
+}
+
// Return the results.
diff --git a/scripts/emailings/cron-mailing-send.php b/scripts/emailings/cron-mailing-send.php
index 6962113f005..903c268ab38 100644
--- a/scripts/emailings/cron-mailing-send.php
+++ b/scripts/emailings/cron-mailing-send.php
@@ -57,206 +57,206 @@ if ($resql)
if ($num)
{
- for ($i=0;$i<$num;$i++)
+ for ($i=0;$i<$num;$i++)
{
- $obj = $db->fetch_object($resql);
-
- dol_syslog("mailing ".$obj->rowid);
-
- $id = $obj->rowid;
- $subject = $obj->sujet;
- $message = $obj->body;
- $from = $obj->email_from;
- $replyto = $obj->email_replyto;
- $errorsto = $obj->email_errorsto;
- // Le message est-il en html
- $msgishtml=-1; // Unknown by default
+ $obj = $db->fetch_object($resql);
+
+ dol_syslog("mailing ".$obj->rowid);
+
+ $id = $obj->rowid;
+ $subject = $obj->sujet;
+ $message = $obj->body;
+ $from = $obj->email_from;
+ $replyto = $obj->email_replyto;
+ $errorsto = $obj->email_errorsto;
+ // Le message est-il en html
+ $msgishtml=-1; // Unknown by default
if (preg_match('/[\s\t]*/i',$message)) $msgishtml=1;
- // Set statut 9 (in progress) to avoid duplication
- $sql="UPDATE ".MAIN_DB_PREFIX."mailing";
- $sql.=" SET statut=9 WHERE rowid=".$id;
- $resql3=$db->query($sql);
- if (! $resql3)
- {
- dol_print_error($db);
+ // Set statut 9 (in progress) to avoid duplication
+ $sql="UPDATE ".MAIN_DB_PREFIX."mailing";
+ $sql.=" SET statut=9 WHERE rowid=".$id;
+ $resql3=$db->query($sql);
+ if (! $resql3)
+ {
+ dol_print_error($db);
}
- $nbok=0; $nbko=0;
-
- // On choisit les mails non deja envoyes pour ce mailing (statut=0)
- // ou envoyes en erreur (statut=-1)
- $sql = "SELECT mc.rowid, mc.nom as lastname, mc.prenom as firstname, mc.email, mc.other, mc.source_url, mc.source_id, mc.source_type, mc.tag";
- $sql .= " FROM ".MAIN_DB_PREFIX."mailing_cibles as mc";
- $sql .= " WHERE mc.statut < 1 AND mc.fk_mailing = ".$id;
-
- $resql=$db->query($sql);
- if ($resql)
- {
- $num = $db->num_rows($resql);
-
- if ($num)
- {
- dol_syslog("nb of targets = ".$num, LOG_DEBUG);
-
- $now=dol_now();
-
- // Positionne date debut envoi
- $sql="UPDATE ".MAIN_DB_PREFIX."mailing SET date_envoi='".$db->idate($now)."' WHERE rowid=".$id;
-
- $resql2=$db->query($sql);
- if (! $resql2)
- {
- dol_print_error($db);
- }
-
- // Look on each email and sent message
- $i = 0;
- while ($i < $num)
- {
- $res=1;
- $now=dol_now();
-
- $obj2 = $db->fetch_object($resql);
-
- // sendto en RFC2822
- $sendto = str_replace(',',' ',$obj2->firstname." ".$obj2->lastname) ." <".$obj2->email.">";
-
- // Make subtsitutions on topic and body
- $other=explode(';',$obj2->other);
- $other1=$other[0];
- $other2=$other[1];
- $other3=$other[2];
- $other4=$other[3];
- $other5=$other[4];
- $substitutionarray=array(
- '__ID__' => $obj2->source_id,
- '__EMAIL__' => $obj2->email,
- '__CHECK_READ__' => ''.$langs->trans("MailUnsubcribe").' ',
- '__MAILTOEMAIL__' => ''.$obj2->email.' ',
- '__LASTNAME__' => $obj2->lastname,
- '__FIRSTNAME__' => $obj2->firstname,
- '__OTHER1__' => $other1,
- '__OTHER2__' => $other2,
- '__OTHER3__' => $other3,
- '__OTHER4__' => $other4,
- '__OTHER5__' => $other5
- );
-
- complete_substitutions_array($substitutionarray,$langs);
- $newsubject=make_substitutions($subject,$substitutionarray);
- $newmessage=make_substitutions($message,$substitutionarray);
-
- $substitutionisok=true;
-
- // Fabrication du mail
- $mail = new CMailFile(
- $newsubject,
- $sendto,
- $from,
- $newmessage,
- array(),
- array(),
- array(),
- '',
- '',
- 0,
- $msgishtml,
- $errorsto
- );
-
- if ($mail->error)
- {
- $res=0;
- }
- if (! $substitutionisok)
- {
- $mail->error='Some substitution failed';
- $res=0;
- }
-
- // Send Email
- if ($res)
- {
- $res=$mail->sendfile();
- }
-
- if ($res)
- {
- // Mail successful
- $nbok++;
-
- dol_syslog("ok for #".$i.($mail->error?' - '.$mail->error:''), LOG_DEBUG);
-
- $sql="UPDATE ".MAIN_DB_PREFIX."mailing_cibles";
- $sql.=" SET statut=1, date_envoi=".$db->idate($now)." WHERE rowid=".$obj2->rowid;
- $resql2=$db->query($sql);
- if (! $resql2)
- {
- dol_print_error($db);
- }
- else
- {
- //if cheack read is use then update prospect contact status
- if (strpos($message, '__CHECK_READ__') !== false && ! empty($obj2->source_id))
- {
- //Update status communication of thirdparty prospect
- $sql = "UPDATE ".MAIN_DB_PREFIX."societe SET fk_stcomm=2 WHERE rowid IN (SELECT source_id FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE rowid=".$obj2->rowid.")";
- dol_syslog("fiche.php: set prospect thirdparty status sql=".$sql, LOG_DEBUG);
- $resql2=$db->query($sql);
- if (! $resql2)
- {
- dol_print_error($db);
- }
-
- //Update status communication of contact prospect
- $sql = "UPDATE ".MAIN_DB_PREFIX."societe SET fk_stcomm=2 WHERE rowid IN (SELECT sc.fk_soc FROM ".MAIN_DB_PREFIX."socpeople AS sc INNER JOIN ".MAIN_DB_PREFIX."mailing_cibles AS mc ON mc.rowid=".$obj2->rowid." AND mc.source_type = 'contact' AND mc.source_id = sc.rowid)";
- dol_syslog("fiche.php: set prospect contact status sql=".$sql, LOG_DEBUG);
-
- $resql2=$db->query($sql);
- if (! $resql2)
- {
- dol_print_error($db);
- }
- }
- }
- }
- else
- {
- // Mail failed
- $nbko++;
-
- dol_syslog("error for #".$i.($mail->error?' - '.$mail->error:''), LOG_DEBUG);
-
- $sql="UPDATE ".MAIN_DB_PREFIX."mailing_cibles";
- $sql.=" SET statut=-1, date_envoi=".$db->idate($now)." WHERE rowid=".$obj2->rowid;
- $resql2=$db->query($sql);
- if (! $resql2)
- {
- dol_print_error($db);
- }
- }
-
- $i++;
- }
- }
-
- // Loop finished, set global statut of mail
- $statut=2;
- if (! $nbko) $statut=3;
-
- $sql="UPDATE ".MAIN_DB_PREFIX."mailing SET statut=".$statut." WHERE rowid=".$id;
- dol_syslog("update global status sql=".$sql, LOG_DEBUG);
- $resql2=$db->query($sql);
- if (! $resql2)
- {
- dol_print_error($db);
- }
- }
- else
- {
- dol_print_error($db);
+ $nbok=0; $nbko=0;
+
+ // On choisit les mails non deja envoyes pour ce mailing (statut=0)
+ // ou envoyes en erreur (statut=-1)
+ $sql = "SELECT mc.rowid, mc.nom as lastname, mc.prenom as firstname, mc.email, mc.other, mc.source_url, mc.source_id, mc.source_type, mc.tag";
+ $sql .= " FROM ".MAIN_DB_PREFIX."mailing_cibles as mc";
+ $sql .= " WHERE mc.statut < 1 AND mc.fk_mailing = ".$id;
+
+ $resql=$db->query($sql);
+ if ($resql)
+ {
+ $num = $db->num_rows($resql);
+
+ if ($num)
+ {
+ dol_syslog("nb of targets = ".$num, LOG_DEBUG);
+
+ $now=dol_now();
+
+ // Positionne date debut envoi
+ $sql="UPDATE ".MAIN_DB_PREFIX."mailing SET date_envoi='".$db->idate($now)."' WHERE rowid=".$id;
+
+ $resql2=$db->query($sql);
+ if (! $resql2)
+ {
+ dol_print_error($db);
+ }
+
+ // Look on each email and sent message
+ $i = 0;
+ while ($i < $num)
+ {
+ $res=1;
+ $now=dol_now();
+
+ $obj2 = $db->fetch_object($resql);
+
+ // sendto en RFC2822
+ $sendto = str_replace(',',' ',$obj2->firstname." ".$obj2->lastname) ." <".$obj2->email.">";
+
+ // Make subtsitutions on topic and body
+ $other=explode(';',$obj2->other);
+ $other1=$other[0];
+ $other2=$other[1];
+ $other3=$other[2];
+ $other4=$other[3];
+ $other5=$other[4];
+ $substitutionarray=array(
+ '__ID__' => $obj2->source_id,
+ '__EMAIL__' => $obj2->email,
+ '__CHECK_READ__' => ''.$langs->trans("MailUnsubcribe").' ',
+ '__MAILTOEMAIL__' => ''.$obj2->email.' ',
+ '__LASTNAME__' => $obj2->lastname,
+ '__FIRSTNAME__' => $obj2->firstname,
+ '__OTHER1__' => $other1,
+ '__OTHER2__' => $other2,
+ '__OTHER3__' => $other3,
+ '__OTHER4__' => $other4,
+ '__OTHER5__' => $other5
+ );
+
+ complete_substitutions_array($substitutionarray,$langs);
+ $newsubject=make_substitutions($subject,$substitutionarray);
+ $newmessage=make_substitutions($message,$substitutionarray);
+
+ $substitutionisok=true;
+
+ // Fabrication du mail
+ $mail = new CMailFile(
+ $newsubject,
+ $sendto,
+ $from,
+ $newmessage,
+ array(),
+ array(),
+ array(),
+ '',
+ '',
+ 0,
+ $msgishtml,
+ $errorsto
+ );
+
+ if ($mail->error)
+ {
+ $res=0;
+ }
+ if (! $substitutionisok)
+ {
+ $mail->error='Some substitution failed';
+ $res=0;
+ }
+
+ // Send Email
+ if ($res)
+ {
+ $res=$mail->sendfile();
+ }
+
+ if ($res)
+ {
+ // Mail successful
+ $nbok++;
+
+ dol_syslog("ok for #".$i.($mail->error?' - '.$mail->error:''), LOG_DEBUG);
+
+ $sql="UPDATE ".MAIN_DB_PREFIX."mailing_cibles";
+ $sql.=" SET statut=1, date_envoi=".$db->idate($now)." WHERE rowid=".$obj2->rowid;
+ $resql2=$db->query($sql);
+ if (! $resql2)
+ {
+ dol_print_error($db);
+ }
+ else
+ {
+ //if cheack read is use then update prospect contact status
+ if (strpos($message, '__CHECK_READ__') !== false && ! empty($obj2->source_id))
+ {
+ //Update status communication of thirdparty prospect
+ $sql = "UPDATE ".MAIN_DB_PREFIX."societe SET fk_stcomm=2 WHERE rowid IN (SELECT source_id FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE rowid=".$obj2->rowid.")";
+ dol_syslog("fiche.php: set prospect thirdparty status sql=".$sql, LOG_DEBUG);
+ $resql2=$db->query($sql);
+ if (! $resql2)
+ {
+ dol_print_error($db);
+ }
+
+ //Update status communication of contact prospect
+ $sql = "UPDATE ".MAIN_DB_PREFIX."societe SET fk_stcomm=2 WHERE rowid IN (SELECT sc.fk_soc FROM ".MAIN_DB_PREFIX."socpeople AS sc INNER JOIN ".MAIN_DB_PREFIX."mailing_cibles AS mc ON mc.rowid=".$obj2->rowid." AND mc.source_type = 'contact' AND mc.source_id = sc.rowid)";
+ dol_syslog("fiche.php: set prospect contact status sql=".$sql, LOG_DEBUG);
+
+ $resql2=$db->query($sql);
+ if (! $resql2)
+ {
+ dol_print_error($db);
+ }
+ }
+ }
+ }
+ else
+ {
+ // Mail failed
+ $nbko++;
+
+ dol_syslog("error for #".$i.($mail->error?' - '.$mail->error:''), LOG_DEBUG);
+
+ $sql="UPDATE ".MAIN_DB_PREFIX."mailing_cibles";
+ $sql.=" SET statut=-1, date_envoi=".$db->idate($now)." WHERE rowid=".$obj2->rowid;
+ $resql2=$db->query($sql);
+ if (! $resql2)
+ {
+ dol_print_error($db);
+ }
+ }
+
+ $i++;
+ }
+ }
+
+ // Loop finished, set global statut of mail
+ $statut=2;
+ if (! $nbko) $statut=3;
+
+ $sql="UPDATE ".MAIN_DB_PREFIX."mailing SET statut=".$statut." WHERE rowid=".$id;
+ dol_syslog("update global status sql=".$sql, LOG_DEBUG);
+ $resql2=$db->query($sql);
+ if (! $resql2)
+ {
+ dol_print_error($db);
+ }
+ }
+ else
+ {
+ dol_print_error($db);
}
}
}
diff --git a/test/phpunit/AllTests.php b/test/phpunit/AllTests.php
index 99d54901b41..dd22a14913c 100644
--- a/test/phpunit/AllTests.php
+++ b/test/phpunit/AllTests.php
@@ -125,7 +125,7 @@ class AllTests
$suite->addTestSuite('UserTest');
require_once dirname(__FILE__).'/UserGroupTest.php';
$suite->addTestSuite('UserGroupTest');
- require_once dirname(__FILE__).'/BankAccountTest.php';
+ require_once dirname(__FILE__).'/BankAccountTest.php';
$suite->addTestSuite('BankAccountTest');
require_once dirname(__FILE__).'/CompanyBankAccountTest.php';
$suite->addTestSuite('CompanyBankAccountTest');
diff --git a/test/phpunit/CategorieTest.php b/test/phpunit/CategorieTest.php
index caa02a30538..54dba76bd34 100755
--- a/test/phpunit/CategorieTest.php
+++ b/test/phpunit/CategorieTest.php
@@ -140,7 +140,7 @@ class CategorieTest extends PHPUnit_Framework_TestCase
$localobject2->initAsSpecimen();
$resultCheck=$localobject2->already_exists();
- print __METHOD__." resultCheck=".$resultCheck."\n";
+ print __METHOD__." resultCheck=".$resultCheck."\n";
$this->assertGreaterThan(0, $resultCheck);
$resultSecondCreate=$localobject2->create($user);
diff --git a/test/phpunit/FunctionsTest.php b/test/phpunit/FunctionsTest.php
index 76ce0888f25..4797301b575 100755
--- a/test/phpunit/FunctionsTest.php
+++ b/test/phpunit/FunctionsTest.php
@@ -152,37 +152,37 @@ class FunctionsTest extends PHPUnit_Framework_TestCase
}
- /**
- * testDolTextIsHtml
- *
- * @return void
- */
- public function testDolTextIsHtml()
- {
- // True
- $input='xxx';
- $after=dol_textishtml($input);
- $this->assertTrue($after);
- $input='xxx';
- $after=dol_textishtml($input);
- $this->assertTrue($after);
- $input='xxx yyy zzz';
- $after=dol_textishtml($input);
- $this->assertTrue($after);
- $input='xxxsome div
';
- $after=dol_textishtml($input);
- $this->assertTrue($after);
- $input='text with HTML entities';
- $after=dol_textishtml($input);
- $this->assertTrue($after);
-
- // False
- $input='xxx < br>';
- $after=dol_textishtml($input);
- $this->assertFalse($after);
+ /**
+ * testDolTextIsHtml
+ *
+ * @return void
+ */
+ public function testDolTextIsHtml()
+ {
+ // True
+ $input='xxx';
+ $after=dol_textishtml($input);
+ $this->assertTrue($after);
+ $input='xxx';
+ $after=dol_textishtml($input);
+ $this->assertTrue($after);
+ $input='xxx yyy zzz';
+ $after=dol_textishtml($input);
+ $this->assertTrue($after);
+ $input='xxxsome div
';
+ $after=dol_textishtml($input);
+ $this->assertTrue($after);
+ $input='text with HTML entities';
+ $after=dol_textishtml($input);
+ $this->assertTrue($after);
+
+ // False
+ $input='xxx < br>';
+ $after=dol_textishtml($input);
+ $this->assertFalse($after);
}
@@ -236,17 +236,17 @@ class FunctionsTest extends PHPUnit_Framework_TestCase
}
- /**
- * testDolNbOfLinesBis
- *
- * @return boolean
- */
- public function testDolNbOfLinesBis()
- {
+ /**
+ * testDolNbOfLinesBis
+ *
+ * @return boolean
+ */
+ public function testDolNbOfLinesBis()
+ {
// This is not a html string so nb of lines depends on \n
- $input="A string\nwith a é, &, < and > and bold tag.\nThird line";
- $after=dol_nboflines_bis($input,0);
- $this->assertEquals($after,3);
+ $input="A string\nwith a é, &, < and > and bold tag.\nThird line";
+ $after=dol_nboflines_bis($input,0);
+ $this->assertEquals($after,3);
// This is a html string so nb of lines depends on bold tag.\nThird line";
@@ -254,11 +254,11 @@ class FunctionsTest extends PHPUnit_Framework_TestCase
$this->assertEquals($after,1);
// This is a html string so nb of lines depends on bold tag.bold tag.