diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 5fa4a3adfaa..885081e84a1 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -46,7 +46,7 @@ require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
// Load translation files required by the page
-$langs->loadLangs(array("orders", 'sendings', 'deliveries', 'companies', 'compta', 'bills', 'stocks'));
+$langs->loadLangs(array("orders", 'sendings', 'deliveries', 'companies', 'compta', 'bills', 'stocks', 'products'));
$action = GETPOST('action', 'aZ09');
$massaction = GETPOST('massaction', 'alpha');
diff --git a/htdocs/compta/accounting-files.php b/htdocs/compta/accounting-files.php
index 734d21b1c87..02098e986ba 100644
--- a/htdocs/compta/accounting-files.php
+++ b/htdocs/compta/accounting-files.php
@@ -549,16 +549,17 @@ if (!empty($conf->multicompany->enabled) && is_object($mc))
print '
';
$listofchoices = array(
- 'selectinvoices'=>array('label'=>'Invoices', 'lang'=>'bills'),
- 'selectsupplierinvoices'=>array('label'=>'BillsSuppliers', 'lang'=>'bills'),
- 'selectexpensereports'=>array('label'=>'ExpenseReports', 'lang'=>'trips'),
- 'selectdonations'=>array('label'=>'Donations', 'lang'=>'donation'),
- 'selectpaymentsofsalaries'=>array('label'=>'SalariesPayments', 'lang'=>'salaries'),
- 'selectsocialcontributions'=>array('label'=>'SocialContributions'),
- 'selectvariouspayment'=>array('label'=>'VariousPayment'),
- 'selectloanspayment'=>array('label'=>'PaymentLoan'),
+ 'selectinvoices'=>array('label'=>'Invoices', 'lang'=>'bills', 'enabled' => !empty($conf->facture->enabled)),
+ 'selectsupplierinvoices'=>array('label'=>'BillsSuppliers', 'lang'=>'bills', 'enabled' => !empty($conf->supplier_invoice->enabled)),
+ 'selectexpensereports'=>array('label'=>'ExpenseReports', 'lang'=>'trips', 'enabled' => !empty($conf->expensereport->enabled)),
+ 'selectdonations'=>array('label'=>'Donations', 'lang'=>'donation', 'enabled' => !empty($conf->don->enabled)),
+ 'selectsocialcontributions'=>array('label'=>'SocialContributions', 'enabled' => !empty($conf->tax->enabled)),
+ 'selectpaymentsofsalaries'=>array('label'=>'SalariesPayments', 'lang'=>'salaries', 'enabled' => !empty($conf->salaries->enabled)),
+ 'selectvariouspayment'=>array('label'=>'VariousPayment', 'enabled' => !empty($conf->banque->enabled)),
+ 'selectloanspayment'=>array('label'=>'PaymentLoan', 'enabled' => !empty($conf->loan->enabled)),
);
foreach ($listofchoices as $choice => $val) {
+ if (empty($val['enabled'])) continue; // list not qualified
$checked = (((!GETPOSTISSET('search') && $action != 'searchfiles') || GETPOST($choice)) ? ' checked="checked"' : '');
print '
';
}
diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php
index a03fd03ffef..83393a52cb6 100644
--- a/htdocs/compta/paiement.php
+++ b/htdocs/compta/paiement.php
@@ -710,10 +710,10 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
// Price
print ''.price($sign * $objp->total_ttc).' | ';
- // Received or paid back
+ // Received + already paid
print ''.price($sign * $paiement);
- if ($creditnotes) print '+'.price($creditnotes);
- if ($deposits) print '+'.price($deposits);
+ if ($creditnotes) print '+'.price($creditnotes).'';
+ if ($deposits) print '+'.price($deposits).'';
print ' | ';
// Remain to take or to pay back
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 3906d376243..678ed9bbbd6 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -374,8 +374,7 @@ if (empty($reshook))
$action = 'create';
}
}
- } elseif ($action == 'classin' && $user->rights->contrat->creer)
- {
+ } elseif ($action == 'classin' && $user->rights->contrat->creer) {
$object->setProject(GETPOST('projectid'));
}
diff --git a/htdocs/core/boxes/box_fournisseurs.php b/htdocs/core/boxes/box_fournisseurs.php
index 44e2682585e..7d1c72b3036 100644
--- a/htdocs/core/boxes/box_fournisseurs.php
+++ b/htdocs/core/boxes/box_fournisseurs.php
@@ -137,10 +137,13 @@ class box_fournisseurs extends ModeleBoxes
$line++;
}
- if ($num == 0) $this->info_box_contents[$line][0] = array(
- 'td' => 'class="center opacitymedium"',
- 'text'=>$langs->trans("NoRecordedSuppliers"),
- );
+ if ($num == 0) {
+ $langs->load("suppliers");
+ $this->info_box_contents[$line][0] = array(
+ 'td' => 'class="center opacitymedium"',
+ 'text'=>$langs->trans("NoRecordedSuppliers"),
+ );
+ }
$this->db->free($result);
} else {
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 0a9b7838e97..6afca0c8d35 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -6852,6 +6852,7 @@ abstract class CommonObject
break;
}
+ // Output value of the current field
if ($extrafields->attributes[$this->table_element]['type'][$key] == 'separate')
{
$extrafields_collapse_num = '';
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index e1d64da77f1..3bf47b7da7a 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -4615,7 +4615,7 @@ function print_fleche_navigation($page, $file, $options = '', $nextpage = 0, $be
}
if ((int) $limit > 0 && empty($hideselectlimit))
{
- $pagesizechoices = '10:10,15:15,20:20,30:30,40:40,50:50,100:100,250:250,500:500,1000:1000,5000:5000';
+ $pagesizechoices = '10:10,15:15,20:20,30:30,40:40,50:50,100:100,250:250,500:500,1000:1000,5000:5000,25000:25000';
//$pagesizechoices.=',0:'.$langs->trans("All"); // Not yet supported
//$pagesizechoices.=',2:2';
if (!empty($conf->global->MAIN_PAGESIZE_CHOICES)) $pagesizechoices = $conf->global->MAIN_PAGESIZE_CHOICES;
diff --git a/htdocs/core/lib/sendings.lib.php b/htdocs/core/lib/sendings.lib.php
index cf1d1793a88..0bb0db6afd1 100644
--- a/htdocs/core/lib/sendings.lib.php
+++ b/htdocs/core/lib/sendings.lib.php
@@ -81,7 +81,7 @@ function shipping_prepare_head($object)
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
- $upload_dir = $conf->commande->dir_output."/".dol_sanitizeFileName($object->ref);
+ $upload_dir = $conf->expedition->dir_output."/sending/".dol_sanitizeFileName($object->ref);
$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
$nbLinks = Link::count($db, $object->element, $object->id);
$head[$h][0] = DOL_URL_ROOT.'/expedition/document.php?id='.$object->id;
diff --git a/htdocs/core/tpl/object_discounts.tpl.php b/htdocs/core/tpl/object_discounts.tpl.php
index 7bc98d12278..293ea333682 100644
--- a/htdocs/core/tpl/object_discounts.tpl.php
+++ b/htdocs/core/tpl/object_discounts.tpl.php
@@ -62,7 +62,11 @@ if ($absolute_discount > 0) {
$text .= ' ('.$addabsolutediscount.')';
}
- print ''.$text.'
';
+ if ($isNewObject) {
+ print '
'.$text;
+ } else {
+ print ''.$text.'
';
+ }
} else {
// Discount available of type fixed amount (not credit note)
$more = '('.$addabsolutediscount.')';
@@ -85,7 +89,11 @@ if ($absolute_creditnote > 0) {
$text .= '('.$addabsolutediscount.')';
}
- print ''.$text.'
';
+ if ($isNewObject) {
+ print '
'.$text;
+ } else {
+ print ''.$text.'
';
+ }
} else { // We can add a credit note on a down payment or standard invoice or situation invoice
// There is credit notes discounts available
$more = $isInvoice && !$isNewObject ? ' ('.$viewabsolutediscount.')' : '';
diff --git a/htdocs/expedition/contact.php b/htdocs/expedition/contact.php
index c6b10bd6967..d15e267b285 100644
--- a/htdocs/expedition/contact.php
+++ b/htdocs/expedition/contact.php
@@ -80,7 +80,9 @@ if ($action == 'addcontact' && $user->rights->expedition->creer)
{
if ($result > 0 && $id > 0)
{
- $result = $objectsrc->add_contact(GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'), $_POST["type"], $_POST["source"]);
+ $contactid = (GETPOST('userid', 'int') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
+ $typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
+ $result = $objectsrc->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
}
if ($result >= 0)
diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php
index eaae2438b55..28c0673ef17 100644
--- a/htdocs/expedition/list.php
+++ b/htdocs/expedition/list.php
@@ -36,7 +36,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
// Load translation files required by the page
-$langs->loadLangs(array("sendings", "deliveries", 'companies', 'bills'));
+$langs->loadLangs(array("sendings", "deliveries", 'companies', 'bills', 'products'));
$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'shipmentlist'; // To manage different context of search
@@ -340,7 +340,7 @@ if ($resql)
if ($search_product_category != '') $param .= '&search_product_category='.urlencode($search_product_category);
if ($search_categ_cus > 0) $param .= '&search_categ_cus='.urlencode($search_categ_cus);
- if ($search_status != '') $param .= '&viewstatut='.urlencode($search_status);
+ if ($search_status != '') $param .= '&search_status='.urlencode($search_status);
if ($optioncss != '') $param .= '&optioncss='.urlencode($optioncss);
// Add $param from extra fields
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index e680e55868a..2b77801fee3 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -43,7 +43,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
-$langs->loadLangs(array("orders", "sendings", 'deliveries', 'companies', 'compta', 'bills', 'projects', 'suppliers'));
+$langs->loadLangs(array("orders", "sendings", 'deliveries', 'companies', 'compta', 'bills', 'projects', 'suppliers', 'products'));
$action = GETPOST('action', 'aZ09');
$massaction = GETPOST('massaction', 'alpha');
diff --git a/htdocs/reception/contact.php b/htdocs/reception/contact.php
index 908f7a441be..ad8811a4e1f 100644
--- a/htdocs/reception/contact.php
+++ b/htdocs/reception/contact.php
@@ -67,11 +67,6 @@ if ($id > 0 || !empty($ref))
$objectsrc = new CommandeFournisseur($db);
$objectsrc->fetch($object->$typeobject->id);
}
- if ($typeobject == 'propal' && $object->$typeobject->id && !empty($conf->propal->enabled))
- {
- $objectsrc = new Propal($db);
- $objectsrc->fetch($object->$typeobject->id);
- }
}
@@ -83,7 +78,9 @@ if ($action == 'addcontact' && $user->rights->reception->creer)
{
if ($result > 0 && $id > 0)
{
- $result = $objectsrc->add_contact(GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'), $_POST["type"], $_POST["source"]);
+ $contactid = (GETPOST('userid', 'int') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
+ $typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
+ $result = $objectsrc->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
}
if ($result >= 0)
diff --git a/htdocs/reception/list.php b/htdocs/reception/list.php
index ec08c7ba94a..30d31291a74 100644
--- a/htdocs/reception/list.php
+++ b/htdocs/reception/list.php
@@ -505,7 +505,7 @@ if ($resql)
if ($search_town) $param .= "&search_town=".urlencode($search_town);
if ($search_zip) $param .= "&search_zip=".urlencode($search_zip);
if ($search_state) $param .= "&search_state=".urlencode($search_state);
- if ($search_status) $param .= "&search_status=".urlencode($search_status);
+ if ($search_status != '') $param .= "&search_status=".urlencode($search_status);
if ($search_country) $param .= "&search_country=".urlencode($search_country);
if ($search_type_thirdparty) $param .= "&search_type_thirdparty=".urlencode($search_type_thirdparty);
if ($search_ref_supplier) $param .= "&search_ref_supplier=".urlencode($search_ref_supplier);
diff --git a/htdocs/user/list.php b/htdocs/user/list.php
index acf0f93a1b3..d3012f855f2 100644
--- a/htdocs/user/list.php
+++ b/htdocs/user/list.php
@@ -345,7 +345,7 @@ if ($catid > 0) $sql .= " AND cu.fk_categorie = ".((int) $catid);
if ($catid == -2) $sql .= " AND cu.fk_categorie IS NULL";
if ($search_categ > 0) $sql .= " AND cu.fk_categorie = ".$db->escape($search_categ);
if ($search_categ == -2) $sql .= " AND cu.fk_categorie IS NULL";
-if ($mode == 'employee' && empty($user->rights->salaries->readall)) $sql .= " AND s.fk_user IN (".join(',', $childids).")";
+if ($mode == 'employee' && empty($user->rights->salaries->readall)) $sql .= " AND u.fk_user IN (".join(',', $childids).")";
// Add where from extra fields
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
// Add where from hooks
diff --git a/scripts/invoices/email_unpaid_invoices_to_customers.php b/scripts/invoices/email_unpaid_invoices_to_customers.php
index a569a34d0fa..5d4d3ff3e64 100755
--- a/scripts/invoices/email_unpaid_invoices_to_customers.php
+++ b/scripts/invoices/email_unpaid_invoices_to_customers.php
@@ -153,7 +153,7 @@ if ($resql) {
if ($targettype == 'contacts') {
$oldcid = $obj->cid;
}
- $oldlang = $obj->lang;
+ $oldlang = $obj->default_lang;
$oldtarget = (empty($obj->cfirstname) && empty($obj->clastname)) ? $obj->name : ($obj->clastname." ".$obj->cfirstname);
$message = '';
$total = 0;