diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php index 6f7f4d848790456be1348fa97cf48f9ceb3306f8..176806541144993a0d63558ef4fc364e22883ecf 100644 --- a/htdocs/compta/facture/card.php +++ b/htdocs/compta/facture/card.php @@ -3890,29 +3890,20 @@ else if ($id > 0 || ! empty($ref)) // Lines $result = $object->getLinesArray(); - print ' <form name="addproduct" id="addproduct" action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . (($action != 'editline') ? '#add' : '#line_' . GETPOST('lineid')) . '" method="POST"> - <input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '"> - <input type="hidden" name="action" value="' . (($action != 'editline') ? 'addline' : 'updateligne') . '"> - <input type="hidden" name="mode" value=""> - <input type="hidden" name="id" value="' . $object->id . '"> - '; - - if (! empty($conf->use_javascript_ajax) && $object->statut == 0) { - include DOL_DOCUMENT_ROOT . '/core/tpl/ajaxrow.tpl.php'; - } - - print '<div class="div-table-responsive">'; - print '<table id="tablelines" class="noborder noshadow" width="100%">'; - // Show global modifiers if (! empty($conf->global->INVOICE_USE_SITUATION)) { if ($object->situation_cycle_ref && $object->statut == 0) { - print '<tr class="liste_titre nodrag nodrop">'; + print '<div class="div-table-responsive">'; + print '<form name="updatealllines" id="updatealllines" action="' . $_SERVER['PHP_SELF'] . '?id=' . $object->id . '"#updatealllines" method="POST">'; print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '" />'; print '<input type="hidden" name="action" value="updatealllines" />'; print '<input type="hidden" name="id" value="' . $object->id . '" />'; + + print '<table id="tablelines" class="noborder noshadow" width="100%">'; + + print '<tr class="liste_titre nodrag nodrop">'; if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) { print '<td align="center" width="5"> </td>'; @@ -3949,10 +3940,29 @@ else if ($id > 0 || ! empty($ref)) print '<td align="right" class="nowrap"><input type="text" size="1" value="" name="all_progress">%</td>'; print '<td colspan="4" align="right"><input class="button" type="submit" name="all_percent" value="Modifier" /></td>'; print '</tr>'; + + print '</table>'; + print '</form>'; + + print '</div>'; } } + print ' <form name="addproduct" id="addproduct" action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . (($action != 'editline') ? '#add' : '#line_' . GETPOST('lineid')) . '" method="POST"> + <input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '"> + <input type="hidden" name="action" value="' . (($action != 'editline') ? 'addline' : 'updateligne') . '"> + <input type="hidden" name="mode" value=""> + <input type="hidden" name="id" value="' . $object->id . '"> + '; + + if (! empty($conf->use_javascript_ajax) && $object->statut == 0) { + include DOL_DOCUMENT_ROOT . '/core/tpl/ajaxrow.tpl.php'; + } + + print '<div class="div-table-responsive">'; + print '<table id="tablelines" class="noborder noshadow" width="100%">'; + // 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 82d5fb041301cd62b1505e665564973495d5344c..2eff05868d4dbd3d3565c276fb9138be1836663d 100644 --- a/htdocs/cron/list.php +++ b/htdocs/cron/list.php @@ -408,11 +408,11 @@ if ($num > 0) print '</td>'; print '<td class="center">'; - 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 '</td>'; print '<td class="center">'; - 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 '</td>'; print '<td align="right">'; @@ -424,11 +424,11 @@ if ($num > 0) print '</td>'; print '<td class="center">'; - 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 '</td>'; print '<td class="center">'; - 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 '</td>'; print '<td class="center">'; diff --git a/htdocs/langs/en_US/suppliers.lang b/htdocs/langs/en_US/suppliers.lang index b890919ace56f00b4c4cb8de5e4c4d9122d9921a..d84925d0676876bedc9f7b8346f23a5e79afb782 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 2c0a5cd15d7404d6e1983d872ad5b56c08746606..a12499e4eaca4513e40b6de73c5e982f0d9b558c 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 '<div class="div-table-responsive">'; print '<table class="noborder" width="100%">'; @@ -612,9 +617,6 @@ if ($id > 0 || $ref) print_liste_field_titre(''); print "</tr>\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 d765411ed8c0848d5c2e4ad8b953a0bd934ea255..cce87bfae5a69ec356b40bb0b62a96c4d5b08f5c 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 '<!-- list of prices per customer -->'."\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 '<tr class="liste_titre">'; - print '<td><input type="text" class="flat" name="search_soc" value="' . $search_soc . '" size="20"></td>'; - print '<td colspan="8"> </td>'; + print '<td class="liste_titre"><input type="text" class="flat" name="search_soc" value="' . $search_soc . '" size="20"></td>'; + print '<td class="liste_titre" colspan="8"> </td>'; // Print the search button print '<td class="liste_titre" align="right">'; $searchpitco=$form->showFilterAndCheckAddButtons(0); diff --git a/scripts/cron/cron_run_jobs.php b/scripts/cron/cron_run_jobs.php index 4360e74cae59c7f7204ddb1f9104ae586604fe86..841e85e144372830070032ace5012989709b437d 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<br>"; + 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))