';
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).' ";
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/modulebuilder/template/myobject_agenda.php b/htdocs/modulebuilder/template/myobject_agenda.php
index 9c6c9265592..b1da52ad4aa 100644
--- a/htdocs/modulebuilder/template/myobject_agenda.php
+++ b/htdocs/modulebuilder/template/myobject_agenda.php
@@ -232,7 +232,7 @@ if ($object->id > 0)
}
else
{
- print ''.$langs->trans("AddAction").' ';
+ print ''.$langs->trans("AddAction").' ';
}
}
diff --git a/htdocs/modulebuilder/template/myobject_card.php b/htdocs/modulebuilder/template/myobject_card.php
index f9b3db7a99e..75754512c71 100644
--- a/htdocs/modulebuilder/template/myobject_card.php
+++ b/htdocs/modulebuilder/template/myobject_card.php
@@ -372,7 +372,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
}
else
{
- print ''.$langs->trans('Modify').' '."\n";
+ print ''.$langs->trans('Modify').' '."\n";
}
// Clone
@@ -401,7 +401,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
}
else
{
- print ''.$langs->trans('Delete').' '."\n";
+ print ''.$langs->trans('Delete').' '."\n";
}
}
print ''."\n";
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 "".$meilleursujet." " . $langs->trans("with") . " ".$meilleurecolonne." " . $vote_str . ".\n";
+ print "".$meilleursujet." " . $langs->trans("with") . " ".$meilleurecolonne." " . $vote_str . ".\n";
} elseif (isset($meilleurecolonne)) {
- print "".$meilleursujet." " . $langs->trans("with") . " ".$meilleurecolonne." " . $vote_str . ".\n";
+ print "".$meilleursujet." " . $langs->trans("with") . " ".$meilleurecolonne." " . $vote_str . ".\n";
}
print '
'.$langs->trans("Back").' ';
if ($eid == 0)
{
- print ''.$langs->trans('Delete').'
'."\n";
+ print ''.$langs->trans('Delete').'
'."\n";
}
else
{
diff --git a/htdocs/product/inventory/card.php b/htdocs/product/inventory/card.php
index 24848ad26c5..eaa2f3dffc2 100644
--- a/htdocs/product/inventory/card.php
+++ b/htdocs/product/inventory/card.php
@@ -336,7 +336,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
}
else
{
- print ''.$langs->trans('Modify').' '."\n";
+ print ''.$langs->trans('Modify').' '."\n";
}
if ($permissiontodelete)
@@ -345,7 +345,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
}
else
{
- print ''.$langs->trans('Delete').' '."\n";
+ print ''.$langs->trans('Delete').' '."\n";
}
}
print ''."\n";
diff --git a/htdocs/product/inventory/tpl/inventory.tpl.php b/htdocs/product/inventory/tpl/inventory.tpl.php
index 30dc02a17d6..0b89ac8a647 100644
--- a/htdocs/product/inventory/tpl/inventory.tpl.php
+++ b/htdocs/product/inventory/tpl/inventory.tpl.php
@@ -201,7 +201,7 @@ if (empty($conf) || ! is_object($conf))
- trans('Delete') ?>
+ trans('Delete') ?>
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index dda8cf267c9..323d21e5629 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -417,6 +417,7 @@ if ($resql)
// List of mass actions available
$arrayofmassactions = array(
+ 'generate_doc'=>$langs->trans("Generate"),
//'presend'=>$langs->trans("SendByMail"),
//'builddoc'=>$langs->trans("PDFMerge"),
);
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index b610e2a2914..557892da312 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -1111,7 +1111,7 @@ if (! $action || $action == 'delete' || $action == 'showlog_customer_price' || $
if ($object->isVariant()) {
if ($user->rights->produit->creer || $user->rights->service->creer) {
- print '';
+ print '';
}
} else {
if (empty($conf->global->PRODUIT_MULTIPRICES) && empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) {
diff --git a/htdocs/product/stats/facture.php b/htdocs/product/stats/facture.php
index 8b3cd4d9856..6cf8c13208a 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/card.php b/htdocs/product/stock/card.php
index 6977ac28acf..1d9cbd7952f 100644
--- a/htdocs/product/stock/card.php
+++ b/htdocs/product/stock/card.php
@@ -419,12 +419,12 @@ else
if ($user->rights->stock->creer)
print "id."\">".$langs->trans("Modify")." ";
else
- print "".$langs->trans("Modify")." ";
+ print "".$langs->trans("Modify")." ";
if ($user->rights->stock->supprimer)
print "id."\">".$langs->trans("Delete")." ";
else
- print "".$langs->trans("Delete")." ";
+ print "".$langs->trans("Delete")." ";
}
}
diff --git a/htdocs/product/stock/class/mouvementstock.class.php b/htdocs/product/stock/class/mouvementstock.class.php
index 7991477e146..98103af8ccf 100644
--- a/htdocs/product/stock/class/mouvementstock.class.php
+++ b/htdocs/product/stock/class/mouvementstock.class.php
@@ -322,8 +322,8 @@ class MouvementStock extends CommonObject
if (! $foundforbatch || $qtyisnotenough)
{
$langs->load("stocks");
- $this->error = $langs->trans('qtyToTranferLotIsNotEnough');
- $this->errors[] = $langs->trans('qtyToTranferLotIsNotEnough');
+ $this->error = $langs->trans('qtyToTranferLotIsNotEnough').' : '.$product->ref;
+ $this->errors[] = $langs->trans('qtyToTranferLotIsNotEnough').' : '.$product->ref;
$this->db->rollback();
return -8;
}
@@ -333,8 +333,8 @@ class MouvementStock extends CommonObject
if (empty($product->stock_warehouse[$entrepot_id]->real) || $product->stock_warehouse[$entrepot_id]->real < abs($qty))
{
$langs->load("stocks");
- $this->error = $langs->trans('qtyToTranferIsNotEnough');
- $this->errors[] = $langs->trans('qtyToTranferIsNotEnough');
+ $this->error = $langs->trans('qtyToTranferIsNotEnough').' : '.$product->ref;
+ $this->errors[] = $langs->trans('qtyToTranferIsNotEnough').' : '.$product->ref;
$this->db->rollback();
return -8;
}
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/product/stock/product.php b/htdocs/product/stock/product.php
index 852bf2a4e8d..54a4cd564ab 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -767,12 +767,12 @@ if (empty($reshook))
}
else
{
- print '' . $langs->trans("CorrectStock") . ' ';
+ print '' . $langs->trans("CorrectStock") . ' ';
}
}
else
{
- print '' . $langs->trans("CorrectStock") . ' ';
+ print '' . $langs->trans("CorrectStock") . ' ';
}
//if (($user->rights->stock->mouvement->creer) && ! $object->hasbatch())
@@ -783,12 +783,12 @@ if (empty($reshook))
}
else
{
- print '' . $langs->trans("TransferStock") . ' ';
+ print '' . $langs->trans("TransferStock") . ' ';
}
}
else
{
- print '' . $langs->trans("CorrectStock") . ' ';
+ print '' . $langs->trans("CorrectStock") . ' ';
}
print '';
diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index 8bf377a9844..c9abfd7d4ad 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -552,7 +552,7 @@ if ($action == 'create' && $user->rights->projet->creer)
$text=$form->select_company(GETPOST('socid','int'), 'socid', $filteronlist, 'SelectThirdParty', 1, 0, array(), 0, 'minwidth300');
if (empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) && empty($conf->dol_use_jmobile))
{
- $texthelp=$langs->trans("IfNeedToUseOhterObjectKeepEmpty");
+ $texthelp=$langs->trans("IfNeedToUseOtherObjectKeepEmpty");
print $form->textwithtooltip($text.' '.img_help(),$texthelp,1);
}
else print $text;
@@ -618,9 +618,9 @@ if ($action == 'create' && $user->rights->projet->creer)
print '';
print '';
print ' ';
-
+var_dump($conf->global->PROJECT_USE_TASKS);
// Bill time
- if (! empty($conf->global->PROJECT_BILL_TIME_SPENT))
+ if (empty($conf->global->PROJECT_HIDE_TASKS) && ! empty($conf->global->PROJECT_BILL_TIME_SPENT))
{
print ''.$langs->trans("BillTime").' ';
print ''.$langs->trans("BillTime").' ';
print ''.$langs->trans("BillTime").' ';
print ''.yn($object->bill_time).' ';
@@ -1118,7 +1118,7 @@ elseif ($object->id > 0)
}
else
{
- print '';
+ print '';
}
}
@@ -1131,7 +1131,7 @@ elseif ($object->id > 0)
}
else
{
- print '';
+ print '';
}
}
@@ -1144,7 +1144,7 @@ elseif ($object->id > 0)
}
else
{
- print '';
+ print '';
}
}
@@ -1157,7 +1157,7 @@ elseif ($object->id > 0)
}
else
{
- print '';
+ print '';
}
}
@@ -1225,7 +1225,7 @@ elseif ($object->id > 0)
}
else
{
- print '';
+ print '';
}
}
@@ -1238,7 +1238,7 @@ elseif ($object->id > 0)
}
else
{
- print '';
+ print '';
}
}
}
diff --git a/htdocs/projet/contact.php b/htdocs/projet/contact.php
index cd2e722ecd3..3a68eb9b5d4 100644
--- a/htdocs/projet/contact.php
+++ b/htdocs/projet/contact.php
@@ -241,7 +241,7 @@ if ($id > 0 || ! empty($ref))
print ''.$langs->trans("BillTime").' ';
print yn($object->bill_time);
diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php
index 5494c893b2a..59fda8f2123 100644
--- a/htdocs/projet/element.php
+++ b/htdocs/projet/element.php
@@ -218,7 +218,7 @@ print nl2br($object->description);
print ' '.$langs->trans("BillTime").' ';
print yn($object->bill_time);
diff --git a/htdocs/projet/info.php b/htdocs/projet/info.php
index 1f9b35b8420..d491e55a080 100644
--- a/htdocs/projet/info.php
+++ b/htdocs/projet/info.php
@@ -18,8 +18,8 @@
/**
* \file htdocs/projet/info.php
- * \ingroup commande
- * \brief Page with info on project
+ * \ingroup project
+ * \brief Page with events on project
*/
require '../main.inc.php';
@@ -34,7 +34,7 @@ $langs->load("projects");
$id = GETPOST('id','int');
$ref = GETPOST('ref','alpha');
$socid = GETPOST('socid','int');
-$action = GETPOST('action','alpha');
+$action = GETPOST('action','aZ09');
$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
$sortfield = GETPOST("sortfield","alpha");
@@ -50,16 +50,15 @@ $pagenext = $page + 1;
if (GETPOST('actioncode','array'))
{
- $actioncode=GETPOST('actioncode','array',3);
- if (! count($actioncode)) $actioncode='0';
+ $actioncode=GETPOST('actioncode','array',3);
+ if (! count($actioncode)) $actioncode='0';
}
else
{
- $actioncode=GETPOST("actioncode","alpha",3)?GETPOST("actioncode","alpha",3):(GETPOST("actioncode")=='0'?'0':(empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT)?'':$conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
+ $actioncode=GETPOST("actioncode","alpha",3)?GETPOST("actioncode","alpha",3):(GETPOST("actioncode")=='0'?'0':(empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT)?'':$conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
}
$search_agenda_label=GETPOST('search_agenda_label');
-
// Security check
$id = GETPOST("id",'int');
$socid=0;
@@ -71,7 +70,7 @@ if (!$user->rights->projet->lire) accessforbidden();
/*
- * Actions
+ * Actions
*/
$parameters=array('id'=>$socid);
@@ -81,8 +80,8 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
// Purge search criteria
if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') || GETPOST('button_removefilter','alpha')) // All test are required to be compatible with all browsers
{
- $actioncode='';
- $search_agenda_label='';
+ $actioncode='';
+ $search_agenda_label='';
}
@@ -170,7 +169,7 @@ if (! empty($conf->agenda->enabled))
}
else
{
- $morehtmlcenter.=''.$langs->trans("AddAction").' ';
+ $morehtmlcenter.=''.$langs->trans("AddAction").' ';
}
}
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index dac11d34519..e36a000674b 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -128,6 +128,7 @@ $arrayfields=array(
'p.fk_opp_status'=>array('label'=>$langs->trans("OpportunityStatusShort"), 'checked'=>1, 'enabled'=>($conf->global->PROJECT_USE_OPPORTUNITIES?1:0), 'position'=>104),
'p.opp_percent'=>array('label'=>$langs->trans("OpportunityProbabilityShort"), 'checked'=>1, 'enabled'=>($conf->global->PROJECT_USE_OPPORTUNITIES?1:0), 'position'=>105),
'p.budget_amount'=>array('label'=>$langs->trans("Budget"), 'checked'=>0, 'position'=>110),
+ 'p.bill_time'=>array('label'=>$langs->trans("BillTimeShort"), 'checked'=>0, 'position'=>115),
'p.datec'=>array('label'=>$langs->trans("DateCreationShort"), 'checked'=>0, 'position'=>500),
'p.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500),
'p.fk_statut'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000),
@@ -279,7 +280,7 @@ if (count($listofprojectcontacttype) == 0) $listofprojectcontacttype[0]='0';
$distinct='DISTINCT'; // We add distinct until we are added a protection to be sure a contact of a project and task is only once.
$sql = "SELECT ".$distinct." p.rowid as id, p.ref, p.title, p.fk_statut, p.fk_opp_status, p.public, p.fk_user_creat";
-$sql.= ", p.datec as date_creation, p.dateo as date_start, p.datee as date_end, p.opp_amount, p.opp_percent, p.tms as date_update, p.budget_amount";
+$sql.= ", p.datec as date_creation, p.dateo as date_start, p.datee as date_end, p.opp_amount, p.opp_percent, p.tms as date_update, p.budget_amount, p.bill_time";
$sql.= ", s.nom as name, s.rowid as socid";
$sql.= ", cls.code as opp_status_code";
// We'll need these fields in order to filter by categ
@@ -437,6 +438,7 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
// List of mass actions available
$arrayofmassactions = array(
+ 'generate_doc'=>$langs->trans("Generate"),
// 'presend'=>$langs->trans("SendByMail"),
// 'builddoc'=>$langs->trans("PDFMerge"),
);
@@ -620,6 +622,12 @@ if (! empty($arrayfields['p.budget_amount']['checked']))
print ' ';
}
+if (! empty($arrayfields['p.bill_time']['checked']))
+{
+ print '';
+ print '';
+ print ' ';
+}
// Extra fields
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
@@ -669,6 +677,7 @@ if (! empty($arrayfields['p.fk_opp_status']['checked'])) print_liste_field_titre
if (! empty($arrayfields['p.opp_amount']['checked'])) print_liste_field_titre($arrayfields['p.opp_amount']['label'],$_SERVER["PHP_SELF"],'p.opp_amount',"",$param,'align="right"',$sortfield,$sortorder);
if (! empty($arrayfields['p.opp_percent']['checked'])) print_liste_field_titre($arrayfields['p.opp_percent']['label'],$_SERVER["PHP_SELF"],'p.opp_percent',"",$param,'align="right"',$sortfield,$sortorder);
if (! empty($arrayfields['p.budget_amount']['checked'])) print_liste_field_titre($arrayfields['p.budget_amount']['label'],$_SERVER["PHP_SELF"],'p.budget_amount',"",$param,'align="right"',$sortfield,$sortorder);
+if (! empty($arrayfields['p.bill_time']['checked'])) print_liste_field_titre($arrayfields['p.bill_time']['label'],$_SERVER["PHP_SELF"],'p.bill_time',"",$param,'align="right"',$sortfield,$sortorder);
// Extra fields
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
// Hook fields
@@ -847,6 +856,17 @@ while ($i < min($num,$limit))
if (! $i) $totalarray['nbfield']++;
if (! $i) $totalarray['totalbudgetfield']=$totalarray['nbfield'];
}
+ // Bill time
+ if (! empty($arrayfields['p.bill_time']['checked']))
+ {
+ print '';
+ if ($obj->bill_time)
+ {
+ print yn($obj->bill_time);
+ }
+ print ' ';
+ if (! $i) $totalarray['nbfield']++;
+ }
// Extra fields
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
// Fields from hook
diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index 2f06f698b14..fb2399175c2 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -417,7 +417,7 @@ if ($id > 0 || ! empty($ref))
print ''.$langs->trans("BillTime").' ';
print yn($object->bill_time);
@@ -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/projet/tasks/task.php b/htdocs/projet/tasks/task.php
index 73ce4a562e4..7b96d2e2ea1 100644
--- a/htdocs/projet/tasks/task.php
+++ b/htdocs/projet/tasks/task.php
@@ -333,12 +333,12 @@ if ($id > 0 || ! empty($ref))
}
else
{
- print ''.$langs->trans('AddTask').' ';
+ print ''.$langs->trans('AddTask').' ';
}
}
else
{
- print ''.$langs->trans('AddTask').' ';
+ print ''.$langs->trans('AddTask').' ';
}
print '';
@@ -580,7 +580,7 @@ if ($id > 0 || ! empty($ref))
}
else
{
- print ''.$langs->trans('Modify').' ';
+ print ''.$langs->trans('Modify').' ';
}
// Delete
@@ -592,12 +592,12 @@ if ($id > 0 || ! empty($ref))
}
else
{
- print ''.$langs->trans('Delete').' ';
+ print ''.$langs->trans('Delete').' ';
}
}
else
{
- print ''.$langs->trans('Delete').' ';
+ print ''.$langs->trans('Delete').' ';
}
print '';
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index 4ac6f8a4621..48167edcc1d 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -400,7 +400,7 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
print '';
// Bill time
- if (! empty($conf->global->PROJECT_BILL_TIME_SPENT))
+ if (empty($conf->global->PROJECT_HIDE_TASKS) && ! empty($conf->global->PROJECT_BILL_TIME_SPENT))
{
print ''.$langs->trans("BillTime").' ';
print yn($projectstatic->bill_time);
@@ -515,7 +515,10 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
// Planned workload
print ' '.$langs->trans("PlannedWorkload").' ';
- print convertSecondToTime($object->planned_workload,'allhourmin');
+ if ($object->planned_workload)
+ {
+ print convertSecondToTime($object->planned_workload,'allhourmin');
+ }
print '
';
@@ -528,7 +531,7 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
// Progress declared
print ' '.$langs->trans("ProgressDeclared").' ';
- print $object->progress.' %';
+ print $object->progress != '' ? $object->progress.' %' : '';
print ' ';
$date1=$db->jdate($task_time->task_date);
@@ -1037,6 +1039,7 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
$userstatic->lastname = $task_time->lastname;
$userstatic->firstname = $task_time->firstname;
$userstatic->photo = $task_time->photo;
+ $userstatic->statut = $task_time->user_status;
print $userstatic->getNomUrl(-1);
}
print '';
diff --git a/htdocs/public/emailing/mailing-unsubscribe.php b/htdocs/public/emailing/mailing-unsubscribe.php
index c27cb024aab..d04d6eb8020 100644
--- a/htdocs/public/emailing/mailing-unsubscribe.php
+++ b/htdocs/public/emailing/mailing-unsubscribe.php
@@ -23,7 +23,8 @@
/**
* \file public/emailing/mailing-unsubscribe.php
* \ingroup mailing
- * \brief Script use to update unsubcribe contact to prospect mailing list
+ * \brief Script use to update unsubcribe status of an email
+ * https://myserver/public/emailing/mailing-unsubscribe.php?unsuscrib=1&securitykey=securitykey&tag=abcdefghijklmn
*/
if (! defined('NOLOGIN')) define("NOLOGIN",1); // This means this output page does not require to be logged.
@@ -75,38 +76,51 @@ if ($securitykey != $conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY)
if (! empty($tag) && ($unsuscrib=='1'))
{
- // Update status of mail in recipient mailing list table
- $statut='3';
- $sql = "UPDATE ".MAIN_DB_PREFIX."mailing_cibles SET statut=".$statut." WHERE tag='".$db->escape($tag)."'";
- dol_syslog("public/emailing/mailing-unsubscribe.php : Mail unsubcribe : ".$sql, LOG_DEBUG);
+ dol_syslog("public/emailing/mailing-unsubscribe.php : Launch unsubscribe requests", LOG_DEBUG);
- $resql=$db->query($sql);
- if (! $resql) dol_print_error($db);
-
- // Update status communication of thirdparty prospect
- $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)";
- dol_syslog("public/emailing/mailing-unsubscribe.php : Mail unsubcribe thirdparty : ".$sql, LOG_DEBUG);
-
- $resql=$db->query($sql);
- if (! $resql) dol_print_error($db);
-
- // Update status communication of contact prospect
- $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)";
- dol_syslog("public/emailing/mailing-unsubscribe.php : Mail unsubcribe contact : ".$sql, LOG_DEBUG);
-
- $resql=$db->query($sql);
- if (! $resql) dol_print_error($db);
-
-
- $sql = "SELECT mc.email";
- $sql .= " FROM ".MAIN_DB_PREFIX."mailing_cibles as mc";
- $sql .= " WHERE mc.tag='".$db->escape($tag)."'";
+ $sql = "SELECT mc.email, m.entity";
+ $sql .= " FROM ".MAIN_DB_PREFIX."mailing_cibles as mc, ".MAIN_DB_PREFIX."mailing as m";
+ $sql .= " WHERE mc.fk_mailing = m.rowid AND mc.tag='".$db->escape($tag)."'";
$resql=$db->query($sql);
if (! $resql) dol_print_error($db);
$obj = $db->fetch_object($resql);
+ if (empty($obj->email))
+ {
+ print 'Email not found. No need to unsubscribe.';
+ exit;
+ }
+
+ // Update status of mail in recipient mailing list table
+ $statut='3';
+ $sql = "UPDATE ".MAIN_DB_PREFIX."mailing_cibles SET statut=".$statut." WHERE tag='".$db->escape($tag)."'";
+
+ $resql=$db->query($sql);
+ if (! $resql) dol_print_error($db);
+
+ /*
+ // 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 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 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);
+ //if (! $resql) dol_print_error($db); No test on errors, may fail if already unsubscribed
+
+
header("Content-type: text/html; charset=".$conf->file->character_set_client);
print '';
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', '
* Copyright (C) 2018 Nicolas ZABOURI
* Copyright (C) 2018 Ferran Marcet
+ * Copyright (C) 2018 Frédéric France
*
* 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
@@ -1148,7 +1149,7 @@ else
}
else
{
- print ''.fieldLabel('ThirdPartyName','name').' ';
+ print ''.$form->editfieldkey('ThirdPartyName', 'name', '', $object, 0).' ';
}
print 'global->SOCIETE_USEPREFIX)?' colspan="3"':'').'>';
print ''.fieldLabel('FirstName','firstname').' ';
+ print ''.$form->editfieldkey('FirstName', 'firstname', '', $object, 0).' ';
print ''.fieldLabel('UserTitle','civility_id').' ';
+ print ' '.$form->editfieldkey('UserTitle', 'civility_id', '', $object, 0).' ';
print $formcompany->select_civility($object->civility_id, 'civility_id', 'maxwidth100').' ';
print ' ';
// Prospect/Customer
- print ''.fieldLabel('ProspectCustomer','customerprospect',1).' ';
+ print ''.$form->editfieldkey('ProspectCustomer', 'customerprospect', '', $object, 0, 'string', '', 1).' ';
print '';
$selected=GETPOST('client','int')!=''?GETPOST('client','int'):$object->client;
print '';
@@ -1186,7 +1187,7 @@ else
print ''.$langs->trans('NorProspectNorCustomer').' ';
print ' ';
- print ''.fieldLabel('CustomerCode','customer_code').' ';
+ print ' '.$form->editfieldkey('CustomerCode', 'customer_code', '', $object, 0).' ';
print '';
$tmpcode=$object->code_client;
if (empty($tmpcode) && ! empty($modCodeClient->code_auto)) $tmpcode=$modCodeClient->getNextValue($object,0);
@@ -1202,7 +1203,7 @@ else
{
// Supplier
print ' ';
- print ''.fieldLabel('Supplier','fournisseur',1).' ';
+ print ' '.$form->editfieldkey('Supplier', 'fournisseur', '', $object, 0, 'string', '', 1).' ';
$default = -1;
if (! empty($conf->global->THIRDPARTY_SUPPLIER_BY_DEFAULT)) $default=1;
print $form->selectyesno("fournisseur", (GETPOST('fournisseur','int')!=''?GETPOST('fournisseur','int'):(GETPOST("type",'alpha') == '' ? $default : $object->fournisseur)), 1, 0, (GETPOST("type",'alpha') == '' ? 1 : 0));
@@ -1210,7 +1211,7 @@ else
print ' ';
if (! empty($conf->fournisseur->enabled) && ! empty($user->rights->fournisseur->lire))
{
- print fieldLabel('SupplierCode','supplier_code');
+ print $form->editfieldkey('SupplierCode', 'supplier_code', '', $object, 0);
}
print ' ';
if (! empty($conf->fournisseur->enabled) && ! empty($user->rights->fournisseur->lire))
@@ -1228,33 +1229,33 @@ else
}
// Status
- print ' '.fieldLabel('Status','status').' ';
+ print ' '.$form->editfieldkey('Status', 'status', '', $object, 0).' ';
print $form->selectarray('status', array('0'=>$langs->trans('ActivityCeased'),'1'=>$langs->trans('InActivity')),1);
print ' '.fieldLabel('Gencod','barcode').' ';
+ print ''.$form->editfieldkey('Gencod', 'barcode', '', $object, 0).' ';
print ''.fieldLabel('Address','address').' ';
+ print ''.$form->editfieldkey('Address', 'address', '', $object, 0).' ';
print ''.fieldLabel('Zip','zipcode').' ';
+ print ' '.$form->editfieldkey('Zip', 'zipcode', '', $object, 0).' ';
print $formcompany->select_ziptown($object->zip,'zipcode',array('town','selectcountry_id','state_id'), 0, 0, '', 'maxwidth100 quatrevingtpercent');
- print ' '.fieldLabel('Town','town').' ';
+ print ' '.$form->editfieldkey('Town', 'town', '', $object, 0).' ';
print $formcompany->select_ziptown($object->town,'town',array('zipcode','selectcountry_id','state_id'), 0, 0, '', 'maxwidth100 quatrevingtpercent');
print ' '.fieldLabel('Country','selectcountry_id').' ';
+ print ' '.$form->editfieldkey('Country', 'selectcountry_id', '', $object, 0).' ';
print $form->select_country((GETPOST('country_id')!=''?GETPOST('country_id'):$object->country_id));
if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
print ' '.fieldLabel('Region-State','state_id').' ';
+ print ' '.$form->editfieldkey('Region-State', 'state_id', '', $object, 0).' ';
}
else
{
- print ' '.fieldLabel('State','state_id').' ';
+ print ' '.$form->editfieldkey('State', 'state_id', '', $object, 0).' ';
}
if ($object->country_id) print $formcompany->select_state($object->state_id,$object->country_code);
@@ -1277,9 +1278,9 @@ else
}
// Email / Web
- print ' '.fieldLabel('EMail','email',$conf->global->SOCIETE_EMAIL_MANDATORY).' ';
+ print ''.$form->editfieldkey('EMail', 'email', '', $object, 0, 'string', '', $conf->global->SOCIETE_EMAIL_MANDATORY).' ';
print ''.fieldLabel('Web','url').' ';
+ print ''.$form->editfieldkey('Web', 'url', '', $object, 0).' ';
print ''.fieldLabel('Skype','skype').' ';
- print ''.$form->editfieldkey('Skype', 'skype', '', $object, 0).' ';
+ print '';
+ print ' '.fieldLabel('Twitter','twitter').' ';
- print 'twitter).'"> '.$form->editfieldkey('Twitter', 'twitter', '', $object, 0).' ';
+ print '';
+ print 'twitter).'">';
+ print ' '.fieldLabel('Facebook','facebook').' ';
- print ''.$form->editfieldkey('Facebook', 'facebook', '', $object, 0).' ';
+ print '';
+ print ' '.fieldLabel('Phone','phone').' ';
+ print ''.$form->editfieldkey('Phone', 'phone', '', $object, 0).' ';
print ''.fieldLabel('Fax','fax').' ';
+ print ''.$form->editfieldkey('Fax', 'fax', '', $object, 0).' ';
print '';
$idprof_mandatory ='SOCIETE_IDPROF'.($i).'_MANDATORY';
- print ''.fieldLabel($idprof,$key, (empty($conf->global->$idprof_mandatory)?0:1)).' ';
+ print ' '.$form->editfieldkey($idprof, $key, '', $object, 0, 'string', '', (empty($conf->global->$idprof_mandatory)?0:1)).' ';
print $formcompany->get_input_id_prof($i, $key, $object->$key, $object->country_code);
print ' ';
@@ -1334,11 +1341,11 @@ else
if ($j % 2 == 1) print ' ';
// Vat is used
- print ''.fieldLabel('VATIsUsed','assujtva_value').' ';
+ print ''.$form->editfieldkey('VATIsUsed', 'assujtva_value', '', $object, 0).' ';
print '';
print $form->selectyesno('assujtva_value', GETPOSTISSET('assujtva_value')?GETPOST('assujtva_value','int'):1, 1); // Assujeti par defaut en creation
print ' ';
- print ''.fieldLabel('VATIntra','intra_vat').' ';
+ print ''.$form->editfieldkey('VATIntra', 'intra_vat', '', $object, 0).' ';
print '';
$s = ' '.fieldLabel('ThirdPartyType','typent_id').' '."\n";
+ print ' '.$form->editfieldkey('ThirdPartyType', 'typent_id', '', $object, 0).' '."\n";
$sortparam=(empty($conf->global->SOCIETE_SORT_ON_TYPEENT)?'ASC':$conf->global->SOCIETE_SORT_ON_TYPEENT); // NONE means we keep sort of original array, so we sort on position. ASC, means next function will sort on label.
print $form->selectarray("typent_id", $formcompany->typent_array(0), $object->typent_id, 0, 0, 0, '', 0, 0, 0, $sortparam);
if ($user->admin) print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
print ' ';
- print ''.fieldLabel('Staff','effectif_id').' ';
+ print ' '.$form->editfieldkey('Staff', 'effectif_id', '', $object, 0).' ';
print $form->selectarray("effectif_id", $formcompany->effectif_array(0), $object->effectif_id);
if ($user->admin) print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
print ' '.fieldLabel('JuridicalStatus','forme_juridique_code').' ';
+ print ''.$form->editfieldkey('JuridicalStatus', 'forme_juridique_code', '', $object, 0).' ';
print '';
if ($object->country_id)
{
@@ -1415,13 +1422,13 @@ else
print ' '.fieldLabel('Capital','capital').' ';
+ print ''.$form->editfieldkey('Capital', 'capital', '', $object, 0).' ';
print ''.$langs->trans("Currency".$conf->currency).' '.fieldLabel('DefaultLang','default_lang').' '."\n";
+ print ' '.$form->editfieldkey('DefaultLang', 'default_lang', '', $object, 0).' '."\n";
print $formadmin->select_language(($object->default_lang?$object->default_lang:$conf->global->MAIN_LANG_DEFAULT),'default_lang',0,0,1,0,0,'maxwidth200onsmartphone');
print ' ';
print '';
- print ''.fieldLabel('IncotermLabel','incoterm_id').' ';
+ print ''.$form->editfieldkey('IncotermLabel', 'incoterm_id', '', $object, 0).' ';
print '';
print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms)?$object->location_incoterms:''));
print ' ';
@@ -1444,7 +1451,7 @@ else
// Customer
//if ($object->prospect || $object->client || (! $object->fournisseur && ! empty($conf->global->THIRDPARTY_CAN_HAVE_CATEGORY_EVEN_IF_NOT_CUSTOMER_PROSPECT_SUPPLIER))) {
- print '' . fieldLabel('CustomersProspectsCategoriesShort', 'custcats') . ' ';
+ print ' ' . $form->editfieldkey('CustomersProspectsCategoriesShort', 'custcats', '', $object, 0) . ' ';
$cate_arbo = $form->select_all_categories(Categorie::TYPE_CUSTOMER, null, 'parent', null, null, 1);
print $form->multiselectarray('custcats', $cate_arbo, GETPOST('custcats', 'array'), null, null, null, null, "90%");
print " ' . fieldLabel('SuppliersCategoriesShort', 'suppcats') . ' ';
+ print ' ' . $form->editfieldkey('SuppliersCategoriesShort', 'suppcats', '', $object, 0) . ' ';
$cate_arbo = $form->select_all_categories(Categorie::TYPE_SUPPLIER, null, 'parent', null, null, 1);
print $form->multiselectarray('suppcats', $cate_arbo, GETPOST('suppcats', 'array'), null, null, null, null, "90%");
print " ';
- print ''.fieldLabel('Currency','multicurrency_code').' ';
+ print ''.$form->editfieldkey('Currency', 'multicurrency_code', '', $object, 0).' ';
print '';
print $form->selectMultiCurrency(($object->multicurrency_code ? $object->multicurrency_code : $conf->currency), 'multicurrency_code', 1);
print ' ';
@@ -1478,18 +1485,18 @@ else
print $object->showOptionals($extrafields,'edit');
}
- // Assign a sale representative
- print '';
- print ''.fieldLabel('AllocateCommercial','commercial_id').' ';
- print '';
- $userlist = $form->select_dolusers('', '', 0, null, 0, '', '', 0, 0, 0, '', 0, '', '', 0, 1);
- // Note: If user has no right to "see all thirdparties", we for selection of sale representative to him, so after creation he can see the record.
- print $form->multiselectarray('commercial', $userlist, (count(GETPOST('commercial', 'array')) > 0?GETPOST('commercial', 'array'):(empty($user->rights->societe->client->voir)?array($user->id):array())), null, null, null, null, "90%");
- print ' ';
+ // Assign a sale representative
+ print '';
+ print ''.$form->editfieldkey('AllocateCommercial', 'commercial_id', '', $object, 0).' ';
+ print '';
+ $userlist = $form->select_dolusers('', '', 0, null, 0, '', '', 0, 0, 0, '', 0, '', '', 0, 1);
+ // Note: If user has no right to "see all thirdparties", we for selection of sale representative to him, so after creation he can see the record.
+ print $form->multiselectarray('commercial', $userlist, (count(GETPOST('commercial', 'array')) > 0?GETPOST('commercial', 'array'):(empty($user->rights->societe->client->voir)?array($user->id):array())), null, null, null, null, "90%");
+ print ' ';
// Ajout du logo
print '';
- print ''.fieldLabel('Logo','photoinput').' ';
+ print ''.$form->editfieldkey('Logo', 'photoinput', '', $object, 0).' ';
print '';
print ' ';
@@ -1736,7 +1743,7 @@ else
}
// Name
- print ' '.fieldLabel('ThirdPartyName','name',1).' ';
+ print ''.$form->editfieldkey('ThirdPartyName', 'name', '', $object, 0, 'string', '', 1).' ';
print ''.fieldLabel('Prefix','prefix').' ';
+ print ' '.$form->editfieldkey('Prefix', 'prefix', '', $object, 0).' ';
// It does not change the prefix mode using the auto numbering prefix
if (($prefixCustomerIsUsed || $prefixSupplierIsUsed) && $object->prefix_comm)
{
@@ -1761,14 +1768,14 @@ else
}
// Prospect/Customer
- print ' '.fieldLabel('ProspectCustomer','customerprospect',1).' ';
+ print ''.$form->editfieldkey('ProspectCustomer', 'customerprospect', '', $object, 0, 'string', '', 1).' ';
print '';
if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) print 'client==2?' selected':'').'>'.$langs->trans('Prospect').' ';
if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) print 'client==3?' selected':'').'>'.$langs->trans('ProspectCustomer').' ';
if (empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) print 'client==1?' selected':'').'>'.$langs->trans('Customer').' ';
print 'client==0?' selected':'').'>'.$langs->trans('NorProspectNorCustomer').' ';
print ' '.fieldLabel('CustomerCode','customer_code').' ';
+ print ' '.$form->editfieldkey('CustomerCode', 'customer_code', '', $object, 0).' ';
print '';
if ((!$object->code_client || $object->code_client == -1) && $modCodeClient->code_auto)
@@ -1799,13 +1806,13 @@ else
|| (! empty($conf->supplier_proposal->enabled) && ! empty($user->rights->supplier_proposal->lire)))
{
print ' ';
- print ''.fieldLabel('Supplier','fournisseur',1).' ';
+ print ' '.$form->editfieldkey('Supplier', 'fournisseur', '', $object, 0, 'string', '', 1).' ';
print $form->selectyesno("fournisseur",$object->fournisseur,1);
print ' ';
print '';
if (! empty($conf->fournisseur->enabled) && ! empty($user->rights->fournisseur->lire))
{
- print fieldLabel('SupplierCode','supplier_code');
+ print $form->editfieldkey('SupplierCode', 'supplier_code', '', $object, 0);
}
print ' ';
if (! empty($conf->fournisseur->enabled) && ! empty($user->rights->fournisseur->lire))
@@ -1838,31 +1845,31 @@ else
// Barcode
if (! empty($conf->barcode->enabled))
{
- print ' '.fieldLabel('Gencod','barcode').' ';
+ print ''.$form->editfieldkey('Gencod', 'barcode', '', $object, 0).' ';
print ''.fieldLabel('Status','status').' ';
+ print ' '.$form->editfieldkey('Status', 'status', '', $object, 0).' ';
print $form->selectarray('status', array('0'=>$langs->trans('ActivityCeased'),'1'=>$langs->trans('InActivity')),$object->status);
print ' '.fieldLabel('Address','address').' ';
+ print ''.$form->editfieldkey('Address', 'address', '', $object, 0).' ';
print ''.fieldLabel('Zip','zipcode').' ';
+ print ' '.$form->editfieldkey('Zip', 'zipcode', '', $object, 0).' ';
print $formcompany->select_ziptown($object->zip, 'zipcode', array('town', 'selectcountry_id', 'state_id'), 0, 0, '', 'maxwidth50onsmartphone');
- print ' '.fieldLabel('Town','town').' ';
+ print ' '.$form->editfieldkey('Town', 'town', '', $object, 0).' ';
print $formcompany->select_ziptown($object->town, 'town', array('zipcode', 'selectcountry_id', 'state_id'));
print ' '.fieldLabel('Country','selectcounty_id').' ';
+ print ' '.$form->editfieldkey('Country', 'selectcounty_id', '', $object, 0).' ';
print $form->select_country((GETPOST('country_id')!=''?GETPOST('country_id'):$object->country_id),'country_id');
if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
print ' '.fieldLabel('Region-State','state_id').' ';
+ print ' '.$form->editfieldkey('Region-State', 'state_id', '', $object, 0).' ';
}
else
{
- print ' '.fieldLabel('State','state_id').' ';
+ print ' '.$form->editfieldkey('State', 'state_id', '', $object, 0).' ';
}
print $formcompany->select_state($object->state_id,$object->country_code);
@@ -1884,9 +1891,9 @@ else
}
// EMail / Web
- print ' '.fieldLabel('EMail','email',(! empty($conf->global->SOCIETE_EMAIL_MANDATORY))).' ';
+ print ''.$form->editfieldkey('EMail', 'email', '', $object, 0, 'string', '', (! empty($conf->global->SOCIETE_EMAIL_MANDATORY))).' ';
print ''.fieldLabel('Web','url').' ';
+ print ''.$form->editfieldkey('Web', 'url', '', $object, 0).' ';
print ''.fieldLabel('Skype','skype').' ';
+ print ''.$form->editfieldkey('Skype', 'skype', '', $object, 0).' ';
print ''.fieldLabel('Twitter','twitter').' ';
+ print ''.$form->editfieldkey('Twitter', 'twitter', '', $object, 0).' ';
print ''.fieldLabel('Facebook','facebook').' ';
+ print ''.$form->editfieldkey('Facebook', 'facebook', '', $object, 0).' ';
print ''.fieldLabel('Phone','phone').' ';
+ print ''.$form->editfieldkey('Phone', 'phone', '', $object, 0).' ';
print ''.fieldLabel('Fax','fax').' ';
+ print ''.$form->editfieldkey('Fax', 'fax', '', $object, 0).' ';
print '';
$idprof_mandatory ='SOCIETE_IDPROF'.($i).'_MANDATORY';
- if (empty($conf->global->$idprof_mandatory) || ! $object->isACompany())
- print ''.fieldLabel($idprof,$key).' ';
- else
- print ' '.fieldLabel($idprof,$key).' ';
-
- print $formcompany->get_input_id_prof($i,$key,$object->$key,$object->country_code);
+ print ' '.$form->editfieldkey($idprof, $key, '', $object, 0, 'string', '', ! (empty($conf->global->$idprof_mandatory) || ! $object->isACompany())).' ';
+ print $formcompany->get_input_id_prof($i, $key, $object->$key, $object->country_code);
print ' ';
if (($j % 2) == 1) print ' ';
$j++;
@@ -1944,7 +1947,7 @@ else
if ($j % 2 == 1) print ''.fieldLabel('VATIsUsed','assujtva_value').' ';
+ print ' '.$form->editfieldkey('VATIsUsed', 'assujtva_value', '', $object, 0).' ';
print $form->selectyesno('assujtva_value',$object->tva_assuj,1);
print ' '.fieldLabel($langs->transcountry("LocalTax1IsUsed",$mysoc->country_code),'localtax1assuj_value').' ';
+ print ' '.$form->editfieldkey($langs->transcountry("LocalTax1IsUsed",$mysoc->country_code), 'localtax1assuj_value', '', $object, 0).' ';
print $form->selectyesno('localtax1assuj_value',$object->localtax1_assuj,1);
if(! isOnlyOneLocalTax(1))
{
@@ -1962,7 +1965,7 @@ else
}
print ' ';
- print ''.fieldLabel($langs->transcountry("LocalTax2IsUsed",$mysoc->country_code),'localtax2assuj_value').' ';
+ print ' '.$form->editfieldkey($langs->transcountry("LocalTax2IsUsed",$mysoc->country_code), 'localtax2assuj_value', '', $object, 0).' ';
print $form->selectyesno('localtax2assuj_value',$object->localtax2_assuj,1);
if (! isOnlyOneLocalTax(2))
{
@@ -1974,7 +1977,7 @@ else
}
elseif($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj!="1")
{
- print ' '.fieldLabel($langs->transcountry("LocalTax1IsUsed",$mysoc->country_code),'localtax1assuj_value').' ';
+ print ' '.$form->editfieldkey($langs->transcountry("LocalTax1IsUsed",$mysoc->country_code), 'localtax1assuj_value', '', $object, 0).' ';
print $form->selectyesno('localtax1assuj_value',$object->localtax1_assuj,1);
if(! isOnlyOneLocalTax(1))
{
@@ -1986,7 +1989,7 @@ else
}
elseif($mysoc->localtax2_assuj=="1" && $mysoc->localtax1_assuj!="1")
{
- print ' '.fieldLabel($langs->transcountry("LocalTax2IsUsed",$mysoc->country_code),'localtax2assuj_value').' ';
+ print ' '.$form->editfieldkey($langs->transcountry("LocalTax2IsUsed",$mysoc->country_code), 'localtax2assuj_value', '', $object, 0).' ';
print $form->selectyesno('localtax2assuj_value',$object->localtax2_assuj,1);
if(! isOnlyOneLocalTax(2))
{
@@ -1998,7 +2001,7 @@ else
}
// VAT Code
- print ' '.fieldLabel('VATIntra','intra_vat').' ';
+ print ''.$form->editfieldkey('VATIntra', 'intra_vat', '', $object, 0).' ';
print '';
$s =' '.fieldLabel('ThirdPartyType','typent_id').' ';
+ print ' '.$form->editfieldkey('ThirdPartyType', 'typent_id', '', $object, 0).' ';
print $form->selectarray("typent_id",$formcompany->typent_array(0), $object->typent_id, 0, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT)?'ASC':$conf->global->SOCIETE_SORT_ON_TYPEENT));
if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
print ' ';
- print ''.fieldLabel('Staff','effectif_id').' ';
+ print ' '.$form->editfieldkey('Staff', 'effectif_id', '', $object, 0).' ';
print $form->selectarray("effectif_id",$formcompany->effectif_array(0), $object->effectif_id);
if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
print ' '.fieldLabel('JuridicalStatus','forme_juridique_code').' ';
+ print ' '.$form->editfieldkey('JuridicalStatus', 'forme_juridique_code', '', $object, 0).' ';
print $formcompany->select_juridicalstatus($object->forme_juridique_code, $object->country_code, '', 'forme_juridique_code');
print ' '.fieldLabel('Capital','capital').' ';
+ print ''.$form->editfieldkey('Capital', 'capital', '', $object, 0).' ';
print ''.$langs->trans("Currency".$conf->currency).' '.fieldLabel('DefaultLang','default_lang').' '."\n";
+ print ' '.$form->editfieldkey('DefaultLang', 'default_lang', '', $object, 0).' '."\n";
print $formadmin->select_language($object->default_lang,'default_lang',0,0,1);
print ' ';
print '';
- print ''.fieldLabel('IncotermLabel','incoterm_id').' ';
+ print ''.$form->editfieldkey('IncotermLabel', 'incoterm_id', '', $object, 0).' ';
print '';
print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms)?$object->location_incoterms:''));
print ' ';
@@ -2071,7 +2074,7 @@ else
if (! empty($conf->categorie->enabled) && ! empty($user->rights->categorie->lire))
{
// Customer
- print '' . fieldLabel('CustomersCategoriesShort', 'custcats') . ' ';
+ print '' . $form->editfieldkey('CustomersCategoriesShort', 'custcats', '', $object, 0) . ' ';
print '';
$cate_arbo = $form->select_all_categories(Categorie::TYPE_CUSTOMER, null, null, null, null, 1);
$c = new Categorie($db);
@@ -2084,7 +2087,7 @@ else
print " ' . fieldLabel('SuppliersCategoriesShort', 'suppcats') . ' ';
+ print '' . $form->editfieldkey('SuppliersCategoriesShort', 'suppcats', '', $object, 0) . ' ';
print '';
$cate_arbo = $form->select_all_categories(Categorie::TYPE_SUPPLIER, null, null, null, null, 1);
$c = new Categorie($db);
@@ -2101,7 +2104,7 @@ else
if (! empty($conf->multicurrency->enabled))
{
print ' ';
- print ''.fieldLabel('Currency','multicurrency_code').' ';
+ print ''.$form->editfieldkey('Currency', 'multicurrency_code', '', $object, 0).' ';
print '';
print $form->selectMultiCurrency(($object->multicurrency_code ? $object->multicurrency_code : $conf->currency), 'multicurrency_code', 1);
print ' ';
@@ -2118,15 +2121,15 @@ else
// Webservices url/key
if (!empty($conf->syncsupplierwebservices->enabled)) {
- print ''.fieldLabel('WebServiceURL','webservices_url').' ';
+ print ''.$form->editfieldkey('WebServiceURL', 'webservices_url', '', $object, 0).' ';
print ''.fieldLabel('WebServiceKey','webservices_key').' ';
+ print ''.$form->editfieldkey('WebServiceKey', 'webservices_key', '', $object, 0).' ';
print '';
- print ''.fieldLabel('Logo','photoinput').' ';
+ print ''.$form->editfieldkey('Logo', 'photoinput', '', $object, 0).' ';
print '';
if ($object->logo) print $form->showphoto('societe',$object);
$caneditfield=1;
@@ -2144,7 +2147,7 @@ else
// Assign sale representative
print ' ';
- print ''.fieldLabel('AllocateCommercial','commercial_id').' ';
+ print ''.$form->editfieldkey('AllocateCommercial', 'commercial_id', '', $object, 0).' ';
print '';
$userlist = $form->select_dolusers('', '', 0, null, 0, '', '', 0, 0, 0, '', 0, '', '', 0, 1);
$arrayselected = GETPOST('commercial', 'array');
@@ -2155,7 +2158,7 @@ else
print '
';
print '';
- dol_fiche_end();
+ dol_fiche_end();
print '';
print '
';
@@ -2524,7 +2527,7 @@ else
if (! empty($conf->multicurrency->enabled))
{
print '
';
- print ''.fieldLabel('Currency','multicurrency_code').' ';
+ print ''.$form->editfieldkey('Currency', 'multicurrency_code', '', $object, 0).' ';
print '';
print !empty($object->multicurrency_code) ? currency_name($object->multicurrency_code,1) : '';
print ' ';
@@ -2626,7 +2629,7 @@ else
else
{
$langs->load("mails");
- print '
';
+ print '
';
}
if ($user->rights->societe->creer)
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/societe/project.php b/htdocs/societe/project.php
index 97e6817f5d5..5d8936060ac 100644
--- a/htdocs/societe/project.php
+++ b/htdocs/societe/project.php
@@ -133,7 +133,7 @@ if ($socid)
/* }
else
{
- print '
'.$langs->trans("AddProject").' ';
+ print '
'.$langs->trans("AddProject").' ';
}
}
diff --git a/htdocs/stripe/class/actions_stripe.class.php b/htdocs/stripe/class/actions_stripe.class.php
index 69dc4e33307..a7a2e56ecff 100644
--- a/htdocs/stripe/class/actions_stripe.class.php
+++ b/htdocs/stripe/class/actions_stripe.class.php
@@ -215,23 +215,23 @@ class ActionsStripeconnect
}
else
{
- print '
'.$langs->trans("StripeConnectPay").' ';
+ print '
'.$langs->trans("StripeConnectPay").' ';
}
}
elseif ($resteapayer == 0)
{
- print '
'.$langs->trans("StripeConnectPay").' ';
+ print '
'.$langs->trans("StripeConnectPay").' ';
}
}
else {
- print '
'.$langs->trans("StripeConnectPay").' ';
+ print '
'.$langs->trans("StripeConnectPay").' ';
}
}
elseif (is_object($object) && $object->element == 'invoice_supplier'){
- print '
'.$langs->trans("StripeConnectPay").' ';
+ print '
'.$langs->trans("StripeConnectPay").' ';
}
elseif (is_object($object) && $object->element == 'member'){
- print '
'.$langs->trans("StripeAutoSubscription").' ';
+ print '
'.$langs->trans("StripeAutoSubscription").' ';
}
return 0;
}
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." '.$objp->ref." '.dol_print_date($db->jdate($objp->dp))." \n";
print ''.$objp->paiement_type.' '.$objp->num_paiement." \n";
print ''.price($objp->amount).' ';
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index 99e99517f75..b1133616eeb 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -1169,10 +1169,9 @@ if ($action == 'create')
}
// Multicurrency
- if (! empty($conf->multicurrency->enabled))
- {
+ if (! empty($conf->multicurrency->enabled)) {
print ' ';
- print ''.fieldLabel('Currency','multicurrency_code').' ';
+ print ''.$form->editfieldkey('Currency', 'multicurrency_code', '', $object, 0).' ';
print '';
print $form->selectMultiCurrency($currency_code, 'multicurrency_code');
print ' ';
@@ -1524,7 +1523,7 @@ if ($action == 'create')
print '';
print '';
print '';
- print fieldLabel('Currency','multicurrency_code');
+ print $form->editfieldkey('Currency', 'multicurrency_code', '', $object, 0);
print ' ';
if ($action != 'editmulticurrencycode' && ! empty($object->brouillon))
print 'id . '">' . img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1) . ' ';
print '';
print '';
- print fieldLabel('CurrencyRate','multicurrency_tx');
+ print $form->editfieldkey('CurrencyRate', 'multicurrency_tx', '', $object, 0);
print ' ';
if ($action != 'editmulticurrencyrate' && ! empty($object->brouillon) && $object->multicurrency_code && $object->multicurrency_code != $conf->currency)
print 'id . '">' . img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1) . ' ' . fieldLabel('MulticurrencyAmountHT','multicurrency_total_ht') . ' ';
+ print '' . $form->editfieldkey('MulticurrencyAmountHT', 'multicurrency_total_ht', '', $object, 0) . ' ';
print '' . price($object->multicurrency_total_ht, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . ' ';
print '' . fieldLabel('MulticurrencyAmountVAT','multicurrency_total_tva') . ' ';
+ print '' . $form->editfieldkey('MulticurrencyAmountVAT', 'multicurrency_total_tva', '', $object, 0) . ' ';
print '' . price($object->multicurrency_total_tva, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . ' ';
print '' . fieldLabel('MulticurrencyAmountTTC','multicurrency_total_ttc') . ' ';
+ print '' . $form->editfieldkey('MulticurrencyAmountTTC', 'multicurrency_total_ttc', '', $object, 0) . ' ';
print '' . price($object->multicurrency_total_ttc, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . ' ';
print ''.$langs->trans('Validate').' ';
+ // else print ''.$langs->trans('Validate').' ';
}
// Edit
@@ -1797,7 +1796,7 @@ if ($action == 'create')
if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->supplier_proposal->send_advance) {
print '';
} else
- print '';
+ print '';
}
// Create an order
diff --git a/htdocs/supplier_proposal/list.php b/htdocs/supplier_proposal/list.php
index 795564984d4..5986ac65f14 100644
--- a/htdocs/supplier_proposal/list.php
+++ b/htdocs/supplier_proposal/list.php
@@ -396,6 +396,7 @@ if ($resql)
// List of mass actions available
$arrayofmassactions = array(
+ 'generate_doc'=>$langs->trans("Generate"),
//'presend'=>$langs->trans("SendByMail"),
'builddoc'=>$langs->trans("PDFMerge"),
);
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);
?>
![](\"".DOL_URL_ROOT.'/opensurvey/img/medaille.png'."\")
" . $langs->trans('TheBestChoice') . ": ".$meilleursujet." " . $langs->trans("with") . " ".$meilleurecolonne."" . $vote_str . ".\n";
+ print "