diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php index 8058eaff9f8..6bf5c5a5dca 100644 --- a/htdocs/comm/card.php +++ b/htdocs/comm/card.php @@ -228,7 +228,7 @@ if ($id > 0) print ''; // Alias names (commercial, trademark or alias names) - print ''.$langs->trans('AliasNames').''; + print ''.$langs->trans('AliasNames').''; print $object->name_alias; print ""; @@ -265,7 +265,7 @@ if ($id > 0) } // Address - print ''.$langs->trans('Address').''; + print ''.$langs->trans('Address').''; dol_print_address($object->address,'gmap','thirdparty',$object->id); print ""; @@ -500,7 +500,7 @@ if ($id > 0) { $langs->load("members"); $langs->load("users"); - print ''.$langs->trans("LinkedToDolibarrMember").''; + print ''.$langs->trans("LinkedToDolibarrMember").''; print ''; $adh=new Adherent($db); $result=$adh->fetch('','',$object->id); diff --git a/htdocs/compta/recap-compta.php b/htdocs/compta/recap-compta.php index 0375297316b..19ac5705ef1 100644 --- a/htdocs/compta/recap-compta.php +++ b/htdocs/compta/recap-compta.php @@ -115,7 +115,7 @@ if ($socid > 0) if (! $num > 0) { - print ''.$langs->trans("NoInvoice").''; + print ''.$langs->trans("NoInvoice").''; } $solde = 0; diff --git a/htdocs/societe/agenda.php b/htdocs/societe/agenda.php index 31ddda84933..4648992506b 100644 --- a/htdocs/societe/agenda.php +++ b/htdocs/societe/agenda.php @@ -87,7 +87,7 @@ if ($socid) print ''; // Alias names (commercial, trademark or alias names) - print ''.$langs->trans('AliasNames').''; + print ''.$langs->trans('AliasNames').''; print $object->name_alias; print ""; @@ -119,7 +119,7 @@ if ($socid) print ''.$langs->trans('Gencod').''.$object->barcode.''; } - print "".$langs->trans('Address').""; + print "".$langs->trans('Address').""; dol_print_address($object->address, 'gmap', 'thirdparty', $object->id); print ""; diff --git a/htdocs/societe/consumption.php b/htdocs/societe/consumption.php index 18cc214246d..a883a2568d9 100644 --- a/htdocs/societe/consumption.php +++ b/htdocs/societe/consumption.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004-2014 Laurent Destailleur + * Copyright (C) 2004-2015 Laurent Destailleur * Copyright (C) 2013-2015 Juanjo Menent * Copyright (C) 2015 Marcos GarcĂ­a * @@ -121,8 +121,8 @@ print $form->showrefnav($object,'socid','',($user->societe_id?0:1),'rowid','nom' print ''; // Alias names (commercial, trademark or alias names) -print ''; -print ''; +print ''; +print ''.$object->name_alias.''; if (! empty($conf->global->SOCIETE_USEPREFIX)) // Old not used prefix field { diff --git a/htdocs/societe/document.php b/htdocs/societe/document.php index a4ca499ab5a..f1961e02b2d 100644 --- a/htdocs/societe/document.php +++ b/htdocs/societe/document.php @@ -119,7 +119,7 @@ if ($object->id) print ''; // Alias names (commercial, trademark or alias names) - print ''.$langs->trans('AliasNames').''; + print ''.$langs->trans('AliasNames').''; print $object->name_alias; print ""; diff --git a/htdocs/societe/note.php b/htdocs/societe/note.php index 271c69872ce..c7db3b66645 100644 --- a/htdocs/societe/note.php +++ b/htdocs/societe/note.php @@ -83,7 +83,7 @@ if ($id > 0) print ''; // Alias names (commercial, trademark or alias names) - print ''.$langs->trans('AliasNames').''; + print ''.$langs->trans('AliasNames').''; print $object->name_alias; print ""; diff --git a/htdocs/societe/price.php b/htdocs/societe/price.php index 6f1f4e1a42c..6246b203c83 100644 --- a/htdocs/societe/price.php +++ b/htdocs/societe/price.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004-2012 Laurent Destailleur + * Copyright (C) 2004-2015 Laurent Destailleur * Copyright (C) 2005 Eric Seigne * Copyright (C) 2005-2013 Regis Houssin * Copyright (C) 2006 Andre Cianfarani @@ -138,7 +138,7 @@ print $form->showrefnav($soc, 'socid', '', ($user->societe_id ? 0 : 1), 'rowid', print ''; // Alias names (commercial, trademark or alias names) -print ''.$langs->trans('AliasNames').''; +print ''.$langs->trans('AliasNames').''; print $soc->name_alias; print ""; @@ -169,7 +169,7 @@ if (! empty($conf->barcode->enabled)) { print '' . $langs->trans('Gencod') . '' . $soc->barcode . ''; } -print "" . $langs->trans('Address') . ""; +print "" . $langs->trans('Address') . ""; dol_print_address($soc->address, 'gmap', 'thirdparty', $soc->id); print ""; @@ -536,15 +536,17 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) { // Action if ($user->rights->produit->creer || $user->rights->service->creer) { print ''; - print 'id . '&lineid=' . $line->id . '">'; - print img_delete(); - print ''; - print 'id . '&lineid=' . $line->id . '">'; - print img_edit(); - print ''; print 'id . '&prodid=' . $line->fk_product . '">'; print img_info(); print ''; + print ' '; + print 'id . '&lineid=' . $line->id . '">'; + print img_edit('default', 0, 'style="vertical-align: middle;"'); + print ''; + print ' '; + print 'id . '&lineid=' . $line->id . '">'; + print img_delete('default', 'style="vertical-align: middle;"'); + print ''; print ''; }