lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1466 from marcosgdf/minor

Browse Source 
Minor style and translation corrections
This commit is contained in:
Laurent Destailleur 2014-03-13 11:53:52 +01:00
commit 1b85f83dbb
39 changed files with 76 additions and 167 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/adherents/admin/adherent.php
View File

@ -115,7 +115,7 @@ print_fiche_titre($langs->trans("MembersSetup"),$linkback,'setup');
$head = member_admin_prepare_head(); $head = member_admin_prepare_head();
dol_fiche_head($head, 'general', $langs->trans("Member"), 0, 'user'); dol_fiche_head($head, 'general', $langs->trans("Members"), 0, 'user');
dol_htmloutput_mesg($mesg); dol_htmloutput_mesg($mesg);

4
htdocs/adherents/admin/public.php
View File

@ -84,7 +84,7 @@ print_fiche_titre($langs->trans("MembersSetup"),$linkback,'setup');
$head = member_admin_prepare_head(); $head = member_admin_prepare_head();
dol_fiche_head($head, 'public', $langs->trans("Member"), 0, 'user'); dol_fiche_head($head, 'public', $langs->trans("Members"), 0, 'user');
dol_htmloutput_mesg($mesg); dol_htmloutput_mesg($mesg);
@ -206,7 +206,7 @@ if (! empty($conf->paybox->enabled) || ! empty($conf->paypal->enabled))
print '</table>'; print '</table>';
print '<center>'; print '<center>';
print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">'; print '<br><input type="submit" class="button" value="'.$langs->trans("Modify").'">';
print '</center>'; print '</center>';
print '</form>'; print '</form>';

2
htdocs/admin/agenda.php
View File

@ -137,7 +137,7 @@ print "<br>\n";
$head=agenda_prepare_head(); $head=agenda_prepare_head();
dol_fiche_head($head, 'autoactions', $langs->trans("Agenda")); dol_fiche_head($head, 'autoactions', $langs->trans("Agenda"), 0, 'action');
print $langs->trans("AgendaAutoActionDesc")."<br>\n"; print $langs->trans("AgendaAutoActionDesc")."<br>\n";
print $langs->trans("OnlyActiveElementsAreShown").'<br>'; print $langs->trans("OnlyActiveElementsAreShown").'<br>';

2
htdocs/admin/agenda_extrafields.php
View File

@ -74,7 +74,7 @@ print "<br>\n";
$head=agenda_prepare_head(); $head=agenda_prepare_head();
dol_fiche_head($head, 'attributes', $langs->trans("Agenda")); dol_fiche_head($head, 'attributes', $langs->trans("Agenda"), 0, 'action');
print $langs->trans("DefineHereComplementaryAttributes", $langs->transnoentitiesnoconv("Agenda")).'<br>'."\n"; print $langs->trans("DefineHereComplementaryAttributes", $langs->transnoentitiesnoconv("Agenda")).'<br>'."\n";
print '<br>'; print '<br>';

2
htdocs/admin/agenda_extsites.php
View File

@ -125,7 +125,7 @@ print '<br>';
$head=agenda_prepare_head(); $head=agenda_prepare_head();
dol_fiche_head($head, 'extsites', $langs->trans("Agenda")); dol_fiche_head($head, 'extsites', $langs->trans("Agenda"), 0, 'action');
print $langs->trans("AgendaExtSitesDesc")."<br>\n"; print $langs->trans("AgendaExtSitesDesc")."<br>\n";
print "<br>\n"; print "<br>\n";

2
htdocs/admin/agenda_other.php
View File

@ -84,7 +84,7 @@ print "<br>\n";
$head=agenda_prepare_head(); $head=agenda_prepare_head();
dol_fiche_head($head, 'other', $langs->trans("Agenda")); dol_fiche_head($head, 'other', $langs->trans("Agenda"), 0, 'action');
print_titre($langs->trans("OtherOptions")); print_titre($langs->trans("OtherOptions"));

2
htdocs/admin/agenda_xcal.php
View File

@ -79,7 +79,7 @@ print '<br>';
$head=agenda_prepare_head(); $head=agenda_prepare_head();
dol_fiche_head($head, 'xcal', $langs->trans("Agenda")); dol_fiche_head($head, 'xcal', $langs->trans("Agenda"), 0, 'action');
print $langs->trans("AgendaSetupOtherDesc")."<br>\n"; print $langs->trans("AgendaSetupOtherDesc")."<br>\n";
print "<br>\n"; print "<br>\n";

9
htdocs/admin/bank.php
View File

@ -88,15 +88,6 @@ $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToM
print_fiche_titre($langs->trans("BankSetupModule"),$linkback,'setup'); print_fiche_titre($langs->trans("BankSetupModule"),$linkback,'setup');
print '<br>'; print '<br>';
$h = 0;
$head[$h][0] = DOL_URL_ROOT."/admin/bank.php";
$head[$h][1] = $langs->trans("Miscellaneous");
$head[$h][2] = 'general';
$hselected=$h;
$h++;
dol_fiche_head($head, $hselected, $langs->trans("ModuleSetup"));
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';

2
htdocs/admin/commande.php
View File

@ -218,7 +218,7 @@ print '<br>';
$head = order_admin_prepare_head(null); $head = order_admin_prepare_head(null);
dol_fiche_head($head, 'general', $langs->trans("ModuleSetup"), 0, 'order'); dol_fiche_head($head, 'general', $langs->trans("Orders"), 0, 'order');
/* /*
* Orders Numbering model * Orders Numbering model

10
htdocs/admin/compta.php
View File

@ -104,16 +104,6 @@ print_fiche_titre($langs->trans('ComptaSetup'),$linkback,'setup');
print '<br>'; print '<br>';
$h = 0;
$head[$h][0] = DOL_URL_ROOT."/admin/compta.php";
$head[$h][1] = $langs->trans("Accountancy");
$head[$h][2] = 'Compta';
$hselected=$h;
$h++;
dol_fiche_head($head, $hselected, $langs->trans("ModuleSetup"));
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
// Cas du parametre COMPTA_MODE // Cas du parametre COMPTA_MODE

2
htdocs/admin/contract.php
View File

@ -204,7 +204,7 @@ print "<br>";
$head=contract_admin_prepare_head(); $head=contract_admin_prepare_head();
dol_fiche_head($head, 'contract', $langs->trans("ModuleSetup")); dol_fiche_head($head, 'contract', $langs->trans("Contracts"), 0, 'contract');
/* /*
* Contracts Numbering model * Contracts Numbering model

21
htdocs/admin/dons.php
View File

@ -120,18 +120,6 @@ llxHeader('',$langs->trans("DonationsSetup"),'DonConfiguration');
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>'; $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
print_fiche_titre($langs->trans("DonationsSetup"),$linkback,'setup'); print_fiche_titre($langs->trans("DonationsSetup"),$linkback,'setup');
print '<br>';
$h = 0;
$head[$h][0] = DOL_URL_ROOT."/admin/dons.php";
$head[$h][1] = $langs->trans("Donations");
$head[$h][2] = 'Donation';
$hselected=$h;
$h++;
dol_fiche_head($head, $hselected, $langs->trans("ModuleSetup"));
// Document templates // Document templates
print '<br>'; print '<br>';
@ -167,6 +155,7 @@ print '<td>'.$langs->trans("Description").'</td>';
print '<td align="center" width="60">'.$langs->trans("Activated").'</td>'; print '<td align="center" width="60">'.$langs->trans("Activated").'</td>';
print '<td align="center" width="60">'.$langs->trans("Default").'</td>'; print '<td align="center" width="60">'.$langs->trans("Default").'</td>';
print '<td align="center" width="80">'.$langs->trans("ShortInfo").'</td>'; print '<td align="center" width="80">'.$langs->trans("ShortInfo").'</td>';
print '<td align="center" width="80">'.$langs->trans("Preview").'</td>';
print "</tr>\n"; print "</tr>\n";
clearstatcache(); clearstatcache();
@ -245,10 +234,14 @@ if (is_resource($handle))
$htmltooltip.='<br><br><u>'.$langs->trans("FeaturesSupported").':</u>'; $htmltooltip.='<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
$htmltooltip.='<br>'.$langs->trans("Logo").': '.yn($module->option_logo,1,1); $htmltooltip.='<br>'.$langs->trans("Logo").': '.yn($module->option_logo,1,1);
$htmltooltip.='<br>'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang,1,1); $htmltooltip.='<br>'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang,1,1);
$text='<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'" target="specimen">'.img_object($langs->trans("Preview"),'generic').'</a>';
print '<td align="center">'; print '<td align="center">';
print $form->textwithpicto(' &nbsp; '.$text,$htmltooltip,-1,0); print $form->textwithpicto('',$htmltooltip,-1,0);
print '</td>'; print '</td>';
// Preview
print '<td align="center">';
print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'" target="specimen">'.img_object($langs->trans("Preview"),'generic').'</a>';
print '</td>';
print "</tr>\n"; print "</tr>\n";
} }

10
htdocs/admin/ecm.php
View File

@ -72,16 +72,6 @@ $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToM
print_fiche_titre($langs->trans("ECMSetup"),$linkback,'setup'); print_fiche_titre($langs->trans("ECMSetup"),$linkback,'setup');
print '<br>'; print '<br>';
$h = 0;
$head[$h][0] = DOL_URL_ROOT."/admin/ecm.php";
$head[$h][1] = $langs->trans("Miscellaneous");
$head[$h][2] = 'general';
$hselected=$h;
$h++;
dol_fiche_head($head, $hselected, $langs->trans("ModuleSetup"));
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td>'.$langs->trans("Description").'</td>'; print '<td>'.$langs->trans("Description").'</td>';

2
htdocs/admin/livraison.php
View File

@ -412,7 +412,7 @@ foreach ($dirmodels as $reldir)
// Info // Info
$htmltooltip = ''.$langs->trans("Type").': '.($module->type?$module->type:$langs->trans("Unknown")); $htmltooltip = ''.$langs->trans("Type").': '.($module->type?$module->type:$langs->trans("Unknown"));
$htmltooltip.='<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur; $htmltooltip.='<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
$htmltooltip.='<br><br>'.$langs->trans("FeaturesSupported").':'; $htmltooltip.='<br><br><u>'.$langs->trans("FeaturesSupported").'</u>:';
$htmltooltip.='<br>'.$langs->trans("Logo").': '.yn($module->option_logo,1,1); $htmltooltip.='<br>'.$langs->trans("Logo").': '.yn($module->option_logo,1,1);
print '<td align="center">'; print '<td align="center">';
print $form->textwithpicto('',$htmltooltip,1,0); print $form->textwithpicto('',$htmltooltip,1,0);

10
htdocs/admin/mailing.php
View File

@ -80,16 +80,6 @@ llxHeader('',$langs->trans("MailingSetup"));
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>'; $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
print_fiche_titre($langs->trans("MailingSetup"),$linkback,'setup'); print_fiche_titre($langs->trans("MailingSetup"),$linkback,'setup');
$h = 0;
$head[$h][0] = DOL_URL_ROOT."/admin/mailing.php";
$head[$h][1] = $langs->trans("Miscellaneous");
$head[$h][2] = 'general';
$hselected=$h;
$h++;
dol_fiche_head($head, $hselected, $langs->trans("ModuleSetup"));
if (! empty($conf->use_javascript_ajax)) if (! empty($conf->use_javascript_ajax))
{ {
print "\n".'<script type="text/javascript">'; print "\n".'<script type="text/javascript">';

2
htdocs/admin/order_extrafields.php
View File

@ -75,7 +75,7 @@ print "<br>\n";
$head = order_admin_prepare_head(null); $head = order_admin_prepare_head(null);
dol_fiche_head($head, 'attributes', $langs->trans("ModuleSetup"), 0, 'order'); dol_fiche_head($head, 'attributes', $langs->trans("Orders"), 0, 'order');
print $langs->trans("DefineHereComplementaryAttributes",$textobject).'<br>'."\n"; print $langs->trans("DefineHereComplementaryAttributes",$textobject).'<br>'."\n";

2
htdocs/admin/orderdet_extrafields.php
View File

@ -76,7 +76,7 @@ print "<br>\n";
$head = order_admin_prepare_head(null); $head = order_admin_prepare_head(null);
dol_fiche_head($head, 'attributeslines', $langs->trans("ModuleSetup"), 0, 'order'); dol_fiche_head($head, 'attributeslines', $langs->trans("Orders"), 0, 'order');
print $langs->trans("DefineHereComplementaryAttributes",$textobject).'<br>'."\n"; print $langs->trans("DefineHereComplementaryAttributes",$textobject).'<br>'."\n";

10
htdocs/admin/prelevement.php
View File

@ -119,16 +119,6 @@ $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToM
print_fiche_titre($langs->trans("WithdrawalsSetup"),$linkback,'setup'); print_fiche_titre($langs->trans("WithdrawalsSetup"),$linkback,'setup');
print '<br>'; print '<br>';
$h = 0;
$head[$h][0] = DOL_URL_ROOT."/admin/prelevement.php";
$head[$h][1] = $langs->trans("Withdrawals");
$head[$h][2] = 'Withdrawal';
$hselected=$h;
$h++;
dol_fiche_head($head, $hselected, $langs->trans("ModuleSetup"));
print '<form method="post" action="prelevement.php?action=set">'; print '<form method="post" action="prelevement.php?action=set">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';

11
htdocs/admin/stock.php
View File

@ -101,17 +101,6 @@ llxHeader('',$langs->trans("StockSetup"));
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>'; $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
print_fiche_titre($langs->trans("StockSetup"),$linkback,'setup'); print_fiche_titre($langs->trans("StockSetup"),$linkback,'setup');
print '<br>';
$h = 0;
$head[$h][0] = DOL_URL_ROOT."/admin/stock.php";
$head[$h][1] = $langs->trans("Miscellaneous");
$head[$h][2] = 'general';
$hselected=$h;
$h++;
dol_fiche_head($head, $hselected, $langs->trans("ModuleSetup"));
$form=new Form($db); $form=new Form($db);
$var=true; $var=true;

2
htdocs/admin/supplier_invoice.php
View File

@ -200,7 +200,7 @@ print "<br>";
$head = supplierorder_admin_prepare_head(null); $head = supplierorder_admin_prepare_head(null);
dol_fiche_head($head, 'invoice', $langs->trans("ModuleSetup")); dol_fiche_head($head, 'invoice', $langs->trans("Suppliers"), 0, 'company');
// Supplier invoice numbering module // Supplier invoice numbering module

2
htdocs/admin/supplier_order.php
View File

@ -200,7 +200,7 @@ print "<br>";
$head = supplierorder_admin_prepare_head(null); $head = supplierorder_admin_prepare_head(null);
dol_fiche_head($head, 'order', $langs->trans("ModuleSetup")); dol_fiche_head($head, 'order', $langs->trans("Suppliers"), 0, 'company');
// Supplier order numbering module // Supplier order numbering module

6
htdocs/admin/supplierinvoice_extrafields.php
View File

@ -37,7 +37,7 @@ if (!$user->admin)
$langs->load("admin"); $langs->load("admin");
$langs->load("other"); $langs->load("other");
$langs->load("orders"); $langs->load("bills");
$langs->load("suppliers"); $langs->load("suppliers");
$extrafields = new ExtraFields($db); $extrafields = new ExtraFields($db);
@ -67,7 +67,7 @@ require DOL_DOCUMENT_ROOT.'/core/actions_extrafields.inc.php';
* View * View
*/ */
$textobject=$langs->transnoentitiesnoconv("SuppliersInvoices"); $textobject=$langs->transnoentitiesnoconv("BillsSuppliers");
llxHeader('',$langs->trans("SuppliersSetup")); llxHeader('',$langs->trans("SuppliersSetup"));
@ -77,7 +77,7 @@ print "<br>\n";
$head = supplierorder_admin_prepare_head(null); $head = supplierorder_admin_prepare_head(null);
dol_fiche_head($head, 'supplierinvoice', $langs->trans("ModuleSetup"), 0, 'invoice'); dol_fiche_head($head, 'supplierinvoice', $langs->trans("Suppliers"), 0, 'company');
print $langs->trans("DefineHereComplementaryAttributes",$textobject).'<br>'."\n"; print $langs->trans("DefineHereComplementaryAttributes",$textobject).'<br>'."\n";

2
htdocs/admin/supplierorder_extrafields.php
View File

@ -75,7 +75,7 @@ print "<br>\n";
$head = supplierorder_admin_prepare_head(null); $head = supplierorder_admin_prepare_head(null);
dol_fiche_head($head, 'supplierorder', $langs->trans("ModuleSetup"), 0, 'order'); dol_fiche_head($head, 'supplierorder', $langs->trans("Suppliers"), 0, 'company');
print $langs->trans("DefineHereComplementaryAttributes",$textobject).'<br>'."\n"; print $langs->trans("DefineHereComplementaryAttributes",$textobject).'<br>'."\n";

12
htdocs/admin/taxes.php
View File

@ -121,18 +121,6 @@ $form=new Form($db);
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>'; $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
print_fiche_titre($langs->trans('TaxSetup'),$linkback,'setup'); print_fiche_titre($langs->trans('TaxSetup'),$linkback,'setup');
print '<br>';
$h = 0;
$head[$h][0] = DOL_URL_ROOT."/admin/taxes.php";
$head[$h][1] = $langs->trans("Miscellaneous");
$head[$h][2] = 'general';
$hselected=$h;
$h++;
dol_fiche_head($head, $hselected, $langs->trans("ModuleSetup"));
print '<br>'; print '<br>';
if (empty($mysoc->tva_assuj)) if (empty($mysoc->tva_assuj))

6
htdocs/bookmarks/admin/bookmark.php
View File

@ -70,7 +70,7 @@ print '<input type="hidden" name="action" value="setvalue">';
$var=true; $var=true;
print '<table summary="bookmarklist" class="notopnoleftnoright" width="100%">'; print '<table summary="bookmarklist" class="noborder" width="100%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td>'.$langs->trans("Name").'</td>'; print '<td>'.$langs->trans("Name").'</td>';
print '<td>'.$langs->trans("Value").'</td>'; print '<td>'.$langs->trans("Value").'</td>';
@ -80,9 +80,7 @@ print '<tr '.$bc[$var].'><td>';
print $langs->trans("NbOfBoomarkToShow").'</td><td>'; print $langs->trans("NbOfBoomarkToShow").'</td><td>';
print '<input size="3" type="text" name="BOOKMARKS_SHOW_IN_MENU" value="'.$conf->global->BOOKMARKS_SHOW_IN_MENU.'">'; print '<input size="3" type="text" name="BOOKMARKS_SHOW_IN_MENU" value="'.$conf->global->BOOKMARKS_SHOW_IN_MENU.'">';
print '</td></tr>'; print '</td></tr>';
print '</table><br /><center><input type="submit" class="button" value="'.$langs->trans("Modify").'"></center></form>';
print '<tr><td colspan="2" align="center"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td></tr>';
print '</table></form>';
dol_htmloutput_mesg($mesg); dol_htmloutput_mesg($mesg);

5
htdocs/comm/admin/propaldet_extrafields.php
View File

@ -37,7 +37,7 @@ if (!$user->admin)
$langs->load("admin"); $langs->load("admin");
$langs->load("other"); $langs->load("other");
$langs->load("orders"); $langs->load("propal");
$extrafields = new ExtraFields($db); $extrafields = new ExtraFields($db);
$form = new Form($db); $form = new Form($db);
@ -73,11 +73,10 @@ llxHeader('',$langs->trans("PropalSetup"));
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>'; $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
print_fiche_titre($langs->trans("PropalSetup"),$linkback,'setup'); print_fiche_titre($langs->trans("PropalSetup"),$linkback,'setup');
print "<br>\n";
$head = propal_admin_prepare_head(null); $head = propal_admin_prepare_head(null);
dol_fiche_head($head, 'attributeslines', $langs->trans("ModuleSetup"), 0, 'order'); dol_fiche_head($head, 'attributeslines', $langs->trans("Proposals"), 0, 'propal');
print $langs->trans("DefineHereComplementaryAttributes",$textobject).'<br>'."\n"; print $langs->trans("DefineHereComplementaryAttributes",$textobject).'<br>'."\n";

2
htdocs/compta/facture/admin/facture_cust_extrafields.php
View File

@ -75,7 +75,7 @@ $head = invoice_admin_prepare_head(null);
dol_fiche_head($head, 'attributes', $langs->trans("Invoices"), 0, 'invoice'); dol_fiche_head($head, 'attributes', $langs->trans("Invoices"), 0, 'invoice');
print $langs->trans("DefineHereComplementaryAttributes",$textobject).'<br>'."\n"; print $langs->trans("DefineHereComplementaryAttributes",$textobject).'<br><br>'."\n";
// Load attribute_label // Load attribute_label
$extrafields->fetch_name_optionals_label($elementtype); $extrafields->fetch_name_optionals_label($elementtype);

2
htdocs/compta/facture/admin/facturedet_cust_extrafields.php
View File

@ -76,7 +76,7 @@ $head = invoice_admin_prepare_head(null);
dol_fiche_head($head, 'attributeslines', $langs->trans("Invoices"), 0, 'invoice'); dol_fiche_head($head, 'attributeslines', $langs->trans("Invoices"), 0, 'invoice');
print $langs->trans("DefineHereComplementaryAttributes",$textobject).'<br>'."\n"; print $langs->trans("DefineHereComplementaryAttributes",$textobject).'<br><br>'."\n";
// Load attribute_label // Load attribute_label
$extrafields->fetch_name_optionals_label($elementtype); $extrafields->fetch_name_optionals_label($elementtype);

3
htdocs/contrat/admin/contract_extrafields.php
View File

@ -72,8 +72,9 @@ print_fiche_titre($langs->trans("ContractsSetup"),$linkback,'setup');
print '<br>'; print '<br>';
$head=contract_admin_prepare_head(); $head=contract_admin_prepare_head();
dol_fiche_head($head, 'attributes', $langs->trans("ModuleSetup"), 0, 'contrat'); dol_fiche_head($head, 'attributes', $langs->trans("Contracts"), 0, 'contract');
$textobject = $langs->transnoentitiesnoconv('Contracts');
print $langs->trans("DefineHereComplementaryAttributes",$textobject).'<br>'."\n"; print $langs->trans("DefineHereComplementaryAttributes",$textobject).'<br>'."\n";
print '<br>'; print '<br>';

2
htdocs/contrat/fiche.php
View File

@ -761,7 +761,7 @@ $objectlignestatic=new ContratLigne($db);
*********************************************************************/ *********************************************************************/
if ($action == 'create') if ($action == 'create')
{ {
dol_fiche_head('', '', $langs->trans("AddContract"), 0, 'contract'); print_fiche_titre($langs->trans('AddContract'));
dol_htmloutput_errors($mesg,''); dol_htmloutput_errors($mesg,'');

10
htdocs/externalsite/admin/externalsite.php
View File

@ -79,16 +79,6 @@ $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToM
print_fiche_titre($langs->trans("ExternalSiteSetup"),$linkback,'setup'); print_fiche_titre($langs->trans("ExternalSiteSetup"),$linkback,'setup');
print '<br>'; print '<br>';
$h = 0;
$head[$h][0] = DOL_URL_ROOT."/admin/externalsite.php";
$head[$h][1] = $langs->trans("Miscellaneous");
$head[$h][2] = 'externalsite';
$hselected=$h;
$h++;
dol_fiche_head($head, $hselected, $langs->trans("Module100Name"));
print $langs->trans("Module100Desc")."<br>\n"; print $langs->trans("Module100Desc")."<br>\n";
print '<br>'; print '<br>';

2
htdocs/fichinter/admin/fichinter_extrafields.php
View File

@ -33,6 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
$langs->load("companies"); $langs->load("companies");
$langs->load("admin"); $langs->load("admin");
$langs->load("members"); $langs->load("members");
$langs->load('interventions');
$extrafields = new ExtraFields($db); $extrafields = new ExtraFields($db);
$form = new Form($db); $form = new Form($db);
@ -64,6 +65,7 @@ require DOL_DOCUMENT_ROOT.'/core/actions_extrafields.inc.php';
llxHeader(); llxHeader();
$textobject=$langs->transnoentitiesnoconv("Interventions");
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>'; $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
print_fiche_titre($langs->trans("InterventionsSetup"),$linkback,'setup'); print_fiche_titre($langs->trans("InterventionsSetup"),$linkback,'setup');

15
htdocs/ftp/admin/ftpclient.php
View File

@ -155,7 +155,7 @@ else
print '<form name="ftpconfig" action="ftpclient.php" method="post">'; print '<form name="ftpconfig" action="ftpclient.php" method="post">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<table class="nobordernopadding" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td colspan="2">'.$langs->trans("NewFTPClient").'</td>'; print '<td colspan="2">'.$langs->trans("NewFTPClient").'</td>';
print '<td>'.$langs->trans("Example").'</td>'; print '<td>'.$langs->trans("Example").'</td>';
@ -199,15 +199,12 @@ else
print '<td>'.$langs->trans("No").'</td>'; print '<td>'.$langs->trans("No").'</td>';
print '</tr>'; print '</tr>';
?> print '</table>';
<tr><td colspan="3" align="center">
<input type="submit" class="button" value="<?php echo $langs->trans("Add") ?>"> ?><br><center><input type="submit" class="button" value="<?php echo $langs->trans("Add") ?>"></center>
<input type="hidden" name="action" value="add"> <input type="hidden" name="action" value="add">
<input type="hidden" name="numero_entry" value="<?php echo ($lastftpentry+1) ?>"> <input type="hidden" name="numero_entry" value="<?php echo ($lastftpentry+1) ?>">
</td>
</tr>
<?php <?php
print '</table>';
print '</form>'; print '</form>';
?> ?>
@ -215,7 +212,7 @@ else
<?php <?php
print '<table class="nobordernopadding" width="100%">'."\n"; print '<table class="noborder" width="100%">'."\n";
$sql ="select name, value, note from ".MAIN_DB_PREFIX."const"; $sql ="select name, value, note from ".MAIN_DB_PREFIX."const";
$sql.=" WHERE name like 'FTP_SERVER_%'"; $sql.=" WHERE name like 'FTP_SERVER_%'";
@ -277,7 +274,7 @@ else
$var=!$var; $var=!$var;
print "<tr ".$bc[$var].">"; print "<tr ".$bc[$var].">";
print "<td width=\"100\">".$langs->trans("Passive")."</td>"; print "<td width=\"100\">".$langs->trans("FTPPassiveMode")."</td>";
print '<td>'.$form->selectyesno('FTP_PASSIVE_'.$idrss, @constant("FTP_PASSIVE_" . $idrss), 1).'</td>'; print '<td>'.$form->selectyesno('FTP_PASSIVE_'.$idrss, @constant("FTP_PASSIVE_" . $idrss), 1).'</td>';
print "</tr>"; print "</tr>";

2
htdocs/langs/en_US/other.lang
View File

@ -22,6 +22,7 @@ Notify_WITHDRAW_CREDIT=Credit withdrawal
Notify_WITHDRAW_EMIT=Perform withdrawal Notify_WITHDRAW_EMIT=Perform withdrawal
Notify_ORDER_SENTBYMAIL=Customer order sent by mail Notify_ORDER_SENTBYMAIL=Customer order sent by mail
Notify_COMPANY_CREATE=Third party created Notify_COMPANY_CREATE=Third party created
Notify_COMPANY_COMPANY_SENTBYMAIL=Mails sent from third party card
Notify_PROPAL_SENTBYMAIL=Commercial proposal sent by mail Notify_PROPAL_SENTBYMAIL=Commercial proposal sent by mail
Notify_ORDER_SENTBYMAIL=Envío pedido por e-mail Notify_ORDER_SENTBYMAIL=Envío pedido por e-mail
Notify_BILL_PAYED=Customer invoice payed Notify_BILL_PAYED=Customer invoice payed
@ -40,6 +41,7 @@ Notify_MEMBER_VALIDATE=Member validated
Notify_MEMBER_SUBSCRIPTION=Member subscribed Notify_MEMBER_SUBSCRIPTION=Member subscribed
Notify_MEMBER_RESILIATE=Member resiliated Notify_MEMBER_RESILIATE=Member resiliated
Notify_MEMBER_DELETE=Member deleted Notify_MEMBER_DELETE=Member deleted
Notify_PROJECT_CREATE=Project creation
NbOfAttachedFiles=Number of attached files/documents NbOfAttachedFiles=Number of attached files/documents
TotalSizeOfAttachedFiles=Total size of attached files/documents TotalSizeOfAttachedFiles=Total size of attached files/documents
MaxSize=Maximum size MaxSize=Maximum size

19
htdocs/paybox/admin/paybox.php
View File

@ -93,16 +93,6 @@ llxHeader();
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>'; $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
print_fiche_titre($langs->trans("PayBoxSetup"),$linkback,'setup'); print_fiche_titre($langs->trans("PayBoxSetup"),$linkback,'setup');
$h = 0;
$head = array();
$head[$h][0] = DOL_URL_ROOT."/paybox/admin/paybox.php";
$head[$h][1] = $langs->trans("Account");
$head[$h][2] = 'payboxaccount';
$h++;
dol_fiche_head($head, 'payboxaccount', '');
print $langs->trans("PayBoxDesc")."<br>\n"; print $langs->trans("PayBoxDesc")."<br>\n";
print '<br>'; print '<br>';
@ -112,7 +102,7 @@ print '<input type="hidden" name="action" value="setvalue">';
$var=true; $var=true;
print '<table class="nobordernopadding" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td>'.$langs->trans("AccountParameter").'</td>'; print '<td>'.$langs->trans("AccountParameter").'</td>';
print '<td>'.$langs->trans("Value").'</td>'; print '<td>'.$langs->trans("Value").'</td>';
@ -205,10 +195,7 @@ print '<input size="32" type="email" name="PAYBOX_PAYONLINE_SENDEMAIL" value="'.
print ' &nbsp; '.$langs->trans("Example").': myemail@myserver.com'; print ' &nbsp; '.$langs->trans("Example").': myemail@myserver.com';
print '</td></tr>'; print '</td></tr>';
print '<tr><td colspan="2" align="center"><br><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td></tr>'; print '</table><br><center><input type="submit" class="button" value="'.$langs->trans("Modify").'"></center></form>';
print '</table></form>';
dol_fiche_end();
print '<br><br>'; print '<br><br>';
@ -243,6 +230,6 @@ print info_admin($langs->trans("YouCanAddTagOnUrl"));
dol_htmloutput_mesg($mesg); dol_htmloutput_mesg($mesg);
$db->close(); $db->close();
dol_fiche_end();
llxFooter(); llxFooter();
?> ?>

6
htdocs/paypal/admin/paypal.php
View File

@ -116,7 +116,7 @@ print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="action" value="setvalue">'; print '<input type="hidden" name="action" value="setvalue">';
print '<table class="nobordernopadding" width="100%">'; print '<table class="noborder" width="100%">';
$var=true; $var=true;
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
@ -230,10 +230,10 @@ print $langs->trans("SecurityTokenIsUnique").'</td><td>';
print $form->selectyesno("PAYPAL_SECURITY_TOKEN_UNIQUE",(empty($conf->global->PAYPAL_SECURITY_TOKEN)?0:$conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE),1); print $form->selectyesno("PAYPAL_SECURITY_TOKEN_UNIQUE",(empty($conf->global->PAYPAL_SECURITY_TOKEN)?0:$conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE),1);
print '</td></tr>'; print '</td></tr>';
print '<tr><td colspan="2" align="center"><br><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td></tr>';
print '</table>'; print '</table>';
print '<br><center><input type="submit" class="button" value="'.$langs->trans("Modify").'"></center>';
print '</form>'; print '</form>';
dol_fiche_end(); dol_fiche_end();

26
htdocs/projet/admin/project.php
View File

@ -288,7 +288,7 @@ print_fiche_titre($langs->trans("ProjectsSetup"),$linkback,'setup');
$head=project_admin_prepare_head(); $head=project_admin_prepare_head();
dol_fiche_head($head, 'project', $langs->trans("Project"), 0, 'project'); dol_fiche_head($head, 'project', $langs->trans("Projects"), 0, 'project');
/* /*
* Projects Numbering model * Projects Numbering model
@ -403,7 +403,7 @@ print '<td width="100">'.$langs->trans("Name").'</td>';
print '<td>'.$langs->trans("Description").'</td>'; print '<td>'.$langs->trans("Description").'</td>';
print '<td>'.$langs->trans("Example").'</td>'; print '<td>'.$langs->trans("Example").'</td>';
print '<td align="center" width="60">'.$langs->trans("Activated").'</td>'; print '<td align="center" width="60">'.$langs->trans("Activated").'</td>';
print '<td align="center" width="80">'.$langs->trans("Infos").'</td>'; print '<td align="center" width="80">'.$langs->trans("ShortInfo").'</td>';
print "</tr>\n"; print "</tr>\n";
clearstatcache(); clearstatcache();
@ -534,6 +534,7 @@ print " <td>".$langs->trans("Description")."</td>\n";
print '<td align="center" width="60">'.$langs->trans("Activated")."</td>\n"; print '<td align="center" width="60">'.$langs->trans("Activated")."</td>\n";
print '<td align="center" width="60">'.$langs->trans("Default")."</td>\n"; print '<td align="center" width="60">'.$langs->trans("Default")."</td>\n";
print '<td align="center" width="80">'.$langs->trans("ShortInfo").'</td>'; print '<td align="center" width="80">'.$langs->trans("ShortInfo").'</td>';
print '<td align="center" width="80">'.$langs->trans("Preview").'</td>';
print "</tr>\n"; print "</tr>\n";
clearstatcache(); clearstatcache();
@ -605,9 +606,16 @@ foreach ($dirmodels as $reldir)
// Info // Info
$htmltooltip = ''.$langs->trans("Name").': '.$module->name; $htmltooltip = ''.$langs->trans("Name").': '.$module->name;
$htmltooltip.='<br>'.$langs->trans("Type").': '.($module->type?$module->type:$langs->trans("Unknown")); $htmltooltip.='<br>'.$langs->trans("Type").': '.($module->type?$module->type:$langs->trans("Unknown"));
$htmltooltip.='<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur; if ($module->type == 'pdf')
{
$htmltooltip.='<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
}
$htmltooltip.='<br><br><u>'.$langs->trans("FeaturesSupported").':</u>'; $htmltooltip.='<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
$htmltooltip.='<br>'.$langs->trans("Logo").': '.yn($module->option_logo,1,1); $htmltooltip.='<br>'.$langs->trans("Logo").': '.yn($module->option_logo,1,1);
print '<td align="center">';
print $form->textwithpicto('',$htmltooltip,1,0);
print '</td>';
// Preview // Preview
print '<td align="center">'; print '<td align="center">';
@ -671,7 +679,8 @@ print ' <td width="100">'.$langs->trans("Name")."</td>\n";
print " <td>".$langs->trans("Description")."</td>\n"; print " <td>".$langs->trans("Description")."</td>\n";
print '<td align="center" width="60">'.$langs->trans("Activated")."</td>\n"; print '<td align="center" width="60">'.$langs->trans("Activated")."</td>\n";
print '<td align="center" width="60">'.$langs->trans("Default")."</td>\n"; print '<td align="center" width="60">'.$langs->trans("Default")."</td>\n";
print '<td align="center" width="80">'.$langs->trans("Infos").'</td>'; print '<td align="center" width="80">'.$langs->trans("ShortInfo").'</td>';
print '<td align="center" width="80">'.$langs->trans("Preview").'</td>';
print "</tr>\n"; print "</tr>\n";
clearstatcache(); clearstatcache();
@ -743,9 +752,16 @@ foreach ($dirmodels as $reldir)
// Info // Info
$htmltooltip = ''.$langs->trans("Name").': '.$module->name; $htmltooltip = ''.$langs->trans("Name").': '.$module->name;
$htmltooltip.='<br>'.$langs->trans("Type").': '.($module->type?$module->type:$langs->trans("Unknown")); $htmltooltip.='<br>'.$langs->trans("Type").': '.($module->type?$module->type:$langs->trans("Unknown"));
$htmltooltip.='<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur; if ($module->type == 'pdf')
{
$htmltooltip.='<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
}
$htmltooltip.='<br><br><u>'.$langs->trans("FeaturesSupported").':</u>'; $htmltooltip.='<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
$htmltooltip.='<br>'.$langs->trans("Logo").': '.yn($module->option_logo,1,1); $htmltooltip.='<br>'.$langs->trans("Logo").': '.yn($module->option_logo,1,1);
print '<td align="center">';
print $form->textwithpicto('',$htmltooltip,1,0);
print '</td>';
// Preview // Preview
print '<td align="center">'; print '<td align="center">';

5
htdocs/projet/admin/project_extrafields.php
View File

@ -59,8 +59,6 @@ require DOL_DOCUMENT_ROOT.'/core/actions_extrafields.inc.php';
* View * View
*/ */
$textobject=$langs->transnoentitiesnoconv("Project");
llxHeader("",$langs->trans("ProjectsSetup")); llxHeader("",$langs->trans("ProjectsSetup"));
@ -70,8 +68,9 @@ print_fiche_titre($langs->trans("ProjectsSetup"),$linkback,'setup');
$head = project_admin_prepare_head(); $head = project_admin_prepare_head();
dol_fiche_head($head, 'attributes', $langs->trans("Project"), 0, 'project'); dol_fiche_head($head, 'attributes', $langs->trans("Projects"), 0, 'project');
$textobject=$langs->transnoentitiesnoconv("Project");
print $langs->trans("DefineHereComplementaryAttributes",$textobject).'<br>'."\n"; print $langs->trans("DefineHereComplementaryAttributes",$textobject).'<br>'."\n";
print '<br>'; print '<br>';

7
htdocs/projet/admin/project_task_extrafields.php
View File

@ -59,19 +59,16 @@ require DOL_DOCUMENT_ROOT.'/core/actions_extrafields.inc.php';
* View * View
*/ */
$textobject=$langs->transnoentitiesnoconv("Project");
llxHeader("",$langs->trans("ProjectsSetup")); llxHeader("",$langs->trans("ProjectsSetup"));
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>'; $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
print_fiche_titre($langs->trans("ProjectsSetup"),$linkback,'setup'); print_fiche_titre($langs->trans("ProjectsSetup"),$linkback,'setup');
$head = project_admin_prepare_head(); $head = project_admin_prepare_head();
dol_fiche_head($head, 'attributes_task', $langs->trans("Project"), 0, 'project'); dol_fiche_head($head, 'attributes_task', $langs->trans("Projects"), 0, 'project');
$textobject=$langs->transnoentitiesnoconv("Project");
print $langs->trans("DefineHereComplementaryAttributes",$textobject).'<br>'."\n"; print $langs->trans("DefineHereComplementaryAttributes",$textobject).'<br>'."\n";
print '<br>'; print '<br>';