diff --git a/htdocs/adherents/class/subscription.class.php b/htdocs/adherents/class/subscription.class.php
index 236a118ab4b..71660c0cd8c 100644
--- a/htdocs/adherents/class/subscription.class.php
+++ b/htdocs/adherents/class/subscription.class.php
@@ -52,14 +52,14 @@ class Subscription extends CommonObject
*
* @var integer
*/
- public $datec;
+ public $datec;
/**
* Date modification record (tms)
*
* @var integer
*/
- public $datem;
+ public $datem;
/**
* Subscription start date (date subscription)
diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index 9917736bdc8..96aaa17fdd2 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -93,14 +93,14 @@ class ActionComm extends CommonObject
*
* @var integer
*/
- public $datec;
+ public $datec;
/**
* Date modification record (tms)
*
* @var integer
*/
- public $datem;
+ public $datem;
/**
* Object user that create action
@@ -142,7 +142,7 @@ class ActionComm extends CommonObject
*
* @var integer
*/
- public $datep2;
+ public $datep2;
/**
* @var int -1=Unkown duration
diff --git a/htdocs/don/list.php b/htdocs/don/list.php
index 52525009516..15648375677 100644
--- a/htdocs/don/list.php
+++ b/htdocs/don/list.php
@@ -86,7 +86,7 @@ llxHeader('', $langs->trans("Donations"), 'EN:Module_Donations|FR:Module_Dons|ES
$donationstatic=new Don($db);
// Genere requete de liste des dons
-$sql = "SELECT d.rowid, d.datedon, d.fk_soc, d.firstname, d.lastname, d.societe,";
+$sql = "SELECT d.rowid, d.datedon, d.fk_soc as socid, d.firstname, d.lastname, d.societe,";
$sql.= " d.amount, d.fk_statut as statut, ";
$sql.= " p.rowid as pid, p.ref, p.title, p.public";
$sql.= " FROM ".MAIN_DB_PREFIX."don as d LEFT JOIN ".MAIN_DB_PREFIX."projet AS p";
@@ -154,7 +154,7 @@ if ($resql)
print ' ';
print ' ';
print ' ';
- print ' ';
+ print ' ';
print_barre_liste($langs->trans("Donations"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_generic.png', 0, $newcardbutton);
@@ -172,9 +172,15 @@ if ($resql)
print '
';
print ' ';
print ' ';
+ if (! empty($conf->global->DONATION_USE_THIRDPARTIES)) {
+ print '';
+ print ' ';
+ print ' ';
+ } else {
print '';
print ' ';
print ' ';
+ }
print '';
print ' ';
print ' ';
@@ -193,11 +199,15 @@ if ($resql)
$searchpicto=$form->showFilterAndCheckAddButtons(0);
print $searchpicto;
print '';
- print "\n";
-
- print '';
+ print " \n";
+
+ print '';
print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "d.rowid", "", $param, "", $sortfield, $sortorder);
+ if (! empty($conf->global->DONATION_USE_THIRDPARTIES)) {
+ print_liste_field_titre("ThirdParty", $_SERVER["PHP_SELF"], "d.fk_soc", "", $param, "", $sortfield, $sortorder);
+ } else {
print_liste_field_titre("Company", $_SERVER["PHP_SELF"], "d.societe", "", $param, "", $sortfield, $sortorder);
+ }
print_liste_field_titre("Name", $_SERVER["PHP_SELF"], "d.lastname", "", $param, "", $sortfield, $sortorder);
print_liste_field_titre("Date", $_SERVER["PHP_SELF"], "d.datedon", "", $param, '', $sortfield, $sortorder, 'center ');
if (! empty($conf->projet->enabled))
@@ -219,9 +229,20 @@ if ($resql)
$donationstatic->ref=$objp->rowid;
$donationstatic->lastname=$objp->lastname;
$donationstatic->firstname=$objp->firstname;
- print "".$donationstatic->getNomUrl(1)." \n";
- print "".$objp->societe." \n";
- print "".$donationstatic->getFullName($langs)." \n";
+ print "".$donationstatic->getNomUrl(1)." ";
+ if (! empty($conf->global->DONATION_USE_THIRDPARTIES)) {
+
+ $company=new Societe($db);
+ $result=$company->fetch($objp->socid);
+ if (!empty($objp->socid) && $company->id > 0) {
+ print "".$company->getNomUrl(1)." ";
+ } else {
+ print "".$objp->societe." ";
+ }
+ } else {
+ print "".$objp->societe." ";
+ }
+ print "".$donationstatic->getFullName($langs)." ";
print ''.dol_print_date($db->jdate($objp->datedon), 'day').' ';
if (! empty($conf->projet->enabled))
{
diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php
index 6de51fdc359..caad933dd1e 100644
--- a/htdocs/fourn/class/fournisseur.product.class.php
+++ b/htdocs/fourn/class/fournisseur.product.class.php
@@ -6,6 +6,7 @@
* Copyright (C) 2012 Christophe Battarel
* Copyright (C) 2015 Marcos García
* Copyright (C) 2016 Charlie Benke
+ * Copyright (C) 2019 Frédéric France
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -996,9 +997,9 @@ class ProductFournisseur extends Product
//$out .= ''.$langs->trans("QtyMin").' ';
$out .= ''.$langs->trans("User").' ';
foreach ($productFournLogList as $productFournLog) {
- $out.= ''.dol_print_date($productFournLog['datec'], 'dayhour', 'tzuser').' ';
- $out.= ''.price($productFournLog['price']).' ';
- //$out.= ''.$productFournLog['quantity'].' ';
+ $out.= ''.dol_print_date($productFournLog['datec'], 'dayhour', 'tzuser').' ';
+ $out.= ''.price($productFournLog['price']).' ';
+ //$out.= ''.$productFournLog['quantity'].' ';
$out.= ''.$productFournLog['lastname'].' ';
}
$out .= '';