diff --git a/htdocs/compta/bank/treso.php b/htdocs/compta/bank/treso.php index f17e622210e..5b601441378 100644 --- a/htdocs/compta/bank/treso.php +++ b/htdocs/compta/bank/treso.php @@ -312,7 +312,7 @@ if ($_REQUEST["account"] || $_REQUEST["ref"]) $reshook = $hookmanager->executeHooks('printObjectLine', $parameters, $object, $action); // Note that $action and $object may have been modified by hook if(empty($reshook)){ print $hookmanager->resPrint; - $solde = isset($hookmanager->resArray['solde']) ? $hookmanager->resArray['solde'] : $solde; + $solde = isset($hookmanager->resArray['solde']) ? $hookmanager->resArray['solde'] : $solde; } // solde diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php index 920acd1c22f..30c31109224 100644 --- a/htdocs/compta/paiement.php +++ b/htdocs/compta/paiement.php @@ -744,6 +744,9 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie } print ""; + $parameters=array(); + $reshook=$hookmanager->executeHooks('printFieldListTitle', $parameters, $objp, $action); // Note that $action and $object may have been modified by hook + // Warning print ''; //print "xx".$amounts[$invoice->id]."-".$amountsresttopay[$invoice->id]."
"; @@ -754,9 +757,6 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie } print ''; - $parameters=array(); - $reshook=$hookmanager->executeHooks('printObjectLine', $parameters, $objp, $action); // Note that $action and $object may have been modified by hook - print "\n"; $total+=$objp->total; @@ -893,12 +893,13 @@ if (! GETPOST('action', 'aZ09')) print ''.$objp->ref."\n"; print ''.dol_print_date($db->jdate($objp->dp))."\n"; print ''.$objp->paiement_type.' '.$objp->num_paiement."\n"; - print ''.price($objp->amount).' '; - - $parameters=array(); - $reshook=$hookmanager->executeHooks('printObjectLine', $parameters, $objp, $action); // Note that $action and $object may have been modified by hook - + print ''.price($objp->amount).''; + print ' '; print ''; + + $parameters=array(); + $reshook=$hookmanager->executeHooks('printObjectLine', $parameters, $objp, $action); // Note that $action and $object may have been modified by hook + $i++; } print ''; diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php index 492642d4ed3..9a76a3e995d 100644 --- a/htdocs/core/lib/company.lib.php +++ b/htdocs/core/lib/company.lib.php @@ -172,7 +172,8 @@ function societe_prepare_head(Societe $object) } // Related items - if (! empty($conf->commande->enabled) || ! empty($conf->propal->enabled) || ! empty($conf->facture->enabled) || ! empty($conf->ficheinter->enabled) || ! empty($conf->fournisseur->enabled)) + if ((! empty($conf->commande->enabled) || ! empty($conf->propal->enabled) || ! empty($conf->facture->enabled) || ! empty($conf->ficheinter->enabled) || ! empty($conf->fournisseur->enabled)) + && empty($conf->global->THIRPARTIES_DISABLE_RELATED_OBJECT_TAB)) { $head[$h][0] = DOL_URL_ROOT.'/societe/consumption.php?socid='.$object->id; $head[$h][1] = $langs->trans("Referers"); diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php index f1e27c02501..ca1f0727a4e 100644 --- a/htdocs/product/fournisseurs.php +++ b/htdocs/product/fournisseurs.php @@ -811,12 +811,16 @@ SCRIPT; print_liste_field_titre("BarcodeType", $_SERVER["PHP_SELF"], "pfp.fk_barcode_type", "", $param, '', $sortfield, $sortorder, 'center '); } print_liste_field_titre("DateModification", $_SERVER["PHP_SELF"], "pfp.tms", "", $param, '', $sortfield, $sortorder, 'right '); + if (is_object($hookmanager)) + { + $parameters=array('id_fourn'=>$id_fourn, 'prod_id'=>$object->id); + $reshook=$hookmanager->executeHooks('printFieldListTitle', $parameters, $object, $action); + } print_liste_field_titre(''); print "\n"; if (is_array($product_fourn_list)) { - foreach($product_fourn_list as $productfourn) { print ''; @@ -924,7 +928,7 @@ SCRIPT; if (is_object($hookmanager)) { $parameters=array('id_pfp'=>$productfourn->product_fourn_price_id,'id_fourn'=>$id_fourn,'prod_id'=>$object->id); - $reshook=$hookmanager->executeHooks('printObjectLine', $parameters, $object, $action); + $reshook=$hookmanager->executeHooks('printFieldListValue', $parameters, $object, $action); } // Modify-Remove diff --git a/htdocs/stripe/payment.php b/htdocs/stripe/payment.php index be9f74b7bd7..6811df8d589 100644 --- a/htdocs/stripe/payment.php +++ b/htdocs/stripe/payment.php @@ -817,9 +817,11 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie if ($facture->type == 2) { $remaindertopay=$langs->trans("RemainderToPayBack"); $multicurrencyremaindertopay=$langs->trans("MulticurrencyRemainderToPayBack"); } $i = 0; - //print ''; + print '
'; + print_barre_liste($langs->trans('StripeInvoiceList').' '.$typeElementString.' '.$button, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, '', ''); + print ''; print ''; print ''; @@ -837,7 +839,12 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie if (!empty($conf->multicurrency->enabled)) { print ''; } - print ''; + + $tmpinvoice =new Facture($db); + $parameters=array(); + $reshook=$hookmanager->executeHooks('printFieldListTitle', $parameters, $tmpinvoice, $action); // Note that $action and $object may have been modified by hook + + print ''; print "\n"; $total=0; @@ -967,6 +974,9 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie print ""; } + $parameters=array(); + $reshook=$hookmanager->executeHooks('printFieldListValue', $parameters, $objp, $action); // Note that $action and $object may have been modified by hook + // Warning print ''; - $parameters=array(); - $reshook=$hookmanager->executeHooks('printObjectLine', $parameters, $objp, $action); // Note that $action and $object may have been modified by hook - print "\n"; $total+=$objp->total; @@ -991,7 +998,8 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie } if ($i > 1) { - $amount=round(price($sign * price2num($total_ttc - $totalrecu - $totalrecucreditnote - $totalrecudeposits, 'MT'))*100); + $amount=round(price($sign * price2num($total_ttc - $totalrecu - $totalrecucreditnote - $totalrecudeposits, 'MT'))*100); + // Print total print ''; print ''; @@ -1010,6 +1018,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie if (!empty($conf->multicurrency->enabled)) { print ''; } + print ''; print "\n"; } print "
'.$arraytitle.''.$langs->trans('MulticurrencyPaymentAmount').'  
'; //print "xx".$amounts[$invoice->id]."-".$amountsresttopay[$invoice->id]."
"; @@ -977,9 +987,6 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie } print '
'.$langs->trans('TotalTTC').'
"; @@ -1106,22 +1115,29 @@ if (! GETPOST('action')) print_liste_field_titre('Date', $_SERVER["PHP_SELF"], 'dp', '', '', '', $sortfield, $sortorder); print_liste_field_titre('Type', $_SERVER["PHP_SELF"], 'libelle', '', '', '', $sortfield, $sortorder); print_liste_field_titre('Amount', $_SERVER["PHP_SELF"], 'fa_amount', '', '', '', $sortfield, $sortorder, 'right '); + + $tmpobject = new Paiement($db); + $parameters=array(); + $reshook=$hookmanager->executeHooks('printFieldListTitle', $parameters, $tmpobject, $action); // Note that $action and $object may have been modified by hook + print_liste_field_titre('', $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'maxwidthsearch '); - print "\n"; + print "\n"; while ($i < min($num, $limit)) { $objp = $db->fetch_object($resql); + print ''; print ''.$objp->ref."\n"; print ''.dol_print_date($db->jdate($objp->dp))."\n"; print ''.$objp->paiement_type.' '.$objp->num_paiement."\n"; - print ''.price($objp->amount).' '; + print ''.price($objp->amount).''; $parameters=array(); - $reshook=$hookmanager->executeHooks('printObjectLine', $parameters, $objp, $action); // Note that $action and $object may have been modified by hook + $reshook=$hookmanager->executeHooks('printFieldListValue', $parameters, $objp, $action); // Note that $action and $object may have been modified by hook - print ''; + print ' '; + print ''; $i++; } print '';