| '.$langs->trans("EnableShowLogo").' | ';
if ($edit) {
print ajax_constantonoff('MAIN_SHOW_LOGO', array(), null, 0, 0, 1);
//print $form->selectyesno('MAIN_SHOW_LOGO', $conf->global->MAIN_SHOW_LOGO, 1);
diff --git a/htdocs/core/modules/modCommande.class.php b/htdocs/core/modules/modCommande.class.php
index 29f4dc60515..6a44075822c 100644
--- a/htdocs/core/modules/modCommande.class.php
+++ b/htdocs/core/modules/modCommande.class.php
@@ -368,7 +368,7 @@ class modCommande extends DolibarrModules
//Import CPV Lines
$r++;
$this->import_code[$r] = 'commande_lines_'.$r;
- $this->import_label[$r] = 'OrderLine';
+ $this->import_label[$r] = 'SaleOrderLines';
$this->import_icon[$r] = $this->picto;
$this->import_entities_array[$r] = [];
$this->import_tables_array[$r] = ['cd' => MAIN_DB_PREFIX.'commandedet', 'extra' => MAIN_DB_PREFIX.'commandedet_extrafields'];
diff --git a/htdocs/core/modules/modFournisseur.class.php b/htdocs/core/modules/modFournisseur.class.php
index 46d6dd7bead..71f101014ad 100644
--- a/htdocs/core/modules/modFournisseur.class.php
+++ b/htdocs/core/modules/modFournisseur.class.php
@@ -666,7 +666,7 @@ class modFournisseur extends DolibarrModules
$r++;
$this->import_code[$r] = $this->rights_class.'_'.$r;
- $this->import_label[$r] = "Supplier Invoice"; // Translation key
+ $this->import_label[$r] = "SupplierInvoices"; // Translation key
$this->import_icon[$r] = $this->picto;
$this->import_entities_array[$r] = []; // We define here only fields that use another icon that the one defined into import_icon
$this->import_tables_array[$r] = ['f' => MAIN_DB_PREFIX.'facture_fourn', 'extra' => MAIN_DB_PREFIX.'facture_fourn_extrafields'];
@@ -759,7 +759,7 @@ class modFournisseur extends DolibarrModules
//Import Supplier Invoice Lines
$r++;
$this->import_code[$r] = $this->rights_class.'_'.$r;
- $this->import_label[$r] = "Supplier Invoice Lines"; // Translation key
+ $this->import_label[$r] = "SupplierInvoiceLines"; // Translation key
$this->import_icon[$r] = $this->picto;
$this->import_entities_array[$r] = []; // We define here only fields that use another icon that the one defined into import_icon
$this->import_tables_array[$r] = ['fd' => MAIN_DB_PREFIX.'facture_fourn_det', 'extra' => MAIN_DB_PREFIX.'facture_fourn_det_extrafields'];
@@ -839,7 +839,7 @@ class modFournisseur extends DolibarrModules
//Import Purchase Orders
$r++;
$this->import_code[$r] = 'commande_fournisseur_'.$r;
- $this->import_label[$r] = 'Purchase Orders';
+ $this->import_label[$r] = 'SuppliersOrders';
$this->import_icon[$r] = $this->picto;
$this->import_entities_array[$r] = [];
$this->import_tables_array[$r] = ['c' => MAIN_DB_PREFIX.'commande_fournisseur', 'extra' => MAIN_DB_PREFIX.'commande_fournisseur_extrafields'];
@@ -922,7 +922,7 @@ class modFournisseur extends DolibarrModules
//Import PO Lines
$r++;
$this->import_code[$r] = 'commande_fournisseurdet_'.$r;
- $this->import_label[$r] = 'PO Lines';
+ $this->import_label[$r] = 'PurchaseOrderLines';
$this->import_icon[$r] = $this->picto;
$this->import_entities_array[$r] = [];
$this->import_tables_array[$r] = ['cd' => MAIN_DB_PREFIX.'commande_fournisseurdet', 'extra' => MAIN_DB_PREFIX.'commande_fournisseurdet_extrafields'];
diff --git a/htdocs/core/modules/modPropale.class.php b/htdocs/core/modules/modPropale.class.php
index 687d8ea3669..c13a92e744e 100644
--- a/htdocs/core/modules/modPropale.class.php
+++ b/htdocs/core/modules/modPropale.class.php
@@ -350,7 +350,7 @@ class modPropale extends DolibarrModules
//Import Proposal Lines
$r++;
$this->import_code[$r] = $this->rights_class.'line_'.$r;
- $this->import_label[$r] = "ProposalLine"; // Translation key
+ $this->import_label[$r] = "ProposalLines"; // Translation key
$this->import_icon[$r] = $this->picto;
$this->import_entities_array[$r] = []; // We define here only fields that use another icon that the one defined into import_icon
$this->import_tables_array[$r] = [
diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang
index a1e04809a36..11b6f5bf1fe 100644
--- a/htdocs/langs/en_US/bills.lang
+++ b/htdocs/langs/en_US/bills.lang
@@ -52,11 +52,12 @@ Invoices=Invoices
InvoiceLine=Invoice line
InvoiceCustomer=Customer invoice
CustomerInvoice=Customer invoice
-CustomersInvoices=Customers invoices
+CustomersInvoices=Customer invoices
SupplierInvoice=Vendor invoice
-SuppliersInvoices=Vendors invoices
+SuppliersInvoices=Vendor invoices
+SupplierInvoiceLines=Vendor invoice lines
SupplierBill=Vendor invoice
-SupplierBills=suppliers invoices
+SupplierBills=Vendor invoices
Payment=Payment
PaymentBack=Refund
CustomerInvoicePaymentBack=Refund
diff --git a/htdocs/langs/en_US/orders.lang b/htdocs/langs/en_US/orders.lang
index ad91e1eef63..87d196eb22f 100644
--- a/htdocs/langs/en_US/orders.lang
+++ b/htdocs/langs/en_US/orders.lang
@@ -16,6 +16,8 @@ ToOrder=Make order
MakeOrder=Make order
SupplierOrder=Purchase order
SuppliersOrders=Purchase orders
+SaleOrderLines=Sale order lines
+PurchaseOrderLines=Puchase order lines
SuppliersOrdersRunning=Current purchase orders
CustomerOrder=Sales Order
CustomersOrders=Sales Orders
diff --git a/htdocs/langs/en_US/propal.lang b/htdocs/langs/en_US/propal.lang
index 557df2f840f..edbc08236d3 100644
--- a/htdocs/langs/en_US/propal.lang
+++ b/htdocs/langs/en_US/propal.lang
@@ -59,6 +59,7 @@ ConfirmClonePropal=Are you sure you want to clone the commercial proposal %s<
ConfirmReOpenProp=Are you sure you want to open back the commercial proposal %s?
ProposalsAndProposalsLines=Commercial proposal and lines
ProposalLine=Proposal line
+ProposalLines=Proposal lines
AvailabilityPeriod=Availability delay
SetAvailability=Set availability delay
AfterOrder=after order
diff --git a/htdocs/langs/en_US/suppliers.lang b/htdocs/langs/en_US/suppliers.lang
index 03b03c75269..ca9ee174d29 100644
--- a/htdocs/langs/en_US/suppliers.lang
+++ b/htdocs/langs/en_US/suppliers.lang
@@ -1,6 +1,7 @@
# Dolibarr language file - Source file is en_US - vendors
Suppliers=Vendors
SuppliersInvoice=Vendor invoice
+SupplierInvoices=Vendor invoices
ShowSupplierInvoice=Show Vendor Invoice
NewSupplier=New vendor
History=History
diff --git a/htdocs/recruitment/recruitmentcandidature_card.php b/htdocs/recruitment/recruitmentcandidature_card.php
index 653b38c90b3..7c2f5e2ebe7 100644
--- a/htdocs/recruitment/recruitmentcandidature_card.php
+++ b/htdocs/recruitment/recruitmentcandidature_card.php
@@ -555,55 +555,6 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
print dol_get_fiche_end();
-
- /*
- * Lines
- */
-
- if (!empty($object->table_element_line)) {
- // Show object lines
- $result = $object->getLinesArray();
-
- print ' \n";
- }
-
-
// Buttons for actions
if ($action != 'presend' && $action != 'editline') {
diff --git a/htdocs/recruitment/recruitmentjobposition_applications.php b/htdocs/recruitment/recruitmentjobposition_applications.php
index c126c594c3a..54efe31e14c 100644
--- a/htdocs/recruitment/recruitmentjobposition_applications.php
+++ b/htdocs/recruitment/recruitmentjobposition_applications.php
@@ -412,54 +412,6 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
print dol_get_fiche_end();
-
- /*
- * Lines
- */
-
- if (!empty($object->table_element_line)) {
- // Show object lines
- $result = $object->getLinesArray();
-
- print ' \n";
- }
-
print '
'.$langs->trans("FeatureNotYetAvailable");
}
diff --git a/htdocs/recruitment/recruitmentjobposition_card.php b/htdocs/recruitment/recruitmentjobposition_card.php
index 2b832b3b467..ba97712513a 100644
--- a/htdocs/recruitment/recruitmentjobposition_card.php
+++ b/htdocs/recruitment/recruitmentjobposition_card.php
@@ -440,54 +440,6 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
print dol_get_fiche_end();
- /*
- * Lines
- */
-
- if (!empty($object->table_element_line)) {
- // Show object lines
- $result = $object->getLinesArray();
-
- print ' \n";
- }
-
-
// Buttons for actions
if ($action != 'presend' && $action != 'editline') {
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 6ac6d35e4eb..8ff860a33bc 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -960,7 +960,7 @@ if (empty($type) || $type == 'f') {
if ($user->rights->societe->client->voir || $socid) {
$moreforfilter .= '';
$moreforfilter .= img_picto('', 'user', 'class="pictofixedwidth"');
- $moreforfilter .= $formother->select_salesrepresentatives($search_sale, 'search_sale', $user, 0, $langs->trans('SalesRepresentatives'), 'maxwidth300', 1);
+ $moreforfilter .= $formother->select_salesrepresentatives($search_sale, 'search_sale', $user, 0, $langs->trans('SalesRepresentatives'), ($conf->dol_optimize_smallscreen ? 'maxwidth200' : 'maxwidth300'), 1);
$moreforfilter .= ' ';
}
if ($moreforfilter) {
diff --git a/htdocs/stripe/admin/stripe.php b/htdocs/stripe/admin/stripe.php
index edac0a79833..1e4e2ae9c1d 100644
--- a/htdocs/stripe/admin/stripe.php
+++ b/htdocs/stripe/admin/stripe.php
@@ -37,7 +37,10 @@ $servicename = 'Stripe';
// Load translation files required by the page
$langs->loadLangs(array('admin', 'other', 'paypal', 'paybox', 'stripe'));
-if (!$user->admin) {
+if (empty($user->admin)) {
+ accessforbidden();
+}
+if (empty($conf->stripe->enabled)) {
accessforbidden();
}
@@ -207,24 +210,21 @@ print ' | |
';
if (empty($conf->stripeconnect->enabled)) {
print '