From 25812f007147ac2bf170e0db50993d1acec7d071 Mon Sep 17 00:00:00 2001 From: jfefe Date: Sat, 18 Apr 2015 21:28:55 +0200 Subject: [PATCH] Add picto for commercial pages titles --- htdocs/comm/index.php | 3 ++- htdocs/comm/list.php | 1 + htdocs/comm/propal/list.php | 3 ++- htdocs/comm/propal/stats/index.php | 3 ++- htdocs/comm/prospect/list.php | 1 + htdocs/commande/card.php | 3 ++- htdocs/commande/list.php | 3 ++- htdocs/commande/stats/index.php | 3 ++- htdocs/contact/card.php | 1 + htdocs/contact/list.php | 1 + htdocs/contrat/card.php | 3 ++- htdocs/contrat/index.php | 3 ++- htdocs/contrat/list.php | 5 +++-- htdocs/contrat/services.php | 3 ++- htdocs/fichinter/list.php | 3 ++- htdocs/product/card.php | 1 + htdocs/product/index.php | 1 + htdocs/product/list.php | 1 + htdocs/product/popuprop.php | 1 + htdocs/societe/index.php | 1 + htdocs/societe/soc.php | 17 +---------------- htdocs/theme/eldy/img/title_commercial.png | Bin 0 -> 828 bytes 22 files changed, 33 insertions(+), 28 deletions(-) create mode 100644 htdocs/theme/eldy/img/title_commercial.png diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php index 6705752e71e..70f98220c21 100644 --- a/htdocs/comm/index.php +++ b/htdocs/comm/index.php @@ -2,6 +2,7 @@ /* Copyright (C) 2001-2005 Rodolphe Quiedeville * Copyright (C) 2004-2015 Laurent Destailleur * Copyright (C) 2005-2012 Regis Houssin + * Copyright (C) 2015 Jean-François Ferry * * 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 @@ -67,7 +68,7 @@ if (! empty($conf->commande->enabled)) $orderstatic=new Commande($db); llxHeader(); -print_fiche_titre($langs->trans("CommercialArea")); +print_fiche_titre($langs->trans("CommercialArea"),'','title_commercial.png'); print '
'; diff --git a/htdocs/comm/list.php b/htdocs/comm/list.php index d2f288ee1c8..f297313d907 100644 --- a/htdocs/comm/list.php +++ b/htdocs/comm/list.php @@ -4,6 +4,7 @@ * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2013 Cédric Salvador * Copyright (C) 2013 Florian Henry + * Copyright (C) 2015 Jean-François Ferry * * This program is freei software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php index da6e56c9460..c22b1952f9b 100644 --- a/htdocs/comm/propal/list.php +++ b/htdocs/comm/propal/list.php @@ -9,6 +9,7 @@ * Copyright (C) 2010-2011 Philippe Grand * Copyright (C) 2012 Christophe Battarel * Copyright (C) 2013 Cédric Salvador + * Copyright (C) 2015 Jean-François Ferry * * 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 @@ -250,7 +251,7 @@ if ($result) if ($search_montant_ht) $param.='&search_montant_ht='.$search_montant_ht; if ($search_author) $param.='&search_author='.$search_author; if ($search_town) $param.='&search_town='.$search_town; - print_barre_liste($langs->trans('ListOfProposals').' '.($socid?'- '.$soc->name:''), $page, $_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords); + print_barre_liste($langs->trans('ListOfProposals').' '.($socid?'- '.$soc->name:''), $page, $_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords,'title_commercial.png'); // Lignes des champs de filtre print '
'; diff --git a/htdocs/comm/propal/stats/index.php b/htdocs/comm/propal/stats/index.php index 61985c8560f..291d4b4557f 100644 --- a/htdocs/comm/propal/stats/index.php +++ b/htdocs/comm/propal/stats/index.php @@ -3,6 +3,7 @@ * Copyright (C) 2004-2011 Laurent Destailleur * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2012 Marcos García + * Copyright (C) 2015 Jean-François Ferry * * 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 @@ -60,7 +61,7 @@ $langs->load('other'); llxHeader(); -print_fiche_titre($langs->trans("ProposalsStatistics")); +print_fiche_titre($langs->trans("ProposalsStatistics"),'','title_commercial.png'); $dir=$conf->propal->dir_temp; diff --git a/htdocs/comm/prospect/list.php b/htdocs/comm/prospect/list.php index 9f5a8542362..52659df162d 100644 --- a/htdocs/comm/prospect/list.php +++ b/htdocs/comm/prospect/list.php @@ -5,6 +5,7 @@ * Copyright (C) 2011 Philippe Grand * Copyright (C) 2013 Florian Henry * Copyright (C) 2013 Cédric Salvador + * Copyright (C) 2015 Jean-François Ferry * * 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 diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php index 0ffb3807467..8383e83f4f0 100644 --- a/htdocs/commande/card.php +++ b/htdocs/commande/card.php @@ -10,6 +10,7 @@ * Copyright (C) 2012 Marcos García * Copyright (C) 2013 Florian Henry * Copyright (C) 2014 Ferran Marcet + * Copyright (C) 2015 Jean-François Ferry * * 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 @@ -1214,7 +1215,7 @@ $formorder = new FormOrder($db); */ if ($action == 'create' && $user->rights->commande->creer) { - print_fiche_titre($langs->trans('CreateOrder')); + print_fiche_titre($langs->trans('CreateOrder'),'','title_commercial.png'); $soc = new Societe($db); if ($socid > 0) diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php index 17d2863a241..5164b30eed7 100644 --- a/htdocs/commande/list.php +++ b/htdocs/commande/list.php @@ -8,6 +8,7 @@ * Copyright (C) 2013 Cédric Salvador * Copyright (C) 2015 Frederic France * Copyright (C) 2015 Marcos García + * Copyright (C) 2015 Jean-François Ferry * * 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 @@ -262,7 +263,7 @@ if ($resql) if ($search_total_ht != '') $param.='&search_total_ht='.$search_total_ht; $num = $db->num_rows($resql); - print_barre_liste($title, $page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords); + print_barre_liste($title, $page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords,'title_commercial.png'); $i = 0; // Lignes des champs de filtre diff --git a/htdocs/commande/stats/index.php b/htdocs/commande/stats/index.php index fcc33a666d2..71558be0e57 100644 --- a/htdocs/commande/stats/index.php +++ b/htdocs/commande/stats/index.php @@ -3,6 +3,7 @@ * Copyright (C) 2004-2013 Laurent Destailleur * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2012 Marcos García + * Copyright (C) 2015 Jean-François Ferry * * 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 @@ -76,7 +77,7 @@ if ($mode == 'supplier') $dir=$conf->fournisseur->dir_output.'/commande/temp'; } -print_fiche_titre($title); +print_fiche_titre($title,'','title_commercial.png'); dol_mkdir($dir); diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php index e9495caaea8..dcc7949340e 100644 --- a/htdocs/contact/card.php +++ b/htdocs/contact/card.php @@ -7,6 +7,7 @@ * Copyright (C) 2013 Florian Henry * Copyright (C) 2013 Alexandre Spangaro * Copyright (C) 2014 Juanjo Menent + * Copyright (C) 2015 Jean-François Ferry * * 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 diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php index c69fc2266c2..21f48e58fb3 100644 --- a/htdocs/contact/list.php +++ b/htdocs/contact/list.php @@ -6,6 +6,7 @@ * Copyright (C) 2013 Raphaël Doursenaud * Copyright (C) 2013 Cédric Salvador * Copyright (C) 2013 Alexandre Spangaro + * Copyright (C) 2015 Jean-François Ferry * * 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 diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php index d37b3c11392..f541e6288c2 100644 --- a/htdocs/contrat/card.php +++ b/htdocs/contrat/card.php @@ -8,6 +8,7 @@ * Copyright (C) 2013-2014 Florian Henry * Copyright (C) 2014 Ferran Marcet * Copyright (C) 2014 Marcos García + * Copyright (C) 2015 Jean-François Ferry * * 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 @@ -899,7 +900,7 @@ if ($result > 0) *********************************************************************/ if ($action == 'create') { - print_fiche_titre($langs->trans('AddContract')); + print_fiche_titre($langs->trans('AddContract'),'','title_commercial.png'); $soc = new Societe($db); if ($socid>0) $soc->fetch($socid); diff --git a/htdocs/contrat/index.php b/htdocs/contrat/index.php index 3d0fee451be..484893215eb 100644 --- a/htdocs/contrat/index.php +++ b/htdocs/contrat/index.php @@ -2,6 +2,7 @@ /* Copyright (C) 2001-2004 Rodolphe Quiedeville * Copyright (C) 2004-2011 Laurent Destailleur * Copyright (C) 2005-2012 Regis Houssin + * Copyright (C) 2015 Jean-François Ferry * * 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 @@ -63,7 +64,7 @@ $now = dol_now(); llxHeader(); -print_fiche_titre($langs->trans("ContractsArea")); +print_fiche_titre($langs->trans("ContractsArea"),'','title_commercial.png'); //print ''; diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php index 505c2d3e79a..25b5d80fa98 100644 --- a/htdocs/contrat/list.php +++ b/htdocs/contrat/list.php @@ -5,6 +5,7 @@ * Copyright (C) 2013 Cédric Salvador * Copyright (C) 2014 Juanjo Menent * Copyright (C) 2015 Claudio Aschieri + * Copyright (C) 2015 Jean-François Ferry * * 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 @@ -129,8 +130,8 @@ if ($resql) $num = $db->num_rows($resql); $i = 0; - print_barre_liste($langs->trans("ListOfContracts"), $page, $_SERVER["PHP_SELF"], '&search_contract='.$search_contract.'&search_name='.$search_name, $sortfield, $sortorder,'',$num); - + print_barre_liste($langs->trans("ListOfContracts"), $page, $_SERVER["PHP_SELF"], '&search_contract='.$search_contract.'&search_name='.$search_name, $sortfield, $sortorder,'',$num,$totalnboflines,'title_commercial.png'); + print ''; print '
'; diff --git a/htdocs/contrat/services.php b/htdocs/contrat/services.php index 22ae64ef9cd..fe89907279c 100644 --- a/htdocs/contrat/services.php +++ b/htdocs/contrat/services.php @@ -2,6 +2,7 @@ /* Copyright (C) 2001-2004 Rodolphe Quiedeville * Copyright (C) 2004-2011 Laurent Destailleur * Copyright (C) 2005-2012 Regis Houssin + * Copyright (C) 2015 Jean-François Ferry * * 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 @@ -151,7 +152,7 @@ if ($resql) if ($mode == "4" && $filter != "expired") $title=$langs->trans("ListOfRunningServices"); if ($mode == "4" && $filter == "expired") $title=$langs->trans("ListOfExpiredServices"); if ($mode == "5") $title=$langs->trans("ListOfClosedServices"); - print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder,'',$num); + print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder,'',$num,$totalnboflines,'title_commercial.png'); print '
'; diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php index 851077b510f..1c3582620ab 100644 --- a/htdocs/fichinter/list.php +++ b/htdocs/fichinter/list.php @@ -4,6 +4,7 @@ * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2011-2012 Juanjo Menent * Copyright (C) 2013 Cédric Salvador + * Copyright (C) 2015 Jean-François Ferry * * 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 @@ -128,7 +129,7 @@ if ($result) if ($search_desc) $urlparam.="&search_desc=".urlencode($search_desc); if ($search_status != '' && $search_status > -1) $urlparam.="&search_status=".urlencode($search_status); - print_barre_liste($langs->trans("ListOfInterventions"), $page, $_SERVER['PHP_SELF'], $urlparam, $sortfield, $sortorder, '', $num); + print_barre_liste($langs->trans("ListOfInterventions"), $page, $_SERVER['PHP_SELF'], $urlparam, $sortfield, $sortorder, '', $num, $totalnboflines, 'title_commercial.png'); print ''."\n"; print '
'; diff --git a/htdocs/product/card.php b/htdocs/product/card.php index e7d67c5903b..3ac70c6bda6 100644 --- a/htdocs/product/card.php +++ b/htdocs/product/card.php @@ -11,6 +11,7 @@ * Copyright (C) 2011-2014 Alexandre Spangaro * Copyright (C) 2014 Cédric Gross * Copyright (C) 2014 Ferran Marcet + * Copyright (C) 2015 Jean-François Ferry * * 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 diff --git a/htdocs/product/index.php b/htdocs/product/index.php index 2d418691493..c14d27deb9d 100644 --- a/htdocs/product/index.php +++ b/htdocs/product/index.php @@ -3,6 +3,7 @@ * Copyright (C) 2004-2015 Laurent Destailleur * Copyright (C) 2005-2014 Regis Houssin * Copyright (C) 2014 Charles-Fr BENKE + * Copyright (C) 2015 Jean-François Ferry * * 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 diff --git a/htdocs/product/list.php b/htdocs/product/list.php index 08d29c3e1dd..2f61a07fa60 100644 --- a/htdocs/product/list.php +++ b/htdocs/product/list.php @@ -9,6 +9,7 @@ * Copyright (C) 2013 Cédric Salvador * Copyright (C) 2013 Florian Henry * Copyright (C) 2013 Adolfo segura + * Copyright (C) 2015 Jean-François Ferry * * 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 diff --git a/htdocs/product/popuprop.php b/htdocs/product/popuprop.php index d44a74921ac..8f419aa3679 100644 --- a/htdocs/product/popuprop.php +++ b/htdocs/product/popuprop.php @@ -4,6 +4,7 @@ * Copyright (C) 2004 Eric Seigne * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2014 Marcos García + * Copyright (C) 2015 Jean-François Ferry * * 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 diff --git a/htdocs/societe/index.php b/htdocs/societe/index.php index c1e0e56316a..fe66380d986 100644 --- a/htdocs/societe/index.php +++ b/htdocs/societe/index.php @@ -3,6 +3,7 @@ * Copyright (C) 2004-2014 Laurent Destailleur * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2014 Charles-Fr Benke + * Copyright (C) 2015 Jean-François Ferry * * 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 diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php index 5ef38e2c358..20ebdca3ba2 100644 --- a/htdocs/societe/soc.php +++ b/htdocs/societe/soc.php @@ -7,6 +7,7 @@ * Copyright (C) 2008 Patrick Raguin * Copyright (C) 2010-2014 Juanjo Menent * Copyright (C) 2011-2013 Alexandre Spangaro + * Copyright (C) 2015 Jean-François Ferry * Copyright (C) 2015 Marcos García * * This program is free software; you can redistribute it and/or modify @@ -1774,20 +1775,6 @@ else print $form->formconfirm($_SERVER["PHP_SELF"]."?socid=".$object->id,$langs->trans("DeleteACompany"),$langs->trans("ConfirmDeleteCompany"),"confirm_delete",'',0,"action-delete"); } - if ($action == 'merge') { - $form = new Form($db); - - $options = array( - array( - 'label' => $langs->trans('MergeOriginThirdparty'), - 'type' => 'other', - 'value' => $form->select_company('', 'soc_origin', 's.rowid != '.$object->id, 1) - ) - ); - - print $form->formconfirm($_SERVER["PHP_SELF"]."?socid=".$object->id,$langs->trans("MergeThirdparties"),$langs->trans("ConfirmMergeThirdparties"),"confirm_merge",$options,'',1); - } - dol_htmloutput_errors($error,$errors); $showlogo=$object->logo; @@ -2238,8 +2225,6 @@ else $reshook=$hookmanager->executeHooks('addMoreActionsButtons',$parameters,$object,$action); // Note that $action and $object may have been modified by hook if (empty($reshook)) { - print '
'.$langs->trans('Merge').'
'; - if (! empty($object->email)) { $langs->load("mails"); diff --git a/htdocs/theme/eldy/img/title_commercial.png b/htdocs/theme/eldy/img/title_commercial.png new file mode 100644 index 0000000000000000000000000000000000000000..46394177698fb286ee15fd47544bf6d0de642807 GIT binary patch literal 828 zcmV-C1H=4@P)5QK z55EOJFron!D+*qP{sDSYM8Si9gGWz7k9yIg2Ty`06+KkMgHSyw3W|u@q>)&Q)g*1Q z+3d#4voH*sW|M3NhHPeM=6&XU-hJM896E0Uz**ojkOh{3x4?7Y9nheUZ8vZiXtwAN zfn)tLJ`B8+p?Ztn1bzT#`T^j!43vS2)m_UIxwxA;G3QMHAAk)J@h}L?0#9}N6i^b- z_w6=b7ZboJ;OnHO@lU`tzyr<$SAdP0KdfMFBmp1~yipLQ1!fkQ0d4}9fI!AV8Ww?5 zz+4glT;PTxJPj0pD)0o@t4}eiZB2>-fRn&=8BYNjU_^XJHBX*M48R<43m8}M2J%9y zRt6T51TZhfI}}sx^1#P-lTsaOK>;{t1e_ny17JnEkxLrD0!j+cRF8gKRkKn6IV09+5;2Oemznm)bhxSMrK!4Pm2*rv7jfJeY* zfyu}#S>UlKNz?=TffEX{stf{50!K6!(sH369=HgM8JzD?g4!pcs_N9fsCcF4L_Dwy zI1a4JxF>^)(g@cI#zEk8k`zqKpjm);(uQ9;x%tik4l6c#R>C3iy=sjIz&FwIQ}dce zt+7L%oA1>FQ{vJt!AknA0Y!@f7uX^IJyVdC^m<13f$w@B3XnagrgWX|g@Wx0C^uql zUe8s9kQbWv&|l zgNFNq2mpVL|0VU!RuT$D$%#r%aXiq_=>scx3)WagUPxPpg0%{mb^yZS!qc<)ji=<= zC1bCqaYHii9rbQ=K>+*{1!>U{79WnXV)%Yag5(%Kn%#98T8&0000