Skip to content

Commit

Permalink
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
Browse files Browse the repository at this point in the history 
develop

Conflicts:
	htdocs/product/class/propalmergepdfproduct.class.php
  • Loading branch information
@FHenry
FHenry committed Apr 19, 2015
2 parents 37bc7c3 + 935f94f commit 72c9255
Show file tree
Hide file tree
Showing 221 changed files with 12,214 additions and 11,766 deletions.
3 changes: 1 addition & 2 deletions dev/translation/sanity_check_en_langfiles.php
View file
Expand Up @@ -218,5 +218,4 @@
print_r($unused);
}
echo "</body>";
echo "</html>";
?>
echo "</html>";
3 changes: 2 additions & 1 deletion htdocs/accountancy/admin/export.php
View file
Expand Up @@ -4,6 +4,7 @@
* Copyright (C) 2014 Florian Henry <florian.henry@open-concept.pro>
* Copyright (C) 2014 Marcos García <marcosgdf@gmail.com>
* Copyright (C) 2014 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2015 Jean-François Ferry <jfefe@aternatik.fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down Expand Up @@ -94,7 +95,7 @@
$form = new Form($db);

$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
print_fiche_titre($langs->trans('ConfigAccountingExpert'),$linkback,'setup');
print_fiche_titre($langs->trans('ConfigAccountingExpert'),$linkback,'title_setup');

$head = admin_accounting_prepare_head();

Expand Down
3 changes: 2 additions & 1 deletion htdocs/accountancy/admin/index.php
View file
Expand Up @@ -5,6 +5,7 @@
* Copyright (C) 2014 Ari Elbaz (elarifr) <github@accedinfo.com>
* Copyright (C) 2014 Marcos García <marcosgdf@gmail.com>
* Copyright (C) 2014 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2015 Jean-François Ferry <jfefe@aternatik.fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down Expand Up @@ -148,7 +149,7 @@
$form = new Form($db);

$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
print_fiche_titre($langs->trans('ConfigAccountingExpert'),$linkback,'setup');
print_fiche_titre($langs->trans('ConfigAccountingExpert'),$linkback,'title_setup');

$head = admin_accounting_prepare_head($accounting);

Expand Down
3 changes: 2 additions & 1 deletion htdocs/accountancy/admin/journaux.php
View file
Expand Up @@ -4,6 +4,7 @@
* Copyright (C) 2014 Florian Henry <florian.henry@open-concept.pro>
* Copyright (C) 2014 Marcos García <marcosgdf@gmail.com>
* Copyright (C) 2014 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2015 Jean-François Ferry <jfefe@aternatik.fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down Expand Up @@ -82,7 +83,7 @@
$form = new Form($db);

$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
print_fiche_titre($langs->trans('ConfigAccountingExpert'),$linkback,'setup');
print_fiche_titre($langs->trans('ConfigAccountingExpert'),$linkback,'title_setup');

$head = admin_accounting_prepare_head(null);

Expand Down
1 change: 1 addition & 0 deletions htdocs/accountancy/bookkeeping/balancebymonth.php
View file
Expand Up @@ -2,6 +2,7 @@
/* Copyright (C) 2013-2014 Olivier Geffroy <jeff@jeffinfo.com>
* Copyright (C) 2013-2014 Alexandre Spangaro <alexandre.spangaro@gmail.com>
* Copyright (C) 2014 Florian Henry <florian.henry@open-concept.pro>
* Copyright (C) 2015 Jean-François Ferry <jfefe@aternatik.fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion htdocs/accountancy/customer/card.php
View file
Expand Up @@ -106,7 +106,7 @@
print '<input type="hidden" name="action" value="ventil">';

$linkback='<a href="'.DOL_URL_ROOT.'/accountancy/customer/lines.php">'.$langs->trans("Back").'</a>';
print_fiche_titre($langs->trans('CustomersVentilation'),$linkback,'setup');
print_fiche_titre($langs->trans('CustomersVentilation'),$linkback,'title_setup');

print '<table class="border" width="100%">';

Expand Down
1 change: 1 addition & 0 deletions htdocs/accountancy/customer/index.php
View file
Expand Up @@ -3,6 +3,7 @@
* Copyright (C) 2013-2014 Florian Henry <florian.henry@open-concept.pro>
* Copyright (C) 2013-2014 Alexandre Spangaro <alexandre.spangaro@gmail.com>
* Copyright (C) 2014 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2015 Jean-François Ferry <jfefe@aternatik.fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
1 change: 1 addition & 0 deletions htdocs/accountancy/supplier/card.php
View file
Expand Up @@ -5,6 +5,7 @@
* Copyright (C) 2013-2014 Olivier Geffroy <jeff@jeffinfo.com>
* Copyright (C) 2013-2014 Florian Henry <florian.henry@open-concept.pro>
* Copyright (C) 2014 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2015 Jean-François Ferry <jfefe@aternatik.fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
3 changes: 2 additions & 1 deletion htdocs/adherents/admin/adherent.php
View file
Expand Up @@ -7,6 +7,7 @@
* Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2011-2012 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2012 J. Fernando Lagrange <fernando@demo-tic.org>
* Copyright (C) 2015 Jean-François Ferry <jfefe@aternatik.fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down Expand Up @@ -110,7 +111,7 @@


$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
print_fiche_titre($langs->trans("MembersSetup"),$linkback,'setup');
print_fiche_titre($langs->trans("MembersSetup"),$linkback,'title_setup');


$head = member_admin_prepare_head();
Expand Down
4 changes: 2 additions & 2 deletions htdocs/adherents/admin/adherent_extrafields.php
View file
Expand Up @@ -65,12 +65,12 @@


$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
print_fiche_titre($langs->trans("MembersSetup"),$linkback,'setup');
print_fiche_titre($langs->trans("MembersSetup"),$linkback,'title_setup');


$head = member_admin_prepare_head();

dol_fiche_head($head, 'attributes', $langs->trans("Members"), 0, 'user');
dol_fiche_head($head, 'attributes', $langs->trans("Members"), 0, 'title_user');

require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';

Expand Down
3 changes: 2 additions & 1 deletion htdocs/adherents/admin/adherent_type_extrafields.php
View file
Expand Up @@ -4,6 +4,7 @@
* Copyright (C) 2004-2012 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2012 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2013 Florian Henry <florian.henry@open-concept.pro>
* Copyright (C) 2015 Jean-François Ferry <jfefe@aternatik.fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down Expand Up @@ -67,7 +68,7 @@


$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
print_fiche_titre($langs->trans("MembersSetup"),$linkback,'setup');
print_fiche_titre($langs->trans("MembersSetup"),$linkback,'setup_title');


$head = member_admin_prepare_head();
Expand Down
3 changes: 2 additions & 1 deletion htdocs/adherents/admin/public.php
View file
Expand Up @@ -3,6 +3,7 @@
* Copyright (C) 2006-2011 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2006-2012 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2011 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2015 Jean-François Ferry <jfefe@aternatik.fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down Expand Up @@ -80,7 +81,7 @@


$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
print_fiche_titre($langs->trans("MembersSetup"),$linkback,'setup');
print_fiche_titre($langs->trans("MembersSetup"),$linkback,'title_setup');

$head = member_admin_prepare_head();

Expand Down
3 changes: 2 additions & 1 deletion htdocs/admin/agenda.php
View file
Expand Up @@ -2,6 +2,7 @@
/* Copyright (C) 2008-2014 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2011 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2011-2012 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2015 Jean-François Ferry <jfefe@aternatik.fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down Expand Up @@ -132,7 +133,7 @@
llxHeader();

$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
print_fiche_titre($langs->trans("AgendaSetup"),$linkback,'setup');
print_fiche_titre($langs->trans("AgendaSetup"),$linkback,'title_setup');
print "<br>\n";


Expand Down
3 changes: 2 additions & 1 deletion htdocs/admin/agenda_extrafields.php
View file
Expand Up @@ -4,6 +4,7 @@
* Copyright (C) 2004-2013 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2012 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2012 Florian Henry <florian.henry@open-concept.pro>
* Copyright (C) 2015 Jean-François Ferry <jfefe@aternatik.fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down Expand Up @@ -69,7 +70,7 @@
llxHeader('',$langs->trans("AgendaSetup"));

$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
print_fiche_titre($langs->trans("AgendaSetup"),$linkback,'setup');
print_fiche_titre($langs->trans("AgendaSetup"),$linkback,'title_setup');
print "<br>\n";

$head=agenda_prepare_head();
Expand Down
3 changes: 2 additions & 1 deletion htdocs/admin/agenda_extsites.php
View file
@@ -1,6 +1,7 @@
<?php
/* Copyright (C) 2008-2011 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2011-2014 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2015 Jean-François Ferry <jfefe@aternatik.fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down Expand Up @@ -123,7 +124,7 @@
llxHeader('',$langs->trans("AgendaSetup"),'','',0,0,$arrayofjs,$arrayofcss);

$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
print_fiche_titre($langs->trans("AgendaSetup"),$linkback,'setup');
print_fiche_titre($langs->trans("AgendaSetup"),$linkback,'title_setup');
print '<br>';

$head=agenda_prepare_head();
Expand Down
9 changes: 5 additions & 4 deletions htdocs/admin/agenda_other.php
View file
@@ -1,7 +1,8 @@
<?php
/* Copyright (C) 2008-2010 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2011 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2011-2013 Juanjo Menent <jmenent@2byte.es>
/* Copyright (C) 2008-2010 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2011 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2011-2013 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2015 Jean-François Ferry <jfefe@aternatik.fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down Expand Up @@ -88,7 +89,7 @@
llxHeader();

$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
print_fiche_titre($langs->trans("AgendaSetup"),$linkback,'setup');
print_fiche_titre($langs->trans("AgendaSetup"),$linkback,'title_setup');
print "<br>\n";


Expand Down
3 changes: 2 additions & 1 deletion htdocs/admin/agenda_xcal.php
View file
Expand Up @@ -2,6 +2,7 @@
/* Copyright (C) 2008-2013 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2012-2013 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2012 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2015 Jean-François Ferry <jfefe@aternatik.fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down Expand Up @@ -73,7 +74,7 @@
llxHeader();

$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
print_fiche_titre($langs->trans("AgendaSetup"),$linkback,'setup');
print_fiche_titre($langs->trans("AgendaSetup"),$linkback,'title_setup');
print '<br>';


Expand Down
5 changes: 3 additions & 2 deletions htdocs/admin/askpricesupplier.php
View file
Expand Up @@ -6,7 +6,8 @@
* Copyright (C) 2004 Eric Seigne <eric.seigne@ryxeo.com>
* Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2008 Raphael Bertrand (Resultic) <raphael.bertrand@resultic.fr>
* Copyright (C) 2011-2013 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2011-2013 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2015 Jean-François Ferry <jfefe@aternatik.fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down Expand Up @@ -239,7 +240,7 @@
//if ($mesg) print $mesg;

$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
print_fiche_titre($langs->trans("AskPriceSupplierSetup"),$linkback,'setup');
print_fiche_titre($langs->trans("AskPriceSupplierSetup"),$linkback,'title_setup');

$head = askpricesupplier_admin_prepare_head();

Expand Down
9 changes: 5 additions & 4 deletions htdocs/admin/bank.php
View file
@@ -1,7 +1,8 @@
<?php
/* Copyright (C) 2009 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2010-2013 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2013-2014 Philippe Grand <philippe.grand@atoo-net.com>
/* Copyright (C) 2009 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2010-2013 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2013-2014 Philippe Grand <philippe.grand@atoo-net.com>
* Copyright (C) 2015 Jean-François Ferry <jfefe@aternatik.fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down Expand Up @@ -86,7 +87,7 @@
$form=new Form($db);

$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
print_fiche_titre($langs->trans("BankSetupModule"),$linkback,'setup');
print_fiche_titre($langs->trans("BankSetupModule"),$linkback,'title_setup');


print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
Expand Down
3 changes: 2 additions & 1 deletion htdocs/admin/bank_extrafields.php
View file
Expand Up @@ -4,6 +4,7 @@
* Copyright (C) 2004-2011 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2012 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2014 Florian Henry <florian.henry@open-concept.pro>
* Copyright (C) 2015 Jean-François Ferry <jfefe@aternatik.fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down Expand Up @@ -65,7 +66,7 @@


$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
print_fiche_titre($langs->trans("BankSetupModule"),$linkback,'setup');
print_fiche_titre($langs->trans("BankSetupModule"),$linkback,'title_setup');


$head = bank_admin_prepare_head(null);
Expand Down
2 changes: 1 addition & 1 deletion htdocs/admin/barcode.php
View file
Expand Up @@ -130,7 +130,7 @@
llxHeader('',$langs->trans("BarcodeSetup"),$help_url);

$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
print_fiche_titre($langs->trans("BarcodeSetup"),$linkback,'setup');
print_fiche_titre($langs->trans("BarcodeSetup"),$linkback,'title_setup');

// Detect bar codes modules
$barcodelist=array();
Expand Down
3 changes: 2 additions & 1 deletion htdocs/admin/boxes.php
View file
Expand Up @@ -2,6 +2,7 @@
/* Copyright (C) 2003-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2013 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2015 Jean-François Ferry <jfefe@aternatik.fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down Expand Up @@ -218,7 +219,7 @@

llxHeader('',$langs->trans("Boxes"));

print_fiche_titre($langs->trans("Boxes"),'','setup');
print_fiche_titre($langs->trans("Boxes"),'','title_setup');

print $langs->trans("BoxesDesc")." ".$langs->trans("OnlyActiveElementsAreShown")."<br>\n";

Expand Down
2 changes: 1 addition & 1 deletion htdocs/admin/clicktodial.php
View file
Expand Up @@ -60,7 +60,7 @@
llxHeader('',$langs->trans("ClickToDialSetup"),$wikihelp);

$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
print_fiche_titre($langs->trans("ClickToDialSetup"),$linkback,'setup');
print_fiche_titre($langs->trans("ClickToDialSetup"),$linkback,'title_setup');

print $langs->trans("ClickToDialDesc")."<br>\n";

Expand Down
2 changes: 1 addition & 1 deletion htdocs/admin/commande.php
View file
Expand Up @@ -263,7 +263,7 @@
$form=new Form($db);

$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
print_fiche_titre($langs->trans("OrdersSetup"),$linkback,'setup');
print_fiche_titre($langs->trans("OrdersSetup"),$linkback,'title_setup');
print '<br>';

$head = order_admin_prepare_head();
Expand Down
2 changes: 1 addition & 1 deletion htdocs/admin/company.php
View file
Expand Up @@ -275,7 +275,7 @@

$countrynotdefined='<font class="error">'.$langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')</font>';

print_fiche_titre($langs->trans("CompanyFoundation"),'','setup');
print_fiche_titre($langs->trans("CompanyFoundation"),'','title_setup');

print $langs->trans("CompanyFundationDesc")."<br>\n";
print "<br>\n";
Expand Down
2 changes: 1 addition & 1 deletion htdocs/admin/compta.php
View file
Expand Up @@ -104,7 +104,7 @@
$form=new Form($db);

$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
print_fiche_titre($langs->trans('ComptaSetup'),$linkback,'setup');
print_fiche_titre($langs->trans('ComptaSetup'),$linkback,'title_setup');

print '<br>';

Expand Down
2 changes: 1 addition & 1 deletion htdocs/admin/confexped.php
View file
Expand Up @@ -74,7 +74,7 @@
llxHeader("","");

$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
print_fiche_titre($langs->trans("SendingsSetup"),$linkback,'setup');
print_fiche_titre($langs->trans("SendingsSetup"),$linkback,'title_setup');
print '<br>';

$h = 0;
Expand Down
2 changes: 1 addition & 1 deletion htdocs/admin/const.php
View file
Expand Up @@ -172,7 +172,7 @@
<?php
}

print_fiche_titre($langs->trans("OtherSetup"),'','setup');
print_fiche_titre($langs->trans("OtherSetup"),'','title_setup');

print $langs->trans("ConstDesc")."<br>\n";
print "<br>\n";
Expand Down
2 changes: 1 addition & 1 deletion htdocs/admin/contract.php
View file
Expand Up @@ -214,7 +214,7 @@
$form=new Form($db);

$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
print_fiche_titre($langs->trans("ContractsSetup"),$linkback,'setup');
print_fiche_titre($langs->trans("ContractsSetup"),$linkback,'title_setup');

print "<br>";

Expand Down

0 comments on commit 72c9255

Please sign in to comment.