';
print ' | ';
print ' | ';
+ print ' | ';
print ' | ';
print '';
print '';
@@ -420,6 +429,7 @@ if ($result) {
print ' ';
print_liste_field_titre("LineId", $_SERVER["PHP_SELF"], "l.rowid", "", $param, '', $sortfield, $sortorder);
print_liste_field_titre("Invoice", $_SERVER["PHP_SELF"], "f.ref", "", $param, '', $sortfield, $sortorder);
+ print_liste_field_titre("RefSupplier", $_SERVER["PHP_SELF"], "f.ref_supplier", "", $param, '', $sortfield, $sortorder);
print_liste_field_titre("InvoiceLabel", $_SERVER["PHP_SELF"], "f.libelle", "", $param, '', $sortfield, $sortorder);
print_liste_field_titre("Date", $_SERVER["PHP_SELF"], "f.datef, f.ref, l.rowid", "", $param, '', $sortfield, $sortorder, 'center ');
print_liste_field_titre("ProductRef", $_SERVER["PHP_SELF"], "p.ref", "", $param, '', $sortfield, $sortorder);
@@ -446,6 +456,9 @@ if ($result) {
$facturefournisseur_static->ref = $objp->ref;
$facturefournisseur_static->id = $objp->facid;
+ $facturefournisseur_static->type = $objp->ftype;
+ $facturefournisseur_static->ref_supplier = $objp->ref_supplier;
+ $facturefournisseur_static->label = $objp->invoice_label;
$thirdpartystatic->id = $objp->socid;
$thirdpartystatic->name = $objp->name;
@@ -465,8 +478,8 @@ if ($result) {
$productstatic->status = $objp->tosell;
$productstatic->status_buy = $objp->tobuy;
$productstatic->accountancy_code_buy = $objp->accountancy_code_buy;
- $productstatic->accountancy_code_buy_intra = $objp->accountancy_code_sell_buy;
- $productstatic->accountancy_code_buy_export = $objp->accountancy_code_sell_buy;
+ $productstatic->accountancy_code_buy_intra = $objp->accountancy_code_sell_buy_intra;
+ $productstatic->accountancy_code_buy_export = $objp->accountancy_code_sell_buy_export;
$accountingaccountstatic->rowid = $objp->fk_compte;
$accountingaccountstatic->label = $objp->label_account;
@@ -481,7 +494,13 @@ if ($result) {
// Ref Invoice
print '| '.$facturefournisseur_static->getNomUrl(1).' | ';
- print '';
+ // Ref supplier invoice
+ print ' | ';
+ print $objp->ref_supplier;
+ print ' | ';
+
+ // Supplier invoice label
+ print '';
print $objp->invoice_label;
print ' | ';
@@ -501,8 +520,8 @@ if ($result) {
}
print '';
- print '';
- $text = dolGetFirstLineOfText(dol_string_nohtmltag($objp->description));
+ print ' | ';
+ $text = dolGetFirstLineOfText(dol_string_nohtmltag($objp->description, 1));
$trunclength = empty($conf->global->ACCOUNTING_LENGTH_DESCRIPTION) ? 32 : $conf->global->ACCOUNTING_LENGTH_DESCRIPTION;
print $form->textwithtooltip(dol_trunc($text, $trunclength), $objp->description);
print ' | ';
diff --git a/htdocs/accountancy/supplier/list.php b/htdocs/accountancy/supplier/list.php
index 24d0ed08a0a..32e939f7bee 100644
--- a/htdocs/accountancy/supplier/list.php
+++ b/htdocs/accountancy/supplier/list.php
@@ -1,10 +1,11 @@
- * Copyright (C) 2013-2021 Alexandre Spangaro
+ * Copyright (C) 2013-2022 Alexandre Spangaro
* Copyright (C) 2014-2015 Ari Elbaz (elarifr)
* Copyright (C) 2013-2021 Florian Henry
- * Copyright (C) 2014 Juanjo Menent s
- * Copyright (C) 2016 Laurent Destailleur
+ * Copyright (C) 2021 Gauthier VERDOL
+ * Copyright (C) 2014 Juanjo Menent s
+ * Copyright (C) 2016 Laurent Destailleur
*
* 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
@@ -47,6 +48,7 @@ $show_files = GETPOST('show_files', 'int');
$confirm = GETPOST('confirm', 'alpha');
$toselect = GETPOST('toselect', 'array');
$optioncss = GETPOST('optioncss', 'alpha');
+$default_account = GETPOST('default_account', 'int');
// Select Box
$mesCasesCochees = GETPOST('toselect', 'array');
@@ -55,6 +57,7 @@ $mesCasesCochees = GETPOST('toselect', 'array');
$search_societe = GETPOST('search_societe', 'alpha');
$search_lineid = GETPOST('search_lineid', 'int');
$search_ref = GETPOST('search_ref', 'alpha');
+$search_ref_supplier = GETPOST('search_ref_supplier', 'alpha');
$search_invoice = GETPOST('search_invoice', 'alpha');
$search_label = GETPOST('search_label', 'alpha');
$search_desc = GETPOST('search_desc', 'alpha');
@@ -137,6 +140,7 @@ if (empty($reshook)) {
$search_societe = '';
$search_lineid = '';
$search_ref = '';
+ $search_ref_supplier = '';
$search_invoice = '';
$search_label = '';
$search_desc = '';
@@ -290,6 +294,9 @@ if (strlen(trim($search_invoice))) {
if (strlen(trim($search_ref))) {
$sql .= natural_search("p.ref", $search_ref);
}
+if (strlen(trim($search_ref_supplier))) {
+ $sql .= natural_search("f.ref_supplier", $search_ref_supplier);
+}
if (strlen(trim($search_label))) {
$sql .= natural_search(array("p.label", "f.libelle"), $search_label);
}
@@ -413,6 +420,9 @@ if ($result) {
if ($search_ref) {
$param .= '&search_ref='.urlencode($search_ref);
}
+ if ($search_ref_supplier) {
+ $param .= '&search_ref_supplier='.urlencode($search_ref_supplier);
+ }
if ($search_label) {
$param .= '&search_label='.urlencode($search_label);
}
@@ -434,12 +444,15 @@ if ($result) {
$arrayofmassactions = array(
'ventil'=>img_picto('', 'check', 'class="pictofixedwidth"').$langs->trans("Ventilate")
+ ,'set_default_account'=>img_picto('', 'check', 'class="pictofixedwidth"').$langs->trans("ConfirmPreselectAccount")
//'presend'=>img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail"),
//'builddoc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("PDFMerge"),
);
//if ($user->rights->mymodule->supprimer) $arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
//if (in_array($massaction, array('presend','predelete'))) $arrayofmassactions=array();
- $massactionbutton = $form->selectMassAction('ventil', $arrayofmassactions, 1);
+ if ($massaction !== 'set_default_account') {
+ $massactionbutton = $form->selectMassAction('ventil', $arrayofmassactions, 1);
+ }
print ' |