mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2025-02-20 13:46:52 +01:00
fix page titles
Conflicts: htdocs/compta/bank/annuel.php htdocs/contact/list.php htdocs/product/stock/movement_list.php htdocs/user/list.php
This commit is contained in:
parent
6365bdb35c
commit
4c5e05e411
|
|
@ -1526,8 +1526,12 @@ if (!empty($conf->project->enabled)) {
|
|||
$formproject = new FormProjets($db);
|
||||
}
|
||||
|
||||
$title = $langs->trans('Proposal')." - ".$langs->trans('Card');
|
||||
$title = $object->ref." - ".$langs->trans('Card');
|
||||
if ($action == 'create') {
|
||||
$title = $langs->trans("NewPropal");
|
||||
}
|
||||
$help_url = 'EN:Commercial_Proposals|FR:Proposition_commerciale|ES:Presupuestos|DE:Modul_Angebote';
|
||||
|
||||
llxHeader('', $title, $help_url);
|
||||
|
||||
$now = dol_now();
|
||||
|
|
|
|||
|
|
@ -112,8 +112,9 @@ if ($action == 'addcontact' && $user->rights->propale->creer) {
|
|||
/*
|
||||
* View
|
||||
*/
|
||||
$title = $langs->trans('Proposal')." - ".$langs->trans('ContactsAddresses');
|
||||
$title = $object->ref." - ".$langs->trans('ContactsAddresses');
|
||||
$help_url = "EN:Commercial_Proposals|FR:Proposition_commerciale|ES:Presupuestos";
|
||||
|
||||
llxHeader('', $title, $help_url);
|
||||
|
||||
$form = new Form($db);
|
||||
|
|
|
|||
|
|
@ -104,7 +104,7 @@ if ($object->id > 0) {
|
|||
/*
|
||||
* View
|
||||
*/
|
||||
$title = $langs->trans('Proposal')." - ".$langs->trans('Documents');
|
||||
$title = $object->ref." - ".$langs->trans('Documents');
|
||||
$help_url = 'EN:Commercial_Proposals|FR:Proposition_commerciale|ES:Presupuestos';
|
||||
llxHeader('', $title, $help_url);
|
||||
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@ restrictedArea($user, 'propal', $object->id);
|
|||
|
||||
$form = new Form($db);
|
||||
|
||||
$title = $langs->trans('Proposal')." - ".$langs->trans('Info');
|
||||
$title = $object->ref." - ".$langs->trans('Info');
|
||||
$help_url = 'EN:Commercial_Proposals|FR:Proposition_commerciale|ES:Presupuestos';
|
||||
llxHeader('', $title, $help_url);
|
||||
|
||||
|
|
|
|||
|
|
@ -520,8 +520,9 @@ $companystatic = new Societe($db);
|
|||
$projectstatic = new Project($db);
|
||||
$formcompany = new FormCompany($db);
|
||||
|
||||
$title = $langs->trans('ListOfProposals');
|
||||
$help_url = 'EN:Commercial_Proposals|FR:Proposition_commerciale|ES:Presupuestos';
|
||||
//llxHeader('',$langs->trans('Proposal'),$help_url);
|
||||
llxHeader('', $title, $help_url);
|
||||
|
||||
$sql = 'SELECT';
|
||||
if ($sall || $search_product_category > 0 || $search_user > 0) {
|
||||
|
|
@ -786,7 +787,7 @@ if ($resql) {
|
|||
exit;
|
||||
}
|
||||
|
||||
llxHeader('', $langs->trans('Proposal'), $help_url);
|
||||
// llxHeader('', $langs->trans('Proposal'), $help_url);
|
||||
|
||||
$param = '&search_status='.urlencode($search_status);
|
||||
if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
|
||||
|
|
|
|||
|
|
@ -81,8 +81,9 @@ if (empty($reshook)) {
|
|||
|
||||
$form = new Form($db);
|
||||
|
||||
$title = $langs->trans('Proposal')." - ".$langs->trans('Notes');
|
||||
$title = $object->ref." - ".$langs->trans('Notes');
|
||||
$help_url = 'EN:Commercial_Proposals|FR:Proposition_commerciale|ES:Presupuestos';
|
||||
|
||||
llxHeader('', $title, $help_url);
|
||||
|
||||
if ($object->id > 0) {
|
||||
|
|
|
|||
|
|
@ -1484,8 +1484,12 @@ if (empty($reshook)) {
|
|||
* View
|
||||
*/
|
||||
|
||||
$title = $langs->trans('Order')." - ".$langs->trans('Card');
|
||||
$title = $object->ref." - ".$langs->trans('Card');
|
||||
if ($action == 'create') {
|
||||
$title = $langs->trans("NewOrder");
|
||||
}
|
||||
$help_url = 'EN:Customers_Orders|FR:Commandes_Clients|ES:Pedidos de clientes|DE:Modul_Kundenaufträge';
|
||||
|
||||
llxHeader('', $title, $help_url);
|
||||
|
||||
$form = new Form($db);
|
||||
|
|
|
|||
|
|
@ -96,10 +96,6 @@ if ($action == 'addcontact' && $user->rights->commande->creer) {
|
|||
/*
|
||||
* View
|
||||
*/
|
||||
$title = $langs->trans('Order')." - ".$langs->trans('ContactsAddresses');
|
||||
$help_url = 'EN:Customers_Orders|FR:Commandes_Clients|ES:Pedidos de clientes|DE:Modul_Kundenaufträge';
|
||||
llxHeader('', $title, $help_url);
|
||||
|
||||
$form = new Form($db);
|
||||
$formcompany = new FormCompany($db);
|
||||
$formother = new FormOther($db);
|
||||
|
|
@ -117,6 +113,10 @@ if ($id > 0 || !empty($ref)) {
|
|||
if ($object->fetch($id, $ref) > 0) {
|
||||
$object->fetch_thirdparty();
|
||||
|
||||
$title = $object->ref." - ".$langs->trans('ContactsAddresses');
|
||||
$help_url = 'EN:Customers_Orders|FR:Commandes_Clients|ES:Pedidos de clientes|DE:Modul_Kundenaufträge';
|
||||
llxHeader('', $title, $help_url);
|
||||
|
||||
$head = commande_prepare_head($object);
|
||||
print dol_get_fiche_head($head, 'contact', $langs->trans("CustomerOrder"), -1, 'order');
|
||||
|
||||
|
|
|
|||
|
|
@ -96,7 +96,7 @@ include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
|
|||
/*
|
||||
* View
|
||||
*/
|
||||
$title = $langs->trans('Order')." - ".$langs->trans('Documents');
|
||||
$title = $object->ref." - ".$langs->trans('Documents');
|
||||
$help_url = 'EN:Customers_Orders|FR:Commandes_Clients|ES:Pedidos de clientes|DE:Modul_Kundenaufträge';
|
||||
llxHeader('', $title, $help_url);
|
||||
|
||||
|
|
|
|||
|
|
@ -77,7 +77,7 @@ if (empty($reshook)) {
|
|||
/*
|
||||
* View
|
||||
*/
|
||||
$title = $langs->trans('Order')." - ".$langs->trans('Notes');
|
||||
$title = $object->ref." - ".$langs->trans('Notes');
|
||||
$help_url = 'EN:Customers_Orders|FR:Commandes_Clients|ES:Pedidos de clientes|DE:Modul_Kundenaufträge';
|
||||
llxHeader('', $title, $help_url);
|
||||
|
||||
|
|
|
|||
|
|
@ -61,10 +61,6 @@ if (!$year_start) {
|
|||
* View
|
||||
*/
|
||||
|
||||
$title = $langs->trans("FinancialAccount").' - '.$langs->trans("IOMonthlyReporting");
|
||||
$helpurl = "";
|
||||
llxHeader('', $title, $helpurl);
|
||||
|
||||
$form = new Form($db);
|
||||
|
||||
// Get account informations
|
||||
|
|
@ -82,6 +78,10 @@ $annee = '';
|
|||
$totentrees = array();
|
||||
$totsorties = array();
|
||||
|
||||
$title = $object->ref.' - '.$langs->trans("IOMonthlyReporting");
|
||||
$helpurl = "";
|
||||
llxHeader('', $title, $helpurl);
|
||||
|
||||
// Ce rapport de tresorerie est base sur llx_bank (car doit inclure les transactions sans facture)
|
||||
// plutot que sur llx_paiement + llx_paiementfourn
|
||||
|
||||
|
|
|
|||
|
|
@ -512,7 +512,7 @@ $buttonreconcile = '';
|
|||
$morehtmlref = '';
|
||||
|
||||
if ($id > 0 || !empty($ref)) {
|
||||
$title = $langs->trans("FinancialAccount").' - '.$langs->trans("Transactions");
|
||||
$title = $object->ref.' - '.$langs->trans("Transactions");
|
||||
$helpurl = "";
|
||||
llxHeader('', $title, $helpurl);
|
||||
|
||||
|
|
|
|||
|
|
@ -332,18 +332,16 @@ if (!empty($conf->accounting->enabled)) {
|
|||
|
||||
$countrynotdefined = $langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')';
|
||||
|
||||
$title = $langs->trans("FinancialAccount")." - ".$langs->trans("Card");
|
||||
|
||||
$help_url = 'EN:Module_Banks_and_Cash|FR:Module_Banques_et_Caisses|ES:Módulo_Bancos_y_Cajas|DE:Modul_Banken_und_Barbestände';
|
||||
|
||||
llxHeader("", $title, $help_url);
|
||||
|
||||
|
||||
// Creation
|
||||
|
||||
if ($action == 'create') {
|
||||
$object = new Account($db);
|
||||
|
||||
$title = $langs->trans("NewFinancialAccount");
|
||||
llxHeader("", $title, $help_url);
|
||||
|
||||
print load_fiche_titre($langs->trans("NewFinancialAccount"), '', 'bank_account');
|
||||
|
||||
if ($conf->use_javascript_ajax) {
|
||||
|
|
@ -615,6 +613,9 @@ if ($action == 'create') {
|
|||
$_GET["id"] = $object->id;
|
||||
}
|
||||
|
||||
$title = $object->ref." - ".$langs->trans("Card");
|
||||
llxHeader("", $title, $help_url);
|
||||
|
||||
// Show tabs
|
||||
$head = bank_prepare_head($object);
|
||||
print dol_get_fiche_head($head, 'bankname', $langs->trans("FinancialAccount"), -1, 'account');
|
||||
|
|
|
|||
|
|
@ -93,8 +93,7 @@ include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
|
|||
* View
|
||||
*/
|
||||
|
||||
$title = $langs->trans("FinancialAccount").' - '.$langs->trans("Documents");
|
||||
|
||||
$title = $object->ref.' - '.$langs->trans("Documents");
|
||||
$help_url = "EN:Module_Banks_and_Cash|FR:Module_Banques_et_Caisses";
|
||||
|
||||
llxHeader("", $title, $help_url);
|
||||
|
|
|
|||
|
|
@ -55,11 +55,6 @@ $error = 0;
|
|||
/*
|
||||
* View
|
||||
*/
|
||||
|
||||
$title = $langs->trans("FinancialAccount").' - '.$langs->trans("Graph");
|
||||
$helpurl = "";
|
||||
llxHeader('', $title, $helpurl);
|
||||
|
||||
$form = new Form($db);
|
||||
|
||||
$datetime = dol_now();
|
||||
|
|
@ -83,6 +78,10 @@ if (GETPOST("ref")) {
|
|||
$account = $object->id;
|
||||
}
|
||||
|
||||
$title = $object->ref.' - '.$langs->trans("Graph");
|
||||
$helpurl = "";
|
||||
llxHeader('', $title, $helpurl);
|
||||
|
||||
$result = dol_mkdir($conf->bank->dir_temp);
|
||||
if ($result < 0) {
|
||||
$langs->load("errors");
|
||||
|
|
|
|||
|
|
@ -197,11 +197,6 @@ if ($action == 'confirm_editbankreceipt' && !empty($oldbankreceipt) && !empty($n
|
|||
/*
|
||||
* View
|
||||
*/
|
||||
|
||||
$title = $langs->trans("FinancialAccount").' - '.$langs->trans("AccountStatements");
|
||||
$helpurl = "";
|
||||
llxHeader('', $title, $helpurl);
|
||||
|
||||
$form = new Form($db);
|
||||
$societestatic = new Societe($db);
|
||||
$chargestatic = new ChargeSociales($db);
|
||||
|
|
@ -253,6 +248,10 @@ if (empty($numref)) {
|
|||
$numrows = $db->num_rows($result);
|
||||
$i = 0;
|
||||
|
||||
$title = $object->ref.' - '.$langs->trans("AccountStatements");
|
||||
$helpurl = "";
|
||||
llxHeader('', $title, $helpurl);
|
||||
|
||||
// Onglets
|
||||
$head = bank_prepare_head($object);
|
||||
print dol_get_fiche_head($head, 'statement', $langs->trans("FinancialAccount"), 0, 'account');
|
||||
|
|
|
|||
|
|
@ -57,11 +57,6 @@ $hookmanager->initHooks(array('banktreso', 'globalcard'));
|
|||
/*
|
||||
* View
|
||||
*/
|
||||
|
||||
$title = $langs->trans("FinancialAccount").' - '.$langs->trans("PlannedTransactions");
|
||||
$helpurl = "";
|
||||
llxHeader('', $title, $helpurl);
|
||||
|
||||
$societestatic = new Societe($db);
|
||||
$facturestatic = new Facture($db);
|
||||
$facturefournstatic = new FactureFournisseur($db);
|
||||
|
|
@ -85,6 +80,9 @@ if (GETPOST("account") || GETPOST("ref")) {
|
|||
$_GET["account"] = $object->id;
|
||||
}
|
||||
|
||||
$title = $object->ref.' - '.$langs->trans("PlannedTransactions");
|
||||
$helpurl = "";
|
||||
llxHeader('', $title, $helpurl);
|
||||
|
||||
// Onglets
|
||||
$head = bank_prepare_head($object);
|
||||
|
|
|
|||
|
|
@ -304,9 +304,6 @@ if ($action == 'confirm_clone' && $confirm == 'yes' && ($user->rights->banque->m
|
|||
/*
|
||||
* View
|
||||
*/
|
||||
|
||||
llxHeader("", $langs->trans("VariousPayment"));
|
||||
|
||||
$form = new Form($db);
|
||||
if (!empty($conf->accounting->enabled)) {
|
||||
$formaccounting = new FormAccounting($db);
|
||||
|
|
@ -324,6 +321,13 @@ if ($id) {
|
|||
}
|
||||
}
|
||||
|
||||
$title = $object->ref." - ".$langs->trans('Card');
|
||||
if ($action == 'create') {
|
||||
$title = $langs->trans("NewVariousPayment");
|
||||
}
|
||||
$help_url = 'EN:Module_Suppliers_Invoices|FR:Module_Fournisseurs_Factures|ES:Módulo_Facturas_de_proveedores|DE:Modul_Lieferantenrechnungen';
|
||||
llxHeader('', $title, $help_url);
|
||||
|
||||
$options = array();
|
||||
|
||||
// Load bank groups
|
||||
|
|
|
|||
|
|
@ -284,7 +284,7 @@ if ($resql) {
|
|||
}
|
||||
|
||||
// must be place behind the last "header(...)" call
|
||||
llxHeader();
|
||||
llxHeader('', $langs->trans("VariousPayments"));
|
||||
|
||||
$i = 0;
|
||||
$total = 0;
|
||||
|
|
|
|||
|
|
@ -2880,8 +2880,10 @@ if (!empty($conf->project->enabled)) {
|
|||
|
||||
$now = dol_now();
|
||||
|
||||
$title = $langs->trans('InvoiceCustomer')." - ".$langs->trans('Card');
|
||||
|
||||
$title = $object->ref." - ".$langs->trans('Card');
|
||||
if ($action == 'create') {
|
||||
$title = $langs->trans("NewBill");
|
||||
}
|
||||
$help_url = "EN:Customers_Invoices|FR:Factures_Clients|ES:Facturas_a_clientes";
|
||||
|
||||
llxHeader('', $title, $help_url);
|
||||
|
|
|
|||
|
|
@ -100,7 +100,7 @@ if ($action == 'addcontact' && $user->rights->facture->creer) {
|
|||
* View
|
||||
*/
|
||||
|
||||
$title = $langs->trans('InvoiceCustomer')." - ".$langs->trans('ContactsAddresses');
|
||||
$title = $object->ref." - ".$langs->trans('ContactsAddresses');
|
||||
$helpurl = "EN:Customers_Invoices|FR:Factures_Clients|ES:Facturas_a_clientes";
|
||||
llxHeader('', $title, $helpurl);
|
||||
|
||||
|
|
|
|||
|
|
@ -100,8 +100,7 @@ if (empty($object->id)) {
|
|||
exit;
|
||||
}
|
||||
|
||||
$title = $langs->trans('InvoiceCustomer')." - ".$langs->trans('Documents');
|
||||
|
||||
$title = $object->ref." - ".$langs->trans('Documents');
|
||||
$help_url = "EN:Customers_Invoices|FR:Factures_Clients|ES:Facturas_a_clientes";
|
||||
|
||||
llxHeader('', $title, $help_url);
|
||||
|
|
|
|||
|
|
@ -65,7 +65,7 @@ $result = restrictedArea($user, 'facture', $object->id, '', '', 'fk_soc', 'rowid
|
|||
|
||||
$form = new Form($db);
|
||||
|
||||
$title = $langs->trans('InvoiceCustomer')." - ".$langs->trans('Info');
|
||||
$title = $object->ref." - ".$langs->trans('Info');
|
||||
$help_url = "EN:Customers_Invoices|FR:Factures_Clients|ES:Facturas_a_clientes";
|
||||
|
||||
llxHeader('', $title, $help_url);
|
||||
|
|
|
|||
|
|
@ -85,7 +85,7 @@ if (empty($object->id)) {
|
|||
exit;
|
||||
}
|
||||
|
||||
$title = $langs->trans('InvoiceCustomer')." - ".$langs->trans('Notes');
|
||||
$title = $object->ref." - ".$langs->trans('Notes');
|
||||
$helpurl = "EN:Customers_Invoices|FR:Factures_Clients|ES:Facturas_a_clientes";
|
||||
llxHeader('', $title, $helpurl);
|
||||
|
||||
|
|
|
|||
|
|
@ -132,6 +132,7 @@ if (empty($page) || $page < 0 || GETPOST('button_search', 'alpha') || GETPOST('b
|
|||
}
|
||||
$offset = $limit * $page;
|
||||
|
||||
|
||||
$title = (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("Contacts") : $langs->trans("ContactsAddresses"));
|
||||
if ($type == "p") {
|
||||
if (empty($contextpage) || $contextpage == 'contactlist') {
|
||||
|
|
@ -345,8 +346,6 @@ if (!empty($conf->global->THIRDPARTY_ENABLE_PROSPECTION_ON_ALTERNATIVE_ADRESSES)
|
|||
$contactstatic->loadCacheOfProspStatus();
|
||||
}
|
||||
|
||||
$title = (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("Contacts") : $langs->trans("ContactsAddresses"));
|
||||
|
||||
// Select every potentiels, and note each potentiels which fit in search parameters
|
||||
$tab_level = array();
|
||||
$sql = "SELECT code, label, sortorder";
|
||||
|
|
|
|||
|
|
@ -212,7 +212,7 @@ function group_prepare_head($object)
|
|||
$head = array();
|
||||
|
||||
$head[$h][0] = DOL_URL_ROOT.'/user/group/card.php?id='.$object->id;
|
||||
$head[$h][1] = $langs->trans("GroupCard");
|
||||
$head[$h][1] = $langs->trans("Card");
|
||||
$head[$h][2] = 'group';
|
||||
$h++;
|
||||
|
||||
|
|
|
|||
|
|
@ -804,9 +804,13 @@ if (empty($reshook)) {
|
|||
* View
|
||||
*/
|
||||
|
||||
$title = $langs->trans("Shipment");
|
||||
if ($action == 'create2') {
|
||||
$title = $langs->trans("CreateShipment");
|
||||
}
|
||||
$help_url = 'EN:Module_Shipments|FR:Module_Expéditions|ES:Módulo_Expediciones|DE:Modul_Lieferungen';
|
||||
|
||||
llxHeader('', $langs->trans('Shipment'), 'Expedition', $help_url);
|
||||
llxHeader('', $title, 'Expedition', $help_url);
|
||||
|
||||
if (empty($action)) {
|
||||
$action = 'view';
|
||||
|
|
|
|||
|
|
@ -231,7 +231,7 @@ if (!empty($conf->project->enabled)) {
|
|||
$formproject = new FormProjets($db);
|
||||
}
|
||||
|
||||
$title = $langs->trans('Order')." - ".$langs->trans('Shipments');
|
||||
$title = $object->ref." - ".$langs->trans('Shipments');
|
||||
$help_url = 'EN:Customers_Orders|FR:Commandes_Clients|ES:Pedidos de clientes|DE:Modul_Kundenaufträge';
|
||||
llxHeader('', $title, $help_url);
|
||||
|
||||
|
|
|
|||
|
|
@ -1538,7 +1538,10 @@ if (!empty($conf->project->enabled)) {
|
|||
$formproject = new FormProjets($db);
|
||||
}
|
||||
|
||||
$title = $langs->trans('SupplierOrder')." - ".$langs->trans('Card');
|
||||
$title = $object->ref." - ".$langs->trans('Card');
|
||||
if ($action == 'create') {
|
||||
$title = $langs->trans("NewOrderSupplier");
|
||||
}
|
||||
$help_url = 'EN:Module_Suppliers_Orders|FR:CommandeFournisseur|ES:Módulo_Pedidos_a_proveedores';
|
||||
llxHeader('', $title, $help_url);
|
||||
|
||||
|
|
|
|||
|
|
@ -99,10 +99,6 @@ if ($action == 'addcontact' && ($user->rights->fournisseur->commande->creer || $
|
|||
/*
|
||||
* View
|
||||
*/
|
||||
$title = $langs->trans('SupplierOrder')." - ".$langs->trans('ContactsAddresses');
|
||||
$help_url = 'EN:Module_Suppliers_Orders|FR:CommandeFournisseur|ES:Módulo_Pedidos_a_proveedores';
|
||||
llxHeader('', $title, $help_url);
|
||||
|
||||
$form = new Form($db);
|
||||
$formcompany = new FormCompany($db);
|
||||
$contactstatic = new Contact($db);
|
||||
|
|
@ -121,6 +117,10 @@ if ($id > 0 || !empty($ref)) {
|
|||
if ($object->fetch($id, $ref) > 0) {
|
||||
$object->fetch_thirdparty();
|
||||
|
||||
$title = $object->ref." - ".$langs->trans('ContactsAddresses');
|
||||
$help_url = 'EN:Module_Suppliers_Orders|FR:CommandeFournisseur|ES:Módulo_Pedidos_a_proveedores';
|
||||
llxHeader('', $title, $help_url);
|
||||
|
||||
$head = ordersupplier_prepare_head($object);
|
||||
print dol_get_fiche_head($head, 'contact', $langs->trans("SupplierOrder"), -1, 'order');
|
||||
|
||||
|
|
|
|||
|
|
@ -505,10 +505,11 @@ $formproduct = new FormProduct($db);
|
|||
$warehouse_static = new Entrepot($db);
|
||||
$supplierorderdispatch = new CommandeFournisseurDispatch($db);
|
||||
|
||||
$title = $object->ref." - ".$langs->trans('OrderDispatch');
|
||||
$help_url = 'EN:Module_Suppliers_Orders|FR:CommandeFournisseur|ES:Módulo_Pedidos_a_proveedores';
|
||||
$morejs = array('/fourn/js/lib_dispatch.js.php');
|
||||
|
||||
llxHeader('', $langs->trans("OrderDispatch"), $help_url, '', 0, 0, $morejs);
|
||||
llxHeader('', $title, $help_url, '', 0, 0, $morejs);
|
||||
|
||||
if ($id > 0 || !empty($ref)) {
|
||||
$soc = new Societe($db);
|
||||
|
|
|
|||
|
|
@ -98,7 +98,7 @@ include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
|
|||
|
||||
$form = new Form($db);
|
||||
|
||||
$title = $langs->trans('SupplierOrder')." - ".$langs->trans('Documents');
|
||||
$title = $object->ref." - ".$langs->trans('Documents');
|
||||
$help_url = 'EN:Module_Suppliers_Orders|FR:CommandeFournisseur|ES:Módulo_Pedidos_a_proveedores';
|
||||
llxHeader('', $title, $help_url);
|
||||
|
||||
|
|
|
|||
|
|
@ -113,7 +113,7 @@ if ($id > 0 || !empty($ref)) {
|
|||
$object->info($object->id);
|
||||
}
|
||||
|
||||
$title = $langs->trans("SupplierOrder").' - '.$langs->trans('Info').' - '.$object->ref.' '.$object->name;
|
||||
$title = $object->ref.' - '.$langs->trans('Info').' - '.$object->ref.' '.$object->name;
|
||||
if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/projectnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
|
||||
$title = $object->ref.' '.$object->name.' - '.$langs->trans("Info");
|
||||
}
|
||||
|
|
|
|||
|
|
@ -69,7 +69,7 @@ if (empty($reshook)) {
|
|||
/*
|
||||
* View
|
||||
*/
|
||||
$title = $langs->trans('SupplierOrder')." - ".$langs->trans('Notes');
|
||||
$title = $object->ref." - ".$langs->trans('Notes');
|
||||
$help_url = 'EN:Module_Suppliers_Orders|FR:CommandeFournisseur|ES:Módulo_Pedidos_a_proveedores';
|
||||
llxHeader('', $title, $help_url);
|
||||
|
||||
|
|
|
|||
|
|
@ -1894,7 +1894,10 @@ if (!empty($conf->project->enabled)) {
|
|||
|
||||
$now = dol_now();
|
||||
|
||||
$title = $langs->trans('SupplierInvoice')." - ".$langs->trans('Card');
|
||||
$title = $object->ref." - ".$langs->trans('Card');
|
||||
if ($action == 'create') {
|
||||
$title = $langs->trans("NewSupplierInvoice");
|
||||
}
|
||||
$help_url = 'EN:Module_Suppliers_Invoices|FR:Module_Fournisseurs_Factures|ES:Módulo_Facturas_de_proveedores|DE:Modul_Lieferantenrechnungen';
|
||||
llxHeader('', $title, $help_url);
|
||||
|
||||
|
|
@ -1902,7 +1905,7 @@ llxHeader('', $title, $help_url);
|
|||
if ($action == 'create') {
|
||||
$facturestatic = new FactureFournisseur($db);
|
||||
|
||||
print load_fiche_titre($langs->trans('NewBill'), '', 'supplier_invoice');
|
||||
print load_fiche_titre($langs->trans('NewSupplierInvoice'), '', 'supplier_invoice');
|
||||
|
||||
dol_htmloutput_events();
|
||||
|
||||
|
|
|
|||
|
|
@ -99,11 +99,6 @@ if ($action == 'addcontact' && ($user->rights->fournisseur->facture->creer || $u
|
|||
/*
|
||||
* View
|
||||
*/
|
||||
|
||||
$title = $langs->trans('SupplierInvoice')." - ".$langs->trans('ContactsAddresses');
|
||||
$helpurl = "EN:Module_Suppliers_Invoices|FR:Module_Fournisseurs_Factures|ES:Módulo_Facturas_de_proveedores";
|
||||
llxHeader('', $title, $helpurl);
|
||||
|
||||
$form = new Form($db);
|
||||
$formcompany = new FormCompany($db);
|
||||
$contactstatic = new Contact($db);
|
||||
|
|
@ -122,6 +117,10 @@ if ($id > 0 || !empty($ref)) {
|
|||
|
||||
$alreadypaid = $object->getSommePaiement();
|
||||
|
||||
$title = $object->ref." - ".$langs->trans('ContactsAddresses');
|
||||
$helpurl = "EN:Module_Suppliers_Invoices|FR:Module_Fournisseurs_Factures|ES:Módulo_Facturas_de_proveedores";
|
||||
llxHeader('', $title, $helpurl);
|
||||
|
||||
$head = facturefourn_prepare_head($object);
|
||||
|
||||
print dol_get_fiche_head($head, 'contact', $langs->trans('SupplierInvoice'), -1, 'supplier_invoice');
|
||||
|
|
|
|||
|
|
@ -94,7 +94,7 @@ include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
|
|||
|
||||
$form = new Form($db);
|
||||
|
||||
$title = $langs->trans('SupplierInvoice')." - ".$langs->trans('Documents');
|
||||
$title = $object->ref." - ".$langs->trans('Documents');
|
||||
$helpurl = "EN:Module_Suppliers_Invoices|FR:Module_Fournisseurs_Factures|ES:Módulo_Facturas_de_proveedores";
|
||||
llxHeader('', $title, $helpurl);
|
||||
|
||||
|
|
|
|||
|
|
@ -54,18 +54,15 @@ $object = new FactureFournisseur($db);
|
|||
*/
|
||||
|
||||
$form = new Form($db);
|
||||
|
||||
$title = $langs->trans('SupplierInvoice')." - ".$langs->trans('Info');
|
||||
$helpurl = "EN:Module_Suppliers_Invoices|FR:Module_Fournisseurs_Factures|ES:Módulo_Facturas_de_proveedores";
|
||||
llxHeader('', $title, $helpurl);
|
||||
|
||||
$object->fetch($id, $ref);
|
||||
$object->fetch_thirdparty();
|
||||
|
||||
$object->info($object->id);
|
||||
|
||||
$alreadypaid = $object->getSommePaiement();
|
||||
|
||||
$title = $object->ref." - ".$langs->trans('Info');
|
||||
$helpurl = "EN:Module_Suppliers_Invoices|FR:Module_Fournisseurs_Factures|ES:Módulo_Facturas_de_proveedores";
|
||||
llxHeader('', $title, $helpurl);
|
||||
|
||||
$head = facturefourn_prepare_head($object);
|
||||
$titre = $langs->trans('SupplierInvoice');
|
||||
print dol_get_fiche_head($head, 'info', $langs->trans('SupplierInvoice'), -1, 'supplier_invoice');
|
||||
|
|
|
|||
|
|
@ -83,7 +83,7 @@ if ($action == 'setlabel' && ($user->rights->fournisseur->facture->creer || $use
|
|||
|
||||
$form = new Form($db);
|
||||
|
||||
$title = $langs->trans('SupplierInvoice')." - ".$langs->trans('Notes');
|
||||
$title = $object->ref." - ".$langs->trans('Notes');
|
||||
$helpurl = "EN:Module_Suppliers_Invoices|FR:Module_Fournisseurs_Factures|ES:Módulo_Facturas_de_proveedores";
|
||||
llxHeader('', $title, $helpurl);
|
||||
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ SuppliersInvoice=Vendor invoice
|
|||
SupplierInvoices=Vendor invoices
|
||||
ShowSupplierInvoice=Show Vendor Invoice
|
||||
NewSupplier=New vendor
|
||||
NewSupplierInvoice = New vendor invoice
|
||||
History=History
|
||||
ListOfSuppliers=List of vendors
|
||||
ShowSupplier=Show vendor
|
||||
|
|
|
|||
|
|
@ -1190,15 +1190,24 @@ if (!empty($conf->accounting->enabled)) {
|
|||
|
||||
|
||||
$title = $langs->trans('ProductServiceCard');
|
||||
|
||||
$help_url = '';
|
||||
$shortlabel = dol_trunc($object->label, 16);
|
||||
if (GETPOST("type") == '0' || ($object->type == Product::TYPE_PRODUCT)) {
|
||||
$title = $langs->trans('Product')." ".$shortlabel." - ".$langs->trans('Card');
|
||||
$help_url = 'EN:Module_Products|FR:Module_Produits|ES:Módulo_Productos|DE:Modul_Produkte';
|
||||
if ($action == 'create') {
|
||||
$title = $langs->trans("NewProduct");
|
||||
} else {
|
||||
$title = $langs->trans('Product')." ".$shortlabel." - ".$langs->trans('Card');
|
||||
$help_url = 'EN:Module_Products|FR:Module_Produits|ES:Módulo_Productos|DE:Modul_Produkte';
|
||||
}
|
||||
}
|
||||
if (GETPOST("type") == '1' || ($object->type == Product::TYPE_SERVICE)) {
|
||||
$title = $langs->trans('Service')." ".$shortlabel." - ".$langs->trans('Card');
|
||||
$help_url = 'EN:Module_Services_En|FR:Module_Services|ES:Módulo_Servicios|DE:Modul_Leistungen';
|
||||
if ($action == 'create') {
|
||||
$title = $langs->trans("NewService");
|
||||
} else {
|
||||
$title = $langs->trans('Service')." ".$shortlabel." - ".$langs->trans('Card');
|
||||
$help_url = 'EN:Module_Services_En|FR:Module_Services|ES:Módulo_Servicios|DE:Modul_Leistungen';
|
||||
}
|
||||
}
|
||||
|
||||
llxHeader('', $title, $help_url);
|
||||
|
|
|
|||
|
|
@ -387,16 +387,14 @@ if (empty($reshook)) {
|
|||
* View
|
||||
*/
|
||||
|
||||
$title = $langs->trans("ProductsAndServices");
|
||||
$title = $langs->trans("ListOfProductsAndServices");
|
||||
|
||||
if ($search_type != '' && $search_type != '-1') {
|
||||
if ($search_type == 1) {
|
||||
$texte = $langs->trans("Services");
|
||||
$title = $langs->trans("ListOfServices");
|
||||
} else {
|
||||
$texte = $langs->trans("Products");
|
||||
$title = $langs->trans("ListOfProducts");
|
||||
}
|
||||
} else {
|
||||
$texte = $langs->trans("ProductsAndServices");
|
||||
}
|
||||
|
||||
$sql = 'SELECT DISTINCT p.rowid, p.ref, p.label, p.fk_product_type, p.barcode, p.price, p.tva_tx, p.price_ttc, p.price_base_type, p.entity,';
|
||||
|
|
@ -790,7 +788,7 @@ if ($resql) {
|
|||
$picto = 'service';
|
||||
}
|
||||
|
||||
print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, $picto, 0, $newcardbutton, '', $limit, 0, 0, 1);
|
||||
print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, $picto, 0, $newcardbutton, '', $limit, 0, 0, 1);
|
||||
|
||||
$topicmail = "Information";
|
||||
$modelmail = "product";
|
||||
|
|
|
|||
|
|
@ -281,8 +281,13 @@ if (!empty($conf->project->enabled)) {
|
|||
$formproject = new FormProjets($db);
|
||||
}
|
||||
|
||||
$title = $langs->trans("WarehouseCard");
|
||||
if ($action == 'create') {
|
||||
$title = $langs->trans("NewWarehouse");
|
||||
}
|
||||
|
||||
$help_url = 'EN:Module_Stocks_En|FR:Module_Stock|ES:Módulo_Stocks';
|
||||
llxHeader("", $langs->trans("WarehouseCard"), $help_url);
|
||||
llxHeader("", $title, $help_url);
|
||||
|
||||
|
||||
if ($action == 'create') {
|
||||
|
|
|
|||
|
|
@ -777,7 +777,11 @@ if ($msid) {
|
|||
} else {
|
||||
$title = $langs->trans("ListOfStockMovements");
|
||||
if ($id) {
|
||||
$title .= ' ('.$langs->trans("ForThisWarehouse").')';
|
||||
if (!empty($object->ref)) {
|
||||
$title .= ' ('.$object->ref.')';
|
||||
} else {
|
||||
$title .= ' ('.$langs->trans("ForThisWarehouse").')';
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -483,6 +483,7 @@ $title = $langs->trans("Project").' - '.$object->ref.(!empty($object->thirdparty
|
|||
if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/projectnameonly/', $conf->global->MAIN_HTML_TITLE)) {
|
||||
$title = $object->ref.(!empty($object->thirdparty->name) ? ' - '.$object->thirdparty->name : '').(!empty($object->title) ? ' - '.$object->title : '');
|
||||
}
|
||||
|
||||
$help_url = "EN:Module_Projects|FR:Module_Projets|ES:Módulo_Proyectos|DE:Modul_Projekte";
|
||||
|
||||
llxHeader("", $title, $help_url);
|
||||
|
|
|
|||
|
|
@ -97,7 +97,7 @@ include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
|
|||
* View
|
||||
*/
|
||||
|
||||
$title = $langs->trans('Project').' - '.$langs->trans('Document').' - '.$object->ref.' '.$object->name;
|
||||
$title = $langs->trans('Documents').' - '.$object->ref.' '.$object->name;
|
||||
if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/projectnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
|
||||
$title = $object->ref.' '.$object->name.' - '.$langs->trans('Document');
|
||||
}
|
||||
|
|
|
|||
|
|
@ -109,8 +109,8 @@ if ($id > 0 || !empty($ref)) {
|
|||
}
|
||||
$object->info($object->id);
|
||||
}
|
||||
|
||||
$title = $langs->trans("Project").' - '.$object->ref.' '.$object->name;
|
||||
$agenda = (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) ? '/'.$langs->trans("Agenda") : '';
|
||||
$title = $langs->trans('Events').$agenda.' - '.$object->ref.' '.$object->name;
|
||||
if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/projectnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
|
||||
$title = $object->ref.' '.$object->name.' - '.$langs->trans("Info");
|
||||
}
|
||||
|
|
|
|||
|
|
@ -69,7 +69,7 @@ if (empty($reshook)) {
|
|||
* View
|
||||
*/
|
||||
|
||||
$title = $langs->trans("Project").' - '.$langs->trans("Note").' - '.$object->ref.' '.$object->name;
|
||||
$title = $langs->trans("Notes").' - '.$object->ref.' '.$object->name;
|
||||
if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/projectnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
|
||||
$title = $object->ref.' '.$object->name.' - '.$langs->trans("Note");
|
||||
}
|
||||
|
|
|
|||
|
|
@ -402,10 +402,13 @@ $projectstatic = new Project($db);
|
|||
$taskstatic = new Task($db);
|
||||
$userstatic = new User($db);
|
||||
|
||||
$title = $langs->trans("Project").' - '.$langs->trans("Tasks").' - '.$object->ref.' '.$object->name;
|
||||
$title = $langs->trans("Tasks").' - '.$object->ref.' '.$object->name;
|
||||
if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/projectnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
|
||||
$title = $object->ref.' '.$object->name.' - '.$langs->trans("Tasks");
|
||||
}
|
||||
if ($action == 'create') {
|
||||
$title = $langs->trans("NewTask");
|
||||
}
|
||||
$help_url = "EN:Module_Projects|FR:Module_Projets|ES:Módulo_Proyectos";
|
||||
|
||||
llxHeader("", $title, $help_url);
|
||||
|
|
|
|||
|
|
@ -140,13 +140,19 @@ if (!empty($project_ref) && !empty($withproject)) {
|
|||
/*
|
||||
* View
|
||||
*/
|
||||
|
||||
llxHeader('', $langs->trans("Task"));
|
||||
|
||||
$form = new Form($db);
|
||||
$formcompany = new FormCompany($db);
|
||||
$contactstatic = new Contact($db);
|
||||
$userstatic = new User($db);
|
||||
$result = $projectstatic->fetch($object->fk_project);
|
||||
|
||||
$title = $object->ref . ' - ' . $langs->trans("Contacts");
|
||||
if (!empty($withproject)) {
|
||||
$title .= ' | ' . $langs->trans("Project") . (!empty($projectstatic->ref) ? ': '.$projectstatic->ref : '') ;
|
||||
}
|
||||
$help_url = '';
|
||||
|
||||
llxHeader('', $title, $help_url);
|
||||
|
||||
|
||||
/* *************************************************************************** */
|
||||
|
|
@ -162,7 +168,6 @@ if ($id > 0 || !empty($ref)) {
|
|||
}
|
||||
$id = $object->id; // So when doing a search from ref, id is also set correctly.
|
||||
|
||||
$result = $projectstatic->fetch($object->fk_project);
|
||||
if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_PROJECT) && method_exists($projectstatic, 'fetchComments') && empty($projectstatic->comments)) {
|
||||
$projectstatic->fetchComments();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -119,10 +119,15 @@ include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
|
|||
/*
|
||||
* View
|
||||
*/
|
||||
|
||||
$form = new Form($db);
|
||||
|
||||
llxHeader('', $langs->trans('Task'));
|
||||
$title = $object->ref . ' - ' . $langs->trans("Documents");
|
||||
if (!empty($withproject)) {
|
||||
$title .= ' | ' . $langs->trans("Project") . (!empty($projectstatic->ref) ? ': '.$projectstatic->ref : '') ;
|
||||
}
|
||||
$help_url = '';
|
||||
|
||||
llxHeader('', $title, $help_url);
|
||||
|
||||
if ($object->id > 0) {
|
||||
$projectstatic->fetch_thirdparty();
|
||||
|
|
|
|||
|
|
@ -110,14 +110,19 @@ if (empty($reshook)) {
|
|||
/*
|
||||
* View
|
||||
*/
|
||||
|
||||
llxHeader('', $langs->trans("Task"));
|
||||
|
||||
$form = new Form($db);
|
||||
$userstatic = new User($db);
|
||||
|
||||
$now = dol_now();
|
||||
|
||||
$title = $object->ref . ' - ' . $langs->trans("Notes");
|
||||
if (!empty($withproject)) {
|
||||
$title .= ' | ' . $langs->trans("Project") . (!empty($projectstatic->ref) ? ': '.$projectstatic->ref : '') ;
|
||||
}
|
||||
$help_url = '';
|
||||
|
||||
llxHeader('', $title, $help_url);
|
||||
|
||||
if ($object->id > 0) {
|
||||
$userWrite = $projectstatic->restrictedProjectArea($user, 'write');
|
||||
|
||||
|
|
|
|||
|
|
@ -192,12 +192,18 @@ if ($action == 'remove_file' && $user->rights->projet->creer) {
|
|||
/*
|
||||
* View
|
||||
*/
|
||||
|
||||
llxHeader('', $langs->trans("Task"));
|
||||
|
||||
$form = new Form($db);
|
||||
$formother = new FormOther($db);
|
||||
$formfile = new FormFile($db);
|
||||
$result = $projectstatic->fetch($object->fk_project);
|
||||
|
||||
$title = $object->ref;
|
||||
if (!empty($withproject)) {
|
||||
$title .= ' | ' . $langs->trans("Project") . (!empty($projectstatic->ref) ? ': '.$projectstatic->ref : '') ;
|
||||
}
|
||||
$help_url = '';
|
||||
|
||||
llxHeader('', $title, $help_url);
|
||||
|
||||
if ($id > 0 || !empty($ref)) {
|
||||
$res = $object->fetch_optionals();
|
||||
|
|
@ -205,7 +211,7 @@ if ($id > 0 || !empty($ref)) {
|
|||
$object->fetchComments();
|
||||
}
|
||||
|
||||
$result = $projectstatic->fetch($object->fk_project);
|
||||
|
||||
if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_PROJECT) && method_exists($projectstatic, 'fetchComments') && empty($projectstatic->comments)) {
|
||||
$projectstatic->fetchComments();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -702,15 +702,20 @@ if ($action == 'confirm_generateinter') {
|
|||
/*
|
||||
* View
|
||||
*/
|
||||
|
||||
$arrayofselected = is_array($toselect) ? $toselect : array();
|
||||
|
||||
llxHeader("", $langs->trans("Task"));
|
||||
|
||||
$form = new Form($db);
|
||||
$formother = new FormOther($db);
|
||||
$formproject = new FormProjets($db);
|
||||
$userstatic = new User($db);
|
||||
//$result = $projectstatic->fetch($object->fk_project);
|
||||
$arrayofselected = is_array($toselect) ? $toselect : array();
|
||||
|
||||
$title = $object->ref . ' - ' . $langs->trans("TimeSpent");
|
||||
if (!empty($withproject)) {
|
||||
$title .= ' | ' . $langs->trans("Project") . (!empty($projectstatic->ref) ? ': '.$projectstatic->ref : '') ;
|
||||
}
|
||||
$help_url = '';
|
||||
|
||||
llxHeader('', $title, $help_url);
|
||||
|
||||
if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser > 0) {
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -959,10 +959,12 @@ if ($socid > 0 && empty($object->id)) {
|
|||
}
|
||||
|
||||
$title = $langs->trans("ThirdParty");
|
||||
if ($action == 'create') {
|
||||
$title = $langs->trans("NewThirdParty");
|
||||
}
|
||||
if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
|
||||
$title = $object->name." - ".$langs->trans('Card');
|
||||
}
|
||||
|
||||
$help_url = 'EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas|DE:Modul_Geschäftspartner';
|
||||
|
||||
llxHeader('', $title, $help_url);
|
||||
|
|
|
|||
|
|
@ -731,7 +731,7 @@ if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && (
|
|||
}
|
||||
|
||||
$help_url = 'EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
|
||||
llxHeader('', $langs->trans("ThirdParty"), $help_url);
|
||||
llxHeader('', $title, $help_url);
|
||||
|
||||
$param = '';
|
||||
if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
|
||||
|
|
|
|||
|
|
@ -683,7 +683,7 @@ if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',
|
|||
$title = $object->name." - ".$langs->trans('PaymentInformation');
|
||||
}
|
||||
|
||||
llxHeader();
|
||||
llxHeader('', $title, $help_url);
|
||||
|
||||
$head = societe_prepare_head($object);
|
||||
|
||||
|
|
|
|||
|
|
@ -1122,7 +1122,10 @@ if (empty($reshook)) {
|
|||
/*
|
||||
* View
|
||||
*/
|
||||
$title = $langs->trans('CommRequest')." - ".$langs->trans('Card');
|
||||
$title = $object->ref." - ".$langs->trans('Card');
|
||||
if ($action == 'create') {
|
||||
$title = $langs->trans("SupplierProposalNew");
|
||||
}
|
||||
$help_url = 'EN:Ask_Price_Supplier|FR:Demande_de_prix_fournisseur';
|
||||
llxHeader('', $title, $help_url);
|
||||
|
||||
|
|
@ -1141,7 +1144,7 @@ $now = dol_now();
|
|||
if ($action == 'create') {
|
||||
$currency_code = $conf->currency;
|
||||
|
||||
print load_fiche_titre($langs->trans("NewAskPrice"), '', 'supplier_proposal');
|
||||
print load_fiche_titre($langs->trans("SupplierProposalNew"), '', 'supplier_proposal');
|
||||
|
||||
$soc = new Societe($db);
|
||||
if ($socid > 0) {
|
||||
|
|
|
|||
|
|
@ -98,10 +98,6 @@ if ($action == 'addcontact' && $permissiontoedit) {
|
|||
/*
|
||||
* View
|
||||
*/
|
||||
$title = $langs->trans('CommRequest')." - ".$langs->trans('ContactsAddresses');
|
||||
$help_url = 'EN:Ask_Price_Supplier|FR:Demande_de_prix_fournisseur';
|
||||
llxHeader('', $title, $help_url);
|
||||
|
||||
$form = new Form($db);
|
||||
$formcompany = new FormCompany($db);
|
||||
$contactstatic = new Contact($db);
|
||||
|
|
@ -120,6 +116,10 @@ if ($id > 0 || !empty($ref)) {
|
|||
if ($object->fetch($id, $ref) > 0) {
|
||||
$object->fetch_thirdparty();
|
||||
|
||||
$title = $object->ref." - ".$langs->trans('ContactsAddresses');
|
||||
$help_url = 'EN:Ask_Price_Supplier|FR:Demande_de_prix_fournisseur';
|
||||
llxHeader('', $title, $help_url);
|
||||
|
||||
$head = supplier_proposal_prepare_head($object);
|
||||
print dol_get_fiche_head($head, 'contact', $langs->trans("CommRequest"), -1, 'supplier_proposal');
|
||||
|
||||
|
|
|
|||
|
|
@ -90,7 +90,7 @@ if ($object->id > 0) {
|
|||
* View
|
||||
*/
|
||||
|
||||
$title = $langs->trans('CommRequest')." - ".$langs->trans('Documents');
|
||||
$title = $object->ref." - ".$langs->trans('Documents');
|
||||
$help_url = 'EN:Ask_Price_Supplier|FR:Demande_de_prix_fournisseur';
|
||||
llxHeader('', $title, $help_url);
|
||||
|
||||
|
|
|
|||
|
|
@ -48,19 +48,16 @@ $result = restrictedArea($user, 'supplier_proposal', $id);
|
|||
/*
|
||||
* View
|
||||
*/
|
||||
|
||||
$form = new Form($db);
|
||||
|
||||
$title = $langs->trans('CommRequest')." - ".$langs->trans('Info');
|
||||
$help_url = 'EN:Ask_Price_Supplier|FR:Demande_de_prix_fournisseur';
|
||||
llxHeader('', $title, $help_url);
|
||||
|
||||
$object = new SupplierProposal($db);
|
||||
$object->fetch($id);
|
||||
$object->fetch_thirdparty();
|
||||
|
||||
$object->info($object->id);
|
||||
|
||||
$title = $object->ref." - ".$langs->trans('Info');
|
||||
$help_url = 'EN:Ask_Price_Supplier|FR:Demande_de_prix_fournisseur';
|
||||
llxHeader('', $title, $help_url);
|
||||
|
||||
|
||||
$head = supplier_proposal_prepare_head($object);
|
||||
print dol_get_fiche_head($head, 'info', $langs->trans('CommRequest'), -1, 'supplier_proposal');
|
||||
|
|
|
|||
|
|
@ -285,8 +285,10 @@ $formpropal = new FormPropal($db);
|
|||
$companystatic = new Societe($db);
|
||||
$formcompany = new FormCompany($db);
|
||||
|
||||
$title = $langs->trans('ListOfSupplierProposals');
|
||||
$help_url = 'EN:Ask_Price_Supplier|FR:Demande_de_prix_fournisseur';
|
||||
//llxHeader('',$langs->trans('CommRequest'),$help_url);
|
||||
|
||||
llxHeader('', $title, $help_url);
|
||||
|
||||
$sql = 'SELECT';
|
||||
if ($sall || $search_product_category > 0 || $search_user > 0) {
|
||||
|
|
@ -467,7 +469,7 @@ if ($resql) {
|
|||
exit;
|
||||
}
|
||||
|
||||
llxHeader('', $langs->trans('CommRequest'), $help_url);
|
||||
// llxHeader('', $langs->trans('CommRequest'), $help_url);
|
||||
|
||||
$param = '';
|
||||
if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
|
||||
|
|
|
|||
|
|
@ -72,10 +72,6 @@ if (empty($reshook)) {
|
|||
/*
|
||||
* View
|
||||
*/
|
||||
$title = $langs->trans('CommRequest')." - ".$langs->trans('Notes');
|
||||
$help_url = 'EN:Ask_Price_Supplier|FR:Demande_de_prix_fournisseur';
|
||||
llxHeader('', $title, $help_url);
|
||||
|
||||
$form = new Form($db);
|
||||
|
||||
if ($id > 0 || !empty($ref)) {
|
||||
|
|
@ -88,6 +84,10 @@ if ($id > 0 || !empty($ref)) {
|
|||
if ($object->fetch($id, $ref)) {
|
||||
$object->fetch_thirdparty();
|
||||
|
||||
$title = $object->ref." - ".$langs->trans('Notes');
|
||||
$help_url = 'EN:Ask_Price_Supplier|FR:Demande_de_prix_fournisseur';
|
||||
llxHeader('', $title, $help_url);
|
||||
|
||||
$societe = new Societe($db);
|
||||
if ($societe->fetch($object->socid)) {
|
||||
$head = supplier_proposal_prepare_head($object);
|
||||
|
|
|
|||
|
|
@ -148,7 +148,11 @@ $formother = new FormOther($db);
|
|||
$arrayofjs = array();
|
||||
$arrayofcss = array();
|
||||
|
||||
llxHeader('', $langs->trans("UserSetup"), '', '', 0, 0, $arrayofjs, $arrayofcss);
|
||||
$person_name = !empty($object->firstname) ? $object->lastname.", ".$object->firstname : $object->lastname;
|
||||
$title = $person_name." - ".$langs->trans('ExtSites');
|
||||
$help_url = '';
|
||||
|
||||
llxHeader('', $title, $help_url, '', 0, 0, $arrayofjs, $arrayofcss);
|
||||
|
||||
|
||||
print '<form name="extsitesconfig" action="'.$_SERVER["PHP_SELF"].'" method="post">';
|
||||
|
|
|
|||
|
|
@ -277,7 +277,10 @@ $form = new Form($db);
|
|||
|
||||
$childids = $user->getAllChildIds(1);
|
||||
|
||||
llxHeader(null, $langs->trans("BankAccounts"));
|
||||
$person_name = !empty($object->firstname) ? $object->lastname.", ".$object->firstname : $object->lastname;
|
||||
$title = $person_name." - ".$langs->trans('BankAccounts');
|
||||
$help_url = '';
|
||||
llxHeader('', $title, $help_url);
|
||||
|
||||
$head = user_prepare_head($object);
|
||||
|
||||
|
|
|
|||
|
|
@ -730,9 +730,13 @@ if (!empty($conf->stock->enabled)) {
|
|||
$formproduct = new FormProduct($db);
|
||||
}
|
||||
|
||||
llxHeader('', $langs->trans("UserCard"));
|
||||
$help_url = '';
|
||||
|
||||
if ($action == 'create' || $action == 'adduserldap') {
|
||||
|
||||
$title = $langs->trans("NewUser");
|
||||
llxHeader('', $title, $help_url);
|
||||
|
||||
print load_fiche_titre($langs->trans("NewUser"), '', 'user');
|
||||
|
||||
print '<span class="opacitymedium">'.$langs->trans("CreateInternalUserDesc")."</span><br>\n";
|
||||
|
|
@ -1350,6 +1354,10 @@ if ($action == 'create' || $action == 'adduserldap') {
|
|||
}
|
||||
}
|
||||
|
||||
$person_name = !empty($object->firstname) ? $object->lastname.", ".$object->firstname : $object->lastname;
|
||||
$title = $person_name." - ".$langs->trans('Card');
|
||||
llxHeader('', $title, $help_url);
|
||||
|
||||
// Show tabs
|
||||
if ($mode == 'employee') { // For HRM module development
|
||||
$title = $langs->trans("Employee");
|
||||
|
|
|
|||
|
|
@ -74,18 +74,18 @@ if (empty($reshook)) {
|
|||
/*
|
||||
* View
|
||||
*/
|
||||
|
||||
$form = new Form($db);
|
||||
|
||||
llxHeader("", "ClickToDial");
|
||||
|
||||
|
||||
if ($id > 0) {
|
||||
$object = new User($db);
|
||||
$object->fetch($id, '', '', 1);
|
||||
$object->getrights();
|
||||
$object->fetch_clicktodial();
|
||||
|
||||
$person_name = !empty($object->firstname) ? $object->lastname.", ".$object->firstname : $object->lastname;
|
||||
$title = $person_name." - ".$langs->trans('ClickToDial');
|
||||
$help_url = '';
|
||||
llxHeader('', $title, $help_url);
|
||||
|
||||
$head = user_prepare_head($object);
|
||||
|
||||
|
|
|
|||
|
|
@ -129,7 +129,11 @@ if (empty($reshook)) {
|
|||
|
||||
$form = new Form($db);
|
||||
|
||||
llxHeader('', $langs->trans("UserCard").' - '.$langs->trans("Files"));
|
||||
|
||||
$person_name = !empty($object->firstname) ? $object->lastname.", ".$object->firstname : $object->lastname;
|
||||
$title = $person_name." - ".$langs->trans('Documents');
|
||||
$help_url = '';
|
||||
llxHeader('', $title, $help_url);
|
||||
|
||||
if ($object->id) {
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -246,8 +246,13 @@ if (empty($reshook)) {
|
|||
/*
|
||||
* View
|
||||
*/
|
||||
$title = $object->name.' - '.$langs->trans("Card");
|
||||
if ($action == 'create') {
|
||||
$title = $langs->trans("NewGroup");
|
||||
}
|
||||
|
||||
llxHeader('', $title, $help_url);
|
||||
|
||||
llxHeader('', $langs->trans("GroupCard"));
|
||||
|
||||
$form = new Form($db);
|
||||
$fuserstatic = new User($db);
|
||||
|
|
|
|||
|
|
@ -92,7 +92,9 @@ if ($action == 'dolibarr2ldap') {
|
|||
|
||||
$form = new Form($db);
|
||||
|
||||
llxHeader();
|
||||
$title = $object->name." - ".$langs->trans('LDAP');
|
||||
$help_url = '';
|
||||
llxHeader('', $title, $help_url);
|
||||
|
||||
$head = group_prepare_head($object);
|
||||
|
||||
|
|
|
|||
|
|
@ -120,8 +120,8 @@ if (empty($reshook)) {
|
|||
/*
|
||||
* View
|
||||
*/
|
||||
|
||||
llxHeader();
|
||||
$title = $langs->trans("ListOfGroups");
|
||||
llxHeader('', $title, $help_url);
|
||||
|
||||
$sql = "SELECT g.rowid, g.nom as name, g.note, g.entity, g.datec, g.tms as datem, COUNT(DISTINCT ugu.fk_user) as nb, COUNT(DISTINCT ugr.fk_id) as nbpermissions";
|
||||
$sql .= " FROM ".MAIN_DB_PREFIX."usergroup as g";
|
||||
|
|
|
|||
|
|
@ -128,7 +128,9 @@ if (empty($reshook)) {
|
|||
|
||||
$form = new Form($db);
|
||||
|
||||
llxHeader('', $langs->trans("Permissions"));
|
||||
$title = $object->name." - ".$langs->trans('Permissions');
|
||||
$help_url = '';
|
||||
llxHeader('', $title, $help_url);
|
||||
|
||||
if ($object->id > 0) {
|
||||
$head = group_prepare_head($object);
|
||||
|
|
|
|||
|
|
@ -75,8 +75,9 @@ if (GETPOST('addbox')) {
|
|||
/*
|
||||
* View
|
||||
*/
|
||||
|
||||
llxHeader();
|
||||
$title = $langs->trans("MenuUsersAndGroups");
|
||||
$help_url = '';
|
||||
llxHeader('', $title, $help_url);
|
||||
|
||||
|
||||
print load_fiche_titre($langs->trans("MenuUsersAndGroups"), $resultboxes['selectboxlist'], 'user');
|
||||
|
|
|
|||
|
|
@ -62,7 +62,10 @@ if (($object->id != $user->id) && (!$user->rights->user->user->lire)) {
|
|||
|
||||
$form = new Form($db);
|
||||
|
||||
llxHeader();
|
||||
$person_name = !empty($object->firstname) ? $object->lastname.", ".$object->firstname : $object->lastname;
|
||||
$title = $person_name." - ".$langs->trans('Info');
|
||||
$help_url = '';
|
||||
llxHeader('', $title, $help_url);
|
||||
|
||||
$head = user_prepare_head($object);
|
||||
|
||||
|
|
|
|||
|
|
@ -89,7 +89,10 @@ if (empty($reshook)) {
|
|||
|
||||
$form = new Form($db);
|
||||
|
||||
llxHeader();
|
||||
$person_name = !empty($object->firstname) ? $object->lastname.", ".$object->firstname : $object->lastname;
|
||||
$title = $person_name." - ".$langs->trans('LDAP');
|
||||
$help_url = '';
|
||||
llxHeader('', $title, $help_url);
|
||||
|
||||
$head = user_prepare_head($object);
|
||||
|
||||
|
|
|
|||
|
|
@ -84,11 +84,13 @@ if (empty($reshook)) {
|
|||
/*
|
||||
* View
|
||||
*/
|
||||
|
||||
llxHeader();
|
||||
|
||||
$form = new Form($db);
|
||||
|
||||
$person_name = !empty($object->firstname) ? $object->lastname.", ".$object->firstname : $object->lastname;
|
||||
$title = $person_name." - ".$langs->trans('Notes');
|
||||
$help_url = '';
|
||||
llxHeader('', $title, $help_url);
|
||||
|
||||
if ($id) {
|
||||
$head = user_prepare_head($object);
|
||||
|
||||
|
|
|
|||
|
|
@ -178,8 +178,11 @@ if (empty($reshook)) {
|
|||
/*
|
||||
* View
|
||||
*/
|
||||
$person_name = !empty($object->firstname) ? $object->lastname.", ".$object->firstname : $object->lastname;
|
||||
$title = $person_name." - ".$langs->trans('Card');
|
||||
$help_url = '';
|
||||
|
||||
llxHeader();
|
||||
llxHeader('', $title, $help_url);
|
||||
|
||||
// List of possible landing pages
|
||||
$tmparray = array('index.php'=>'Dashboard');
|
||||
|
|
|
|||
|
|
@ -143,7 +143,10 @@ if (empty($reshook)) {
|
|||
|
||||
$form = new Form($db);
|
||||
|
||||
llxHeader('', $langs->trans("Permissions"));
|
||||
$person_name = !empty($object->firstname) ? $object->lastname.", ".$object->firstname : $object->lastname;
|
||||
$title = $person_name." - ".$langs->trans('Permissions');
|
||||
$help_url = '';
|
||||
llxHeader('', $title, $help_url);
|
||||
|
||||
$head = user_prepare_head($object);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user