';
- print ''; // ancre
+
+ if ($action == 'presend')
+ {
+ /*
+ * Affiche formulaire mail
+ */
- /*
- * Documents generes
- */
- $filedir=$conf->societe->multidir_output[$object->entity].'/'.$object->id;
- $urlsource=$_SERVER["PHP_SELF"]."?socid=".$object->id;
- $genallowed=$user->rights->societe->creer;
- $delallowed=$user->rights->societe->supprimer;
+ // By default if $action=='presend'
+ $titreform='SendMail';
+ $topicmail='';
+ $action='send';
+ $modelmail='thirdparty';
- $var=true;
+ print '
';
+ print_titre($langs->trans($titreform));
- $somethingshown=$formfile->show_documents('company',$object->id,$filedir,$urlsource,$genallowed,$delallowed,'',0,0,0,28,0,'',0,'',$object->default_lang);
+ // Cree l'objet formulaire mail
+ include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
+ $formmail = new FormMail($db);
+ $formmail->fromtype = 'user';
+ $formmail->fromid = $user->id;
+ $formmail->fromname = $user->getFullName($langs);
+ $formmail->frommail = $user->email;
+ $formmail->withfrom=1;
+ $formmail->withtopic=1;
+ $liste=array();
+ foreach ($object->thirdparty_and_contact_email_array(1) as $key=>$value) $liste[$key]=$value;
+ $formmail->withto=GETPOST('sendto')?GETPOST('sendto'):$liste;
+ $formmail->withtofree=0;
+ $formmail->withtocc=$liste;
+ $formmail->withtoccc=$conf->global->MAIN_EMAIL_USECCC;
+ $formmail->withfile=2;
+ $formmail->withbody=1;
+ $formmail->withdeliveryreceipt=1;
+ $formmail->withcancel=1;
+ // Tableau des substitutions
+ $formmail->substit['__SIGNATURE__']=$user->signature;
+ $formmail->substit['__PERSONALIZED__']='';
+ $formmail->substit['__CONTACTCIVNAME__']='';
- print '';
+ //Find the good contact adress
+ /*
+ $custcontact='';
+ $contactarr=array();
+ $contactarr=$object->liste_contact(-1,'external');
+
+ if (is_array($contactarr) && count($contactarr)>0)
+ {
+ foreach($contactarr as $contact)
+ {
+ if ($contact['libelle']==$langs->trans('TypeContact_facture_external_BILLING')) {
+
+ require_once DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php';
+
+ $contactstatic=new Contact($db);
+ $contactstatic->fetch($contact['id']);
+ $custcontact=$contactstatic->getFullName($langs,1);
+ }
+ }
+
+ if (!empty($custcontact)) {
+ $formmail->substit['__CONTACTCIVNAME__']=$custcontact;
+ }
+ }*/
- print '
';
- }
+ // Init list of files
+ if (GETPOST("mode")=='init')
+ {
+ $formmail->clear_attached_files();
+ $formmail->add_attached_files($file,basename($file),dol_mimetype($file));
+ }
- print '
';
+ $formmail->show_form();
- // Subsidiaries list
- $result=show_subsidiaries($conf,$langs,$db,$object);
-
- // Contacts list
- if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))
- {
- $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);
- }
-
- // Projects list
- $result=show_projects($conf,$langs,$db,$object,$_SERVER["PHP_SELF"].'?socid='.$object->id);
+ print '
';
+ }
+ else
+ {
+
+ if (empty($conf->global->SOCIETE_DISABLE_BUILDDOC))
+ {
+ print '';
+ //print ' ';
+ print ''; // ancre
+
+ /*
+ * Documents generes
+ */
+ $filedir=$conf->societe->multidir_output[$object->entity].'/'.$object->id;
+ $urlsource=$_SERVER["PHP_SELF"]."?socid=".$object->id;
+ $genallowed=$user->rights->societe->creer;
+ $delallowed=$user->rights->societe->supprimer;
+
+ $var=true;
+
+ $somethingshown=$formfile->show_documents('company',$object->id,$filedir,$urlsource,$genallowed,$delallowed,'',0,0,0,28,0,'',0,'',$object->default_lang);
+
+ print '';
+
+ print '
';
+ }
+
+ print '
';
+
+ // Subsidiaries list
+ $result=show_subsidiaries($conf,$langs,$db,$object);
+
+ // Contacts list
+ if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))
+ {
+ $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);
+ }
+
+ // Projects list
+ $result=show_projects($conf,$langs,$db,$object,$_SERVER["PHP_SELF"].'?socid='.$object->id);
+ }
}
}
diff --git a/htdocs/societe/societe.php b/htdocs/societe/societe.php
index 7840f5e7d9e..28a3c5c2885 100644
--- a/htdocs/societe/societe.php
+++ b/htdocs/societe/societe.php
@@ -1,6 +1,6 @@
- * Copyright (C) 2004-2011 Laurent Destailleur
+ * Copyright (C) 2004-2013 Laurent Destailleur
* Copyright (C) 2005-2012 Regis Houssin
* Copyright (C) 2012 Marcos García
* Copyright (C) 2013 Raphaël Doursenaud
@@ -22,7 +22,7 @@
/**
* \file htdocs/societe/societe.php
* \ingroup societe
- * \brief Page to show a third party
+ * \brief Page to show list of third parties
*/
require_once '../main.inc.php';
diff --git a/htdocs/user/admin/user_extrafields.php b/htdocs/user/admin/user_extrafields.php
index 83878126858..ce372d25d4b 100644
--- a/htdocs/user/admin/user_extrafields.php
+++ b/htdocs/user/admin/user_extrafields.php
@@ -50,7 +50,7 @@ if (!$user->admin) accessforbidden();
* Actions
*/
-require DOL_DOCUMENT_ROOT.'/core/admin_extrafields.inc.php';
+require DOL_DOCUMENT_ROOT.'/core/actions_extrafields.inc.php';
diff --git a/test/selenium/test_thirdparty.xml b/test/selenium/test_thirdparty.xml
index 704796cd4c2..47a9b8091a9 100644
--- a/test/selenium/test_thirdparty.xml
+++ b/test/selenium/test_thirdparty.xml
@@ -38,7 +38,7 @@
|
| select |
- departement_id |
+ state_id |
label=01 - Ain |
|