';
+
// Show object lines
if (! empty($object->lines))
$ret = $object->printObjectLines($action, $mysoc, $soc, $lineid, 1);
diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php
index 82d5fb04130..2eff05868d4 100644
--- a/htdocs/cron/list.php
+++ b/htdocs/cron/list.php
@@ -408,11 +408,11 @@ if ($num > 0)
print '';
print '| ';
- if(!empty($obj->datestart)) {print dol_print_date($obj->datestart,'dayhour');}
+ if(!empty($obj->datestart)) {print dol_print_date($db->jdate($obj->datestart),'dayhour');}
print ' | ';
print '';
- if(!empty($obj->dateend)) {print dol_print_date($obj->dateend,'dayhour');}
+ if(!empty($obj->dateend)) {print dol_print_date($db->jdate($obj->dateend),'dayhour');}
print ' | ';
print '';
@@ -424,11 +424,11 @@ if ($num > 0)
print ' | ';
print '';
- if(!empty($obj->datenextrun)) {print dol_print_date($obj->datenextrun,'dayhour');}
+ if(!empty($obj->datenextrun)) {print dol_print_date($db->jdate($obj->datenextrun),'dayhour');}
print ' | ';
print '';
- if(!empty($obj->datelastrun)) {print dol_print_date($obj->datelastrun,'dayhour');}
+ if(!empty($obj->datelastrun)) {print dol_print_date($db->jdate($obj->datelastrun),'dayhour');}
print ' | ';
print '';
diff --git a/htdocs/langs/en_US/suppliers.lang b/htdocs/langs/en_US/suppliers.lang
index b890919ace5..d84925d0676 100644
--- a/htdocs/langs/en_US/suppliers.lang
+++ b/htdocs/langs/en_US/suppliers.lang
@@ -14,6 +14,7 @@ TotalSellingPriceMinShort=Total of subproducts selling prices
SomeSubProductHaveNoPrices=Some sub-products have no price defined
AddSupplierPrice=Add buying price
ChangeSupplierPrice=Change buying price
+SupplierPrices=Supplier prices
ReferenceSupplierIsAlreadyAssociatedWithAProduct=This reference supplier is already associated with a reference: %s
NoRecordedSuppliers=No suppliers recorded
SupplierPayment=Supplier payment
diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index 2c0a5cd15d7..a12499e4eac 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -585,6 +585,11 @@ if ($id > 0 || $ref)
if ($user->rights->fournisseur->lire)
{
+ $product_fourn = new ProductFournisseur($db);
+ $product_fourn_list = $product_fourn->list_product_fournisseur_price($object->id, $sortfield, $sortorder);
+ $nbtotalofrecords = count($product_fourn_list);
+ print_barre_liste($langs->trans('SupplierPrices'), $page, $_SERVEUR ['PHP_SELF'], $option, $sortfield, $sortorder, '', count($product_fourn_list), $nbtotalofrecords, 'title_accountancy.png');
+
// Suppliers list title
print '';
print ' ';
@@ -612,9 +617,6 @@ if ($id > 0 || $ref)
print_liste_field_titre('');
print "\n";
- $product_fourn = new ProductFournisseur($db);
- $product_fourn_list = $product_fourn->list_product_fournisseur_price($object->id, $sortfield, $sortorder);
-
if (is_array($product_fourn_list))
{
$var=true;
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index d765411ed8c..cce87bfae5a 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -1756,7 +1756,8 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
else if ($action != 'showlog_default_price' && $action != 'edit_price')
{
// List of all prices by customers
-
+ print ''."\n";
+
// Count total nb of records
$nbtotalofrecords = '';
if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
@@ -1793,8 +1794,8 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
if (count($prodcustprice->lines) > 0 || $search_soc)
{
print '';
- print ' | ';
- print ' | ';
+ print ' | ';
+ print ' | ';
// Print the search button
print '';
$searchpitco=$form->showFilterAndCheckAddButtons(0);
diff --git a/scripts/cron/cron_run_jobs.php b/scripts/cron/cron_run_jobs.php
index 4360e74cae5..841e85e1443 100755
--- a/scripts/cron/cron_run_jobs.php
+++ b/scripts/cron/cron_run_jobs.php
@@ -90,7 +90,7 @@ if ($userlogin == 'firstadmin')
if ($obj)
{
$userlogin = $obj->login;
- echo "First admin user found is login '".$userlogin."'\n ";
+ echo "First admin user found is login '".$userlogin."'\n";
}
}
else dol_print_error($db);
@@ -146,7 +146,8 @@ if(is_array($object->lines) && (count($object->lines)>0))
// Loop over job
foreach($object->lines as $line)
{
- dol_syslog("cron_run_jobs.php cronjobid: ".$line->id, LOG_WARNING);
+ dol_syslog("cron_run_jobs.php cronjobid: ".$line->id, LOG_DEBUG);
+ echo "cron_run_jobs.php cronjobid: ".$line->id."\n";
//If date_next_jobs is less of current date, execute the program, and store the execution time of the next execution in database
if (($line->datenextrun < $now) && (empty($line->datestart) || $line->datestart <= $now) && (empty($line->dateend) || $line->dateend >= $now))
| |