';
if (! empty($arrayfields['f.facnumber']['checked']))
{
print '';
-
- $paiement = $facturestatic->getSommePaiement();
- $remaintopay = $obj->total_ttc - $paiement;
-
+
print '';
print '| ';
@@ -1028,10 +1030,10 @@ if ($resql)
if (! empty($arrayfields['dynamount_payed']['checked']))
{
- print ' | '.(! empty($paiement)?price($paiement,0,$langs):' ').' | '; // TODO Use a denormalized field
+ print ''.(! empty($totalpay)?price($totalpay,0,$langs):' ').' | '; // TODO Use a denormalized field
if (! $i) $totalarray['nbfield']++;
if (! $i) $totalarray['totalamfield']=$totalarray['nbfield'];
- $totalarray['totalam'] += $paiement;
+ $totalarray['totalam'] += $totalpay;
}
if (! empty($arrayfields['rtp']['checked']))
diff --git a/htdocs/compta/sociales/card.php b/htdocs/compta/sociales/card.php
index e917e1e1c71..77393b78f4e 100644
--- a/htdocs/compta/sociales/card.php
+++ b/htdocs/compta/sociales/card.php
@@ -556,34 +556,42 @@ if ($id > 0)
print ''.$langs->trans("Date").' | ';
print ''.$langs->trans("Type").' | ';
print ''.$langs->trans("Amount").' | ';
- print ' | ';
print ' ';
- $var=True;
- while ($i < $num)
+ $var=true;
+ if ($num > 0)
+ {
+ while ($i < $num)
+ {
+ $objp = $db->fetch_object($resql);
+ $var=!$var;
+ print "| ";
+ print ''.img_object($langs->trans("Payment"),"payment").' '.$objp->rowid.' | ';
+ print ''.dol_print_date($db->jdate($objp->dp),'day')." | \n";
+ $labeltype=$langs->trans("PaymentType".$objp->type_code)!=("PaymentType".$objp->type_code)?$langs->trans("PaymentType".$objp->type_code):$objp->paiement_type;
+ print "".$labeltype.' '.$objp->num_paiement." | \n";
+ print ''.price($objp->amount)." | \n";
+ print " ";
+ $totalpaye += $objp->amount;
+ $i++;
+ }
+ }
+ else
{
- $objp = $db->fetch_object($resql);
$var=!$var;
- print "| ";
- print ''.img_object($langs->trans("Payment"),"payment").' '.$objp->rowid.' | ';
- print ''.dol_print_date($db->jdate($objp->dp),'day')." | \n";
- $labeltype=$langs->trans("PaymentType".$objp->type_code)!=("PaymentType".$objp->type_code)?$langs->trans("PaymentType".$objp->type_code):$objp->paiement_type;
- print "".$labeltype.' '.$objp->num_paiement." | \n";
- print ''.price($objp->amount)." | ".$langs->trans("Currency".$conf->currency)." | \n";
- print " ";
- $totalpaye += $objp->amount;
- $i++;
+ print '| '.$langs->trans("None").' | | | | ';
}
-
+
if ($object->paye == 0)
{
- print "| ".$langs->trans("AlreadyPaid")." : | ".price($totalpaye)." | ".$langs->trans("Currency".$conf->currency)." | \n";
- print "| ".$langs->trans("AmountExpected")." : | ".price($object->amount)." | ".$langs->trans("Currency".$conf->currency)." | \n";
+ print "| ".$langs->trans("AlreadyPaid")." : | ".price($totalpaye)." | \n";
+ print "| ".$langs->trans("AmountExpected")." : | ".price($object->amount)." | \n";
$resteapayer = $object->amount - $totalpaye;
-
+ $cssforamountpaymentcomplete = 'amountpaymentcomplete';
+
print "| ".$langs->trans("RemainderToPay")." : | ";
- print "".price($resteapayer)." | ".$langs->trans("Currency".$conf->currency)." | \n";
+ print ''.price($resteapayer)." | \n";
}
print "
";
$db->free($resql);
diff --git a/htdocs/compta/sociales/class/chargesociales.class.php b/htdocs/compta/sociales/class/chargesociales.class.php
index 1fdd567745f..61546b39061 100644
--- a/htdocs/compta/sociales/class/chargesociales.class.php
+++ b/htdocs/compta/sociales/class/chargesociales.class.php
@@ -510,7 +510,7 @@ class ChargeSociales extends CommonObject
function info($id)
{
$sql = "SELECT e.rowid, e.tms as datem, e.date_creation as datec, e.date_valid as datev, e.import_key,";
- $sql.= " fk_user_author, fk_user_modif, fk_user_valid";
+ $sql.= " e.fk_user_author, e.fk_user_modif, e.fk_user_valid";
$sql.= " FROM ".MAIN_DB_PREFIX."chargesociales as e";
$sql.= " WHERE e.rowid = ".$id;
@@ -543,7 +543,7 @@ class ChargeSociales extends CommonObject
}
$this->date_creation = $this->db->jdate($obj->datec);
- if (! empty($obj->fk_user_modif)) $this->date_modification = $this->db->jdate($obj->datem);
+ $this->date_modification = $this->db->jdate($obj->datem);
$this->date_validation = $this->db->jdate($obj->datev);
$this->import_key = $obj->import_key;
}
diff --git a/htdocs/conf/conf.php.example b/htdocs/conf/conf.php.example
index c03e41b386c..89e1458d4fd 100644
--- a/htdocs/conf/conf.php.example
+++ b/htdocs/conf/conf.php.example
@@ -250,11 +250,16 @@ $dolibarr_main_restrict_os_commands='mysqldump, mysql, pg_dump, pgrestore';
$dolibarr_nocsrfcheck='0';
// dolibarr_mailing_limit_sendbyweb
-// Can set a limit for mailing send by web. Can be used for a restricted mode.
-// Default value: 0 (use database value if exist)
-// Examples:
-// $dolibarr_mailing_limit_sendbyweb='0';
+// Can set a limit for mailing send by web. This overwrite database value. Can be used to restrict on OS level.
+// Default value: '25'
+// Examples: '-1' (sending by web is forbidden)
+// $dolibarr_mailing_limit_sendbyweb='25';
+// dolibarr_mailing_limit_sendbycli
+// Can set a limit for mailing send by cli. This overwrite database value. Can be used to restrict on OS level.
+// Default value: '0' (no hard limit, use soft database value if exists)
+// Examples: '-1' (sending by cli is forbidden)
+// $dolibarr_mailing_limit_sendbycli='0';
//##################
@@ -273,18 +278,6 @@ $dolibarr_nocsrfcheck='0';
// Examples:
// $dolibarr_main_limit_users='0';
-// dolibarr_mailing_limit_sendbyweb
-// Can set a limit for mailing send by web. This overwrite database value. Can be used to restrict on OS level.
-// Default value: '0' (no overwrite, use database value if exists)
-// Examples: '-1' (sending by web is forbidden)
-// $dolibarr_mailing_limit_sendbyweb='0';
-
-// dolibarr_mailing_limit_sendbycli
-// Can set a limit for mailing send by cli. This overwrite database value. Can be used to restrict on OS level.
-// Default value: '0' (no overwrite, use database value if exists)
-// Examples: '-1' (sending by cli is forbidden)
-// $dolibarr_mailing_limit_sendbycli='0';
-
// dolibarr_strict_mode
// Set this to 1 to enable the PHP strict mode. For dev environment only.
// Default value: 0 (use database value if exist)
diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php
index 027bedebb6e..9e11001745c 100644
--- a/htdocs/core/class/CMailFile.class.php
+++ b/htdocs/core/class/CMailFile.class.php
@@ -488,28 +488,35 @@ class CMailFile
// Check number of recipient is lower or equal than MAIL_MAX_NB_OF_RECIPIENTS_IN_SAME_EMAIL
if (empty($conf->global->MAIL_MAX_NB_OF_RECIPIENTS_IN_SAME_EMAIL)) $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_IN_SAME_EMAIL=10;
- $tmparray = explode(',', $this->addr_to);
- if (count($tmparray) > $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_IN_SAME_EMAIL)
+ $tmparray1 = explode(',', $this->addr_to);
+ if (count($tmparray1) > $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_TO_IN_SAME_EMAIL)
{
$this->error = 'Too much recipients in to:';
dol_syslog("CMailFile::sendfile: mail end error=" . $this->error, LOG_WARNING);
return false;
}
- $tmparray = explode(',', $this->addr_cc);
- if (count($tmparray) > $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_IN_SAME_EMAIL)
+ $tmparray2 = explode(',', $this->addr_cc);
+ if (count($tmparray2) > $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_CC_IN_SAME_EMAIL)
{
$this->error = 'Too much recipients in cc:';
dol_syslog("CMailFile::sendfile: mail end error=" . $this->error, LOG_WARNING);
return false;
}
- $tmparray = explode(',', $this->addr_bcc);
- if (count($tmparray) > $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_IN_SAME_EMAIL)
+ $tmparray3 = explode(',', $this->addr_bcc);
+ if (count($tmparray3) > $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_BCC_IN_SAME_EMAIL)
{
$this->error = 'Too much recipients in bcc:';
dol_syslog("CMailFile::sendfile: mail end error=" . $this->error, LOG_WARNING);
return false;
}
-
+ if ((count($tmparray1)+count($tmparray2)+count($tmparray3)) > $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_IN_SAME_EMAIL)
+ {
+ $this->error = 'Too much recipients in to:, cc:, bcc:';
+ dol_syslog("CMailFile::sendfile: mail end error=" . $this->error, LOG_WARNING);
+ return false;
+ }
+
+
// Action according to choosed sending method
if ($conf->global->MAIN_MAIL_SENDMODE == 'mail')
{
@@ -538,25 +545,28 @@ class CMailFile
}
else
{
- $bounce = ''; // By default
+ $additionnalparam = ''; // By default
if (! empty($conf->global->MAIN_MAIL_ALLOW_SENDMAIL_F))
{
// le "Return-Path" (retour des messages bounced) dans les header ne fonctionne pas avec tous les MTA
// Le forcage de la valeur grace à l'option -f de sendmail est donc possible si la constante MAIN_MAIL_ALLOW_SENDMAIL_F est definie.
- // La variable definie pose des pb avec certains sendmail securisee (option -f refusee car dangereuse)
- $bounce .= ($bounce?' ':'').(! empty($conf->global->MAIN_MAIL_ERRORS_TO) ? '-f' . $this->getValidAddress($conf->global->MAIN_MAIL_ERRORS_TO,2) : ($this->addr_from != '' ? '-f' . $this->getValidAddress($this->addr_from,2) : '') );
+ // Having this variable defined may create problems with some sendmail (option -f refused)
+ // Having this variable not defined may create problems with some other sendmail (option -f required)
+ $additionnalparam .= ($additionnalparam?' ':'').(! empty($conf->global->MAIN_MAIL_ERRORS_TO) ? '-f' . $this->getValidAddress($conf->global->MAIN_MAIL_ERRORS_TO,2) : ($this->addr_from != '' ? '-f' . $this->getValidAddress($this->addr_from,2) : '') );
}
if (! empty($conf->global->MAIN_MAIL_SENDMAIL_FORCE_BA)) // To force usage of -ba option. This option tells sendmail to read From: or Sender: to setup sender
{
- $bounce .= ($bounce?' ':'').'-ba';
+ $additionnalparam .= ($additionnalparam?' ':'').'-ba';
}
- dol_syslog("CMailFile::sendfile: mail start HOST=".ini_get('SMTP').", PORT=".ini_get('smtp_port').", additionnal_parameters=".$bounce, LOG_DEBUG);
+ if (! empty($conf->global->MAIN_MAIL_SENDMAIL_FORCE_ADDPARAM)) $additionnalparam .= ($additionnalparam?' ':'').'-U '.$additionnalparam; // Use -U to add additionnal params
+
+ dol_syslog("CMailFile::sendfile: mail start HOST=".ini_get('SMTP').", PORT=".ini_get('smtp_port').", additionnal_parameters=".$additionnalparam, LOG_DEBUG);
$this->message=stripslashes($this->message);
if (! empty($conf->global->MAIN_MAIL_DEBUG)) $this->dump_mail();
- if (! empty($bounce)) $res = mail($dest,$this->encodetorfc2822($this->subject),$this->message,$this->headers, $bounce);
+ if (! empty($additionnalparam)) $res = mail($dest, $this->encodetorfc2822($this->subject), $this->message, $this->headers, $additionnalparam);
else $res = mail($dest, $this->encodetorfc2822($this->subject), $this->message, $this->headers);
if (! $res)
diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index c451b2e32fd..81de34e012f 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -282,6 +282,7 @@ class Conf
// Define default dir_output and dir_temp for directories of modules
foreach($this->modules as $module)
{
+ //var_dump($module);
// For multicompany sharings
$this->$module->multidir_output = array($this->entity => $rootfordata."/".$module);
$this->$module->multidir_temp = array($this->entity => $rootfordata."/".$module."/temp");
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 8abe3f271f7..ad968de506a 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -5633,18 +5633,18 @@ class Form
* Return a HTML area with the reference of object and a navigation bar for a business object
* To add a particular filter on select, you must set $object->next_prev_filter to SQL criteria.
*
- * @param object $object Object to show
- * @param string $paramid Name of parameter to use to name the id into the URL next/previous link
- * @param string $morehtml More html content to output just before the nav bar
- * @param int $shownav Show Condition (navigation is shown if value is 1)
- * @param string $fieldid Name of field id into database to use for select next and previous (we make the select max and min on this field)
+ * @param object $object Object to show.
+ * @param string $paramid Name of parameter to use to name the id into the URL next/previous link.
+ * @param string $morehtml More html content to output just before the nav bar.
+ * @param int $shownav Show Condition (navigation is shown if value is 1).
+ * @param string $fieldid Name of field id into database to use for select next and previous (we make the select max and min on this field).
* @param string $fieldref Name of field ref of object (object->ref) to show or 'none' to not show ref.
- * @param string $morehtmlref More html to show after ref
- * @param string $moreparam More param to add in nav link url.
- * @param int $nodbprefix Do not include DB prefix to forge table name
- * @param string $morehtmlleft More html code to show before ref
- * @param string $morehtmlstatus More html code to show under navigation arrows (status place)
- * @param string $morehtmlright More html code to show after ref
+ * @param string $morehtmlref More html to show after ref.
+ * @param string $moreparam More param to add in nav link url. Must start with '&...'.
+ * @param int $nodbprefix Do not include DB prefix to forge table name.
+ * @param string $morehtmlleft More html code to show before ref.
+ * @param string $morehtmlstatus More html code to show under navigation arrows (status place).
+ * @param string $morehtmlright More html code to show after ref.
* @return string Portion HTML with ref + navigation buttons
*/
function showrefnav($object,$paramid,$morehtml='',$shownav=1,$fieldid='rowid',$fieldref='ref',$morehtmlref='',$moreparam='',$nodbprefix=0,$morehtmlleft='',$morehtmlstatus='',$morehtmlright='')
@@ -5657,7 +5657,7 @@ class Form
//print "paramid=$paramid,morehtml=$morehtml,shownav=$shownav,$fieldid,$fieldref,$morehtmlref,$moreparam";
$object->load_previous_next_ref((isset($object->next_prev_filter)?$object->next_prev_filter:''),$fieldid,$nodbprefix);
-
+
//$previous_ref = $object->ref_previous?''.(empty($conf->dol_use_jmobile)?img_picto($langs->trans("Previous"),'previous.png'):' ').'':'';
//$next_ref = $object->ref_next?''.(empty($conf->dol_use_jmobile)?img_picto($langs->trans("Next"),'next.png'):' ').'':'';
$previous_ref = $object->ref_previous?''.(($conf->dol_use_jmobile != 4)?'<':' ').'':''.(($conf->dol_use_jmobile != 4)?'<':' ').'';
diff --git a/htdocs/core/lib/agenda.lib.php b/htdocs/core/lib/agenda.lib.php
index ad592359936..09f89ba0c3f 100644
--- a/htdocs/core/lib/agenda.lib.php
+++ b/htdocs/core/lib/agenda.lib.php
@@ -239,7 +239,7 @@ function show_array_actions_to_do($max=5)
print '';
print '| '.$langs->trans("LastActionsToDo",$max).' | ';
- print ''.$langs->trans("FullList").'';
+ print ' | '.$langs->trans("FullList").'';
print ' | ';
$var = true;
@@ -336,7 +336,7 @@ function show_array_last_actions_done($max=5)
print '';
print '| '.$langs->trans("LastDoneTasks",$max).' | ';
- print ''.$langs->trans("FullList").'';
+ print ' | '.$langs->trans("FullList").'';
print ' | ';
$var = true;
$i = 0;
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index ff6459413a4..ccec6af47d0 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -993,16 +993,26 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon='', $noprint=
$sql.= " u.login, u.rowid as user_id";
if (get_class($filterobj) == 'Societe') $sql.= ", sp.lastname, sp.firstname";
if (get_class($filterobj) == 'Adherent') $sql.= ", m.lastname, m.firstname";
+ if (get_class($filterobj) == 'CommandeFournisseur') $sql.= ", o.ref";
$sql.= " FROM ".MAIN_DB_PREFIX."user as u, ".MAIN_DB_PREFIX."actioncomm as a";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_actioncomm as c ON a.fk_action = c.id";
if (get_class($filterobj) == 'Societe') $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople as sp ON a.fk_contact = sp.rowid";
if (get_class($filterobj) == 'Adherent') $sql.= ", ".MAIN_DB_PREFIX."adherent as m";
+ if (get_class($filterobj) == 'CommandeFournisseur') $sql.= ", ".MAIN_DB_PREFIX."commande_fournisseur as o";
$sql.= " WHERE u.rowid = a.fk_user_author";
$sql.= " AND a.entity IN (".getEntity('agenda', 1).")";
if (get_class($filterobj) == 'Societe' && $filterobj->id) $sql.= " AND a.fk_soc = ".$filterobj->id;
if (get_class($filterobj) == 'Project' && $filterobj->id) $sql.= " AND a.fk_project = ".$filterobj->id;
- if (get_class($filterobj) == 'Adherent') $sql.= " AND a.fk_element = m.rowid AND a.elementtype = 'member'";
- if (get_class($filterobj) == 'Adherent' && $filterobj->id) $sql.= " AND a.fk_element = ".$filterobj->id;
+ if (get_class($filterobj) == 'Adherent')
+ {
+ $sql.= " AND a.fk_element = m.rowid AND a.elementtype = 'member'";
+ if ($filterobj->id) $sql.= " AND a.fk_element = ".$filterobj->id;
+ }
+ if (get_class($filterobj) == 'CommandeFournisseur')
+ {
+ $sql.= " AND a.fk_element = o.rowid AND a.elementtype = 'order_supplier'";
+ if ($filterobj->id) $sql.= " AND a.fk_element = ".$filterobj->id;
+ }
if (is_object($objcon) && $objcon->id) $sql.= " AND a.fk_contact = ".$objcon->id;
// Condition on actioncode
if (! empty($actioncode))
@@ -1133,6 +1143,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon='', $noprint=
require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
+ require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
@@ -1142,9 +1153,10 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon='', $noprint=
$userstatic=new User($db);
$contactstatic = new Contact($db);
- // TODO uniformize
+ // TODO mutualize/uniformize
$propalstatic=new Propal($db);
$orderstatic=new Commande($db);
+ $supplierorderstatic=new CommandeFournisseur($db);
$facturestatic=new Facture($db);
$out.=' |