';
if ($id > 0) {
- print_liste_field_titre("Invoice",$_SERVER["PHP_SELF"],"f.facnumber","","&id=".$id,'',$sortfield,$sortorder);
+ print_liste_field_titre("Invoice",$_SERVER["PHP_SELF"],"f.ref","","&id=".$id,'',$sortfield,$sortorder);
print_liste_field_titre("DateInvoice",$_SERVER["PHP_SELF"],"f.datef","","&id=".$id,'align="center"',$sortfield,$sortorder);
}
else
@@ -277,7 +277,7 @@ if ($result)
if ($id > 0) {
print '| ';
$invoicestatic->id=$objp->facid;
- $invoicestatic->ref=$objp->facnumber;
+ $invoicestatic->ref=$objp->ref;
print $invoicestatic->getNomUrl(1);
print " | \n";
print "";
diff --git a/htdocs/margin/tabs/productMargins.php b/htdocs/margin/tabs/productMargins.php
index 5659be448de..1d922473036 100644
--- a/htdocs/margin/tabs/productMargins.php
+++ b/htdocs/margin/tabs/productMargins.php
@@ -131,7 +131,7 @@ if ($id > 0 || ! empty($ref))
if ($user->rights->facture->lire) {
$sql = "SELECT s.nom as name, s.rowid as socid, s.code_client,";
- $sql.= " f.rowid as facid, f.facnumber, f.total as total_ht,";
+ $sql.= " f.rowid as facid, f.ref, f.total as total_ht,";
$sql.= " f.datef, f.paye, f.fk_statut as statut, f.type,";
if (!$user->rights->societe->client->voir && !$socid) $sql.= " sc.fk_soc, sc.fk_user,";
$sql.= " sum(d.total_ht) as selling_price,"; // may be negative or positive
@@ -151,7 +151,7 @@ if ($id > 0 || ! empty($ref))
if (! empty($socid)) $sql.= " AND f.fk_soc = $socid";
$sql .= " AND d.buy_price_ht IS NOT NULL";
if (isset($conf->global->ForceBuyingPriceIfNull) && $conf->global->ForceBuyingPriceIfNull == 1) $sql .= " AND d.buy_price_ht <> 0";
- $sql.= " GROUP BY s.nom, s.rowid, s.code_client, f.rowid, f.facnumber, f.total, f.datef, f.paye, f.fk_statut, f.type";
+ $sql.= " GROUP BY s.nom, s.rowid, s.code_client, f.rowid, f.ref, f.total, f.datef, f.paye, f.fk_statut, f.type";
if (!$user->rights->societe->client->voir && !$socid) $sql.= ", sc.fk_soc, sc.fk_user";
$sql.= $db->order($sortfield,$sortorder);
// TODO: calculate total to display then restore pagination
@@ -169,7 +169,7 @@ if ($id > 0 || ! empty($ref))
print '';
print '';
- print_liste_field_titre("Invoice",$_SERVER["PHP_SELF"],"f.facnumber","","&id=".$object->id,'',$sortfield,$sortorder);
+ print_liste_field_titre("Invoice",$_SERVER["PHP_SELF"],"f.ref","","&id=".$object->id,'',$sortfield,$sortorder);
print_liste_field_titre("Company",$_SERVER["PHP_SELF"],"s.nom","","&id=".$object->id,'',$sortfield,$sortorder);
print_liste_field_titre("CustomerCode",$_SERVER["PHP_SELF"],"s.code_client","","&id=".$object->id,'',$sortfield,$sortorder);
print_liste_field_titre("DateInvoice",$_SERVER["PHP_SELF"],"f.datef","","&id=".$object->id,'align="center"',$sortfield,$sortorder);
@@ -199,7 +199,7 @@ if ($id > 0 || ! empty($ref))
print ' ';
print '| ';
$invoicestatic->id=$objp->facid;
- $invoicestatic->ref=$objp->facnumber;
+ $invoicestatic->ref=$objp->ref;
print $invoicestatic->getNomUrl(1);
print " | \n";
print ''.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->name,44).' | ';
diff --git a/htdocs/margin/tabs/thirdpartyMargins.php b/htdocs/margin/tabs/thirdpartyMargins.php
index 55362ac4218..2856ebb8397 100644
--- a/htdocs/margin/tabs/thirdpartyMargins.php
+++ b/htdocs/margin/tabs/thirdpartyMargins.php
@@ -144,7 +144,7 @@ if ($socid > 0)
print '
';
$sql = "SELECT distinct s.nom, s.rowid as socid, s.code_client,";
- $sql.= " f.rowid as facid, f.facnumber, f.total as total_ht,";
+ $sql.= " f.rowid as facid, f.ref, f.total as total_ht,";
$sql.= " f.datef, f.paye, f.fk_statut as statut, f.type,";
$sql.= " sum(d.total_ht) as selling_price,"; // may be negative or positive
$sql.= " sum(d.qty * d.buy_price_ht) as buying_price,"; // always positive
@@ -159,7 +159,7 @@ if ($socid > 0)
$sql.= " AND f.fk_soc = $socid";
$sql.= " AND d.buy_price_ht IS NOT NULL";
if (isset($conf->global->ForceBuyingPriceIfNull) && $conf->global->ForceBuyingPriceIfNull == 1) $sql .= " AND d.buy_price_ht <> 0";
- $sql.= " GROUP BY s.nom, s.rowid, s.code_client, f.rowid, f.facnumber, f.total, f.datef, f.paye, f.fk_statut, f.type";
+ $sql.= " GROUP BY s.nom, s.rowid, s.code_client, f.rowid, f.ref, f.total, f.datef, f.paye, f.fk_statut, f.type";
$sql.= $db->order($sortfield,$sortorder);
// TODO: calculate total to display then restore pagination
//$sql.= $db->plimit($conf->liste_limit +1, $offset);
@@ -177,7 +177,7 @@ if ($socid > 0)
print "";
print '';
- print_liste_field_titre("Invoice",$_SERVER["PHP_SELF"],"f.facnumber","","&socid=".$_REQUEST["socid"],'',$sortfield,$sortorder);
+ print_liste_field_titre("Invoice",$_SERVER["PHP_SELF"],"f.ref","","&socid=".$_REQUEST["socid"],'',$sortfield,$sortorder);
print_liste_field_titre("DateInvoice",$_SERVER["PHP_SELF"],"f.datef","","&socid=".$_REQUEST["socid"],'align="center"',$sortfield,$sortorder);
print_liste_field_titre("SoldAmount",$_SERVER["PHP_SELF"],"selling_price","","&socid=".$_REQUEST["socid"],'align="right"',$sortfield,$sortorder);
print_liste_field_titre("PurchasedAmount",$_SERVER["PHP_SELF"],"buying_price","","&socid=".$_REQUEST["socid"],'align="right"',$sortfield,$sortorder);
@@ -211,7 +211,7 @@ if ($socid > 0)
print ' ';
print '| ';
$invoicestatic->id=$objp->facid;
- $invoicestatic->ref=$objp->facnumber;
+ $invoicestatic->ref=$objp->ref;
print $invoicestatic->getNomUrl(1);
print " | \n";
print "";
diff --git a/htdocs/modulebuilder/template/core/modules/mailings/mailinglist_mymodule_myobject.modules.php b/htdocs/modulebuilder/template/core/modules/mailings/mailinglist_mymodule_myobject.modules.php
index 545e53d350a..460df7e96bf 100644
--- a/htdocs/modulebuilder/template/core/modules/mailings/mailinglist_mymodule_myobject.modules.php
+++ b/htdocs/modulebuilder/template/core/modules/mailings/mailinglist_mymodule_myobject.modules.php
@@ -97,14 +97,12 @@ class mailing_mailinglist_mymodule_myobject extends MailingTargets
* This is the main function that returns the array of emails
*
* @param int $mailing_id Id of emailing
- * @param array $filtersarray Requete sql de selection des destinataires
* @return int <0 if error, number of emails added if ok
*/
- function add_to_target($mailing_id,$filtersarray=array())
+ function add_to_target($mailing_id)
{
// phpcs:enable
$target = array();
- $cibles = array();
$j = 0;
@@ -114,7 +112,7 @@ class mailing_mailinglist_mymodule_myobject extends MailingTargets
if (! empty($_POST['filter']) && $_POST['filter'] != 'none') $sql.= " AND status = '".$this->db->escape($_POST['filter'])."'";
$sql.= " ORDER BY email";
- // Stocke destinataires dans cibles
+ // Stocke destinataires dans target
$result=$this->db->query($sql);
if ($result)
{
@@ -129,7 +127,7 @@ class mailing_mailinglist_mymodule_myobject extends MailingTargets
$obj = $this->db->fetch_object($result);
if ($old <> $obj->email)
{
- $cibles[$j] = array(
+ $target[$j] = array(
'email' => $obj->email,
'name' => $obj->lastname,
'id' => $obj->id,
@@ -162,7 +160,7 @@ class mailing_mailinglist_mymodule_myobject extends MailingTargets
// ----- Your code end here -----
- return parent::add_to_target($mailing_id, $cibles);
+ return parent::add_to_target($mailing_id, $target);
}
diff --git a/htdocs/opensurvey/results.php b/htdocs/opensurvey/results.php
index f3fd135f16d..34945504943 100644
--- a/htdocs/opensurvey/results.php
+++ b/htdocs/opensurvey/results.php
@@ -1050,18 +1050,20 @@ $toutsujet = explode(",", $object->sujet); // With old versions, this field was
$compteursujet = 0;
$meilleursujet = '';
-for ($i = 0; $i < $nbcolonnes; $i++) {
- if (isset($sumfor[$i]) === true && isset($meilleurecolonne) === true && $sumfor[$i] == $meilleurecolonne) {
+for ($i = 0; $i < $nbcolonnes; $i++)
+{
+ if (isset($sumfor[$i]) === true && isset($meilleurecolonne) === true && $sumfor[$i] == $meilleurecolonne)
+ {
$meilleursujet.=", ";
if ($object->format == "D") {
$meilleursujetexport = $toutsujet[$i];
-
+ //var_dump($toutsujet);
if (strpos($toutsujet[$i], '@') !== false) {
$toutsujetdate = explode("@", $toutsujet[$i]);
- $meilleursujet .= dol_print_date($toutsujetdate[0],'daytext'). ' ('.dol_print_date($toutsujetdate[0],'%A').')' . ' - ' . $toutsujetdate[1];
+ $meilleursujet .= dol_print_date($toutsujetdate[0],'daytext'). ($toutsujetdate[0] ? ' ('.dol_print_date($toutsujetdate[0],'%A').')' : '') . ' - ' . $toutsujetdate[1];
} else {
- $meilleursujet .= dol_print_date($toutsujet[$i],'daytext'). ' ('.dol_print_date($toutsujet[$i],'%A').')';
+ $meilleursujet .= dol_print_date($toutsujet[$i],'daytext'). ($toutsujet[$i] ? ' ('.dol_print_date($toutsujet[$i],'%A').')' : '');
}
}
else
@@ -1083,9 +1085,9 @@ if ($nbofcheckbox >= 2)
print ' '."\n";
if (isset($meilleurecolonne) && $compteursujet == "1") {
- print "![](\"".DOL_URL_ROOT.'/opensurvey/img/medaille.png'."\") " . $langs->trans('TheBestChoice') . ": ".$meilleursujet." " . $langs->trans("with") . " ".$meilleurecolonne."" . $vote_str . ".\n";
+ print " " . $langs->trans('TheBestChoice') . ": ".$meilleursujet." " . $langs->trans("with") . " ".$meilleurecolonne." " . $vote_str . ".\n";
} elseif (isset($meilleurecolonne)) {
- print " " . $langs->trans('TheBestChoices') . ": ".$meilleursujet." " . $langs->trans("with") . " ".$meilleurecolonne."" . $vote_str . ".\n";
+ print " " . $langs->trans('TheBestChoices') . ": ".$meilleursujet." " . $langs->trans("with") . " ".$meilleurecolonne." " . $vote_str . ".\n";
}
print '
'."\n";
}
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 6d3a0724006..ae6d193b80f 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -310,6 +310,7 @@ class Product extends CommonObject
public $oldcopy;
+ public $fk_default_warehouse;
/**
* @var int ID
*/
diff --git a/htdocs/product/stats/facture.php b/htdocs/product/stats/facture.php
index cd2dc221bb9..32efac120b7 100644
--- a/htdocs/product/stats/facture.php
+++ b/htdocs/product/stats/facture.php
@@ -147,7 +147,7 @@ if ($id > 0 || ! empty($ref))
elseif ($user->rights->facture->lire)
{
$sql = "SELECT DISTINCT s.nom as name, s.rowid as socid, s.code_client,";
- $sql.= " f.facnumber, f.datef, f.paye, f.type, f.fk_statut as statut, f.rowid as facid,";
+ $sql.= " f.ref, f.datef, f.paye, f.type, f.fk_statut as statut, f.rowid as facid,";
$sql.= " d.rowid, d.total_ht as total_ht, d.qty"; // We must keep the d.rowid here to not loose record because of the distinct used to ignore duplicate line when link on societe_commerciaux is used
if (!$user->rights->societe->client->voir && !$socid) $sql.= ", sc.fk_soc, sc.fk_user ";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
@@ -239,7 +239,7 @@ if ($id > 0 || ! empty($ref))
$total_qty+=$objp->qty;
$invoicestatic->id=$objp->facid;
- $invoicestatic->ref=$objp->facnumber;
+ $invoicestatic->ref=$objp->ref;
$societestatic->fetch($objp->socid);
$paiement = $invoicestatic->getSommePaiement();
diff --git a/htdocs/product/stock/movement_list.php b/htdocs/product/stock/movement_list.php
index bd5ac4a4345..f6a694c57fa 100644
--- a/htdocs/product/stock/movement_list.php
+++ b/htdocs/product/stock/movement_list.php
@@ -1048,7 +1048,20 @@ if ($resql)
if (! empty($arrayfields['m.type_mouvement']['checked']))
{
// Type of movement
- print ' | '.$objp->type_mouvement.' | ';
+ switch($objp->type_mouvement){
+ case "0":
+ print ''.$langs->trans('StockIncreaseAfterCorrectTransfer').' | ';
+ break;
+ case "1":
+ print ''.$langs->trans('StockDecreaseAfterCorrectTransfer').' | ';
+ break;
+ case "2":
+ print ''.$langs->trans('StockDecrease').' | ';
+ break;
+ case "3":
+ print ''.$langs->trans('StockIncrease').' | ';
+ break;
+ }
}
if (! empty($arrayfields['origin']['checked']))
{
diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index 04605c33065..fb2399175c2 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -450,108 +450,118 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third
print load_fiche_titre($langs->trans("NewTask"), '', 'title_project');
- print '';
}
else if ($id > 0 || ! empty($ref))
{
diff --git a/htdocs/projet/tasks/contact.php b/htdocs/projet/tasks/contact.php
index 82c722f2485..e6de0743d66 100644
--- a/htdocs/projet/tasks/contact.php
+++ b/htdocs/projet/tasks/contact.php
@@ -326,7 +326,7 @@ if ($id > 0 || ! empty($ref))
dol_fiche_end();
/*
- * Lignes de contacts
+ * Lines of contacts
*/
/*
// Contacts lines (modules that overwrite templates must declare this into descriptor)
@@ -340,16 +340,15 @@ if ($id > 0 || ! empty($ref))
/*
* Add a new contact line
- * Non affiche en mode modification de ligne
*/
print '';
if ($action != 'editline' && $user->rights->projet->creer)
{
print '';
- print '| '.$langs->trans("Source").' | ';
+ print ''.$langs->trans("Nature").' | ';
print ''.$langs->trans("ThirdParty").' | ';
- print ''.$langs->trans("TaskContact").' | ';
+ print ''.$langs->trans("Users").' | ';
print ''.$langs->trans("ContactType").' | ';
print ' | ';
print " \n";
@@ -507,7 +506,7 @@ if ($id > 0 || ! empty($ref))
{
print ' ';
print '';
- print img_delete();
+ print img_picto($langs->trans('Unlink'), 'unlink');
print '';
}
print '';
diff --git a/htdocs/public/emailing/mailing-unsubscribe.php b/htdocs/public/emailing/mailing-unsubscribe.php
index 67672f19e7c..d04d6eb8020 100644
--- a/htdocs/public/emailing/mailing-unsubscribe.php
+++ b/htdocs/public/emailing/mailing-unsubscribe.php
@@ -100,19 +100,21 @@ if (! empty($tag) && ($unsuscrib=='1'))
$resql=$db->query($sql);
if (! $resql) dol_print_error($db);
- // Update status communication of thirdparty prospect (old data)
+ /*
+ // Update status communication of thirdparty prospect (old usage)
$sql = "UPDATE ".MAIN_DB_PREFIX."societe SET fk_stcomm=-1 WHERE rowid IN (SELECT source_id FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE tag = '".$db->escape($tag)."' AND source_type='thirdparty' AND source_id is not null)";
$resql=$db->query($sql);
if (! $resql) dol_print_error($db);
- // Update status communication of contact prospect (old data)
+ // Update status communication of contact prospect (old usage)
$sql = "UPDATE ".MAIN_DB_PREFIX."socpeople SET no_email=1 WHERE rowid IN (SELECT source_id FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE tag = '".$db->escape($tag)."' AND source_type='contact' AND source_id is not null)";
$resql=$db->query($sql);
if (! $resql) dol_print_error($db);
+ */
- // Update status communication of contact prospect (old data)
+ // Update status communication of email (new usage)
$sql = "INSERT INTO ".MAIN_DB_PREFIX."mailing_unsubscribe (date_creat, entity, email) VALUES ('".$db->idate(dol_now())."', ".$obj->entity.", '".$obj->email."')";
$resql=$db->query($sql);
diff --git a/htdocs/public/opensurvey/studs.php b/htdocs/public/opensurvey/studs.php
index a9bd8a0fb70..acf986bb226 100644
--- a/htdocs/public/opensurvey/studs.php
+++ b/htdocs/public/opensurvey/studs.php
@@ -95,7 +95,7 @@ if (GETPOST('ajoutcomment','alpha'))
}
// Add vote
-if (GETPOST("boutonp") || GETPOST("boutonp.x") || GETPOST("boutonp_x")) // boutonp for chrom, boutonp_x for firefox
+if (GETPOST("boutonp") || GETPOST("boutonp.x") || GETPOST("boutonp_x")) // boutonp for chrome, boutonp_x for firefox
{
if (!$canbemodified) accessforbidden();
@@ -160,9 +160,12 @@ if (GETPOST("boutonp") || GETPOST("boutonp.x") || GETPOST("boutonp_x")) // bout
if ($email) {
include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
- $body = $langs->trans('EmailSomeoneVoted', $nom, getUrlSondage($numsondage, true));
+ $application = ($conf->global->MAIN_APPLICATION_TITLE ? $conf->global->MAIN_APPLICATION_TITLE : 'Dolibarr ERP/CRM');
- $cmailfile=new CMailFile("[".MAIN_APPLICATION_TITLE."] ".$langs->trans("Poll").': '.$object->titre, $email, $conf->global->MAIN_MAIL_EMAIL_FROM, $body);
+ $body = str_replace('\n', '
', $langs->transnoentities('EmailSomeoneVoted', $nom, getUrlSondage($numsondage, true)));
+ //var_dump($body);exit;
+
+ $cmailfile=new CMailFile("[".$application."] ".$langs->trans("Poll").': '.$object->titre, $email, $conf->global->MAIN_MAIL_EMAIL_FROM, $body, null, null, null, '', '', 0, -1);
$result=$cmailfile->sendfile();
}
}
diff --git a/htdocs/societe/class/api_thirdparties.class.php b/htdocs/societe/class/api_thirdparties.class.php
index 42d1d616852..50d9710be40 100644
--- a/htdocs/societe/class/api_thirdparties.class.php
+++ b/htdocs/societe/class/api_thirdparties.class.php
@@ -894,7 +894,7 @@ class Thirdparties extends DolibarrApi
}
- $sql = "SELECT f.facnumber, f.type as factype, re.fk_facture_source, re.rowid, re.amount_ht, re.amount_tva, re.amount_ttc, re.description, re.fk_facture, re.fk_facture_line";
+ $sql = "SELECT f.ref, f.type as factype, re.fk_facture_source, re.rowid, re.amount_ht, re.amount_tva, re.amount_ttc, re.description, re.fk_facture, re.fk_facture_line";
$sql .= " FROM ".MAIN_DB_PREFIX."societe_remise_except as re, ".MAIN_DB_PREFIX."facture as f";
$sql .= " WHERE f.rowid = re.fk_facture_source AND re.fk_soc = ".$id;
if ($filter == "available") $sql .= " AND re.fk_facture IS NULL AND re.fk_facture_line IS NULL";
diff --git a/htdocs/societe/consumption.php b/htdocs/societe/consumption.php
index 3a3fb8507c9..c1a0605b2e1 100644
--- a/htdocs/societe/consumption.php
+++ b/htdocs/societe/consumption.php
@@ -200,13 +200,13 @@ if ($type_element == 'invoice')
{ // Customer : show products from invoices
require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
$documentstatic=new Facture($db);
- $sql_select = 'SELECT f.rowid as doc_id, f.facnumber as doc_number, f.type as doc_type, f.datef as dateprint, f.fk_statut as status, f.paye as paid, ';
+ $sql_select = 'SELECT f.rowid as doc_id, f.ref as doc_number, f.type as doc_type, f.datef as dateprint, f.fk_statut as status, f.paye as paid, ';
$tables_from = MAIN_DB_PREFIX."facture as f,".MAIN_DB_PREFIX."facturedet as d";
$where = " WHERE f.fk_soc = s.rowid AND s.rowid = ".$socid;
$where.= " AND d.fk_facture = f.rowid";
$where.= " AND f.entity = ".$conf->entity;
$dateprint = 'f.datef';
- $doc_number='f.facnumber';
+ $doc_number='f.ref';
$thirdTypeSelect='customer';
}
if ($type_element == 'propal')
diff --git a/htdocs/stripe/payment.php b/htdocs/stripe/payment.php
index 7a06da294ab..a99104409ef 100644
--- a/htdocs/stripe/payment.php
+++ b/htdocs/stripe/payment.php
@@ -762,7 +762,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
* List of unpaid invoices
*/
- $sql = 'SELECT f.rowid as facid, f.facnumber, f.total_ttc, f.multicurrency_code, f.multicurrency_total_ttc, f.type, ';
+ $sql = 'SELECT f.rowid as facid, f.ref, f.total_ttc, f.multicurrency_code, f.multicurrency_total_ttc, f.type, ';
$sql.= ' f.datef as df, f.fk_soc as socid';
$sql.= ' FROM '.MAIN_DB_PREFIX.'facture as f';
@@ -789,7 +789,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
}
// Sort invoices by date and serial number: the older one comes first
- $sql.=' ORDER BY f.datef ASC, f.facnumber ASC';
+ $sql.=' ORDER BY f.datef ASC, f.ref ASC';
$resql = $db->query($sql);
if ($resql)
@@ -1073,7 +1073,7 @@ if (! GETPOST('action'))
if (! $sortorder) $sortorder='DESC';
if (! $sortfield) $sortfield='p.datep';
- $sql = 'SELECT p.datep as dp, p.amount, f.amount as fa_amount, f.facnumber';
+ $sql = 'SELECT p.datep as dp, p.amount, f.amount as fa_amount, f.ref';
$sql.=', f.rowid as facid, c.libelle as paiement_type, p.num_paiement';
$sql.= ' FROM '.MAIN_DB_PREFIX.'paiement as p, '.MAIN_DB_PREFIX.'facture as f, '.MAIN_DB_PREFIX.'c_paiement as c';
$sql.= ' WHERE p.fk_facture = f.rowid AND p.fk_paiement = c.id';
@@ -1095,7 +1095,7 @@ if (! GETPOST('action'))
print_barre_liste($langs->trans('Payments'), $page, $_SERVER["PHP_SELF"],'',$sortfield,$sortorder,'',$num);
print '';
print '';
- print_liste_field_titre('Invoice',$_SERVER["PHP_SELF"],'facnumber','','','',$sortfield,$sortorder);
+ print_liste_field_titre('Invoice',$_SERVER["PHP_SELF"],'ref','','','',$sortfield,$sortorder);
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','','','align="right"',$sortfield,$sortorder);
@@ -1106,7 +1106,7 @@ if (! GETPOST('action'))
{
$objp = $db->fetch_object($resql);
print ' ';
- print '| '.$objp->facnumber." | \n";
+ 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).' | | ';
diff --git a/htdocs/takepos/customers.php b/htdocs/takepos/customers.php
index 5a67998f180..41738861702 100644
--- a/htdocs/takepos/customers.php
+++ b/htdocs/takepos/customers.php
@@ -55,7 +55,7 @@ $_GET['optioncss'] = 'print';
*/
if ($action=="change") {
- $sql="UPDATE ".MAIN_DB_PREFIX."facture set fk_soc=".$idcustomer." where facnumber='(PROV-POS-".$place.")'";
+ $sql="UPDATE ".MAIN_DB_PREFIX."facture set fk_soc=".$idcustomer." where ref='(PROV-POS-".$place.")'";
$resql = $db->query($sql);
?>
|