Skip to content
Snippets Groups Projects
Commit 82536923 authored by Laurent Destailleur's avatar Laurent Destailleur
Browse files

Finishment of look

parent 2c5ef858
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
htdocs/comm/card.php
+ 3
− 3
View file @ 82536923
...@@ -228,7 +228,7 @@ if ($id > 0) ...@@ -228,7 +228,7 @@ if ($id > 0)
print '</td></tr>'; print '</td></tr>';
// Alias names (commercial, trademark or alias names) // Alias names (commercial, trademark or alias names)
print '<tr><td valign="top">'.$langs->trans('AliasNames').'</td><td colspan="3">'; print '<tr><td>'.$langs->trans('AliasNames').'</td><td colspan="3">';
print $object->name_alias; print $object->name_alias;
print "</td></tr>"; print "</td></tr>";
...@@ -265,7 +265,7 @@ if ($id > 0) ...@@ -265,7 +265,7 @@ if ($id > 0)
} }
// Address // Address
print '<tr><td valign="top">'.$langs->trans('Address').'</td><td colspan="3">'; print '<tr><td>'.$langs->trans('Address').'</td><td colspan="3">';
dol_print_address($object->address,'gmap','thirdparty',$object->id); dol_print_address($object->address,'gmap','thirdparty',$object->id);
print "</td></tr>"; print "</td></tr>";
...@@ -500,7 +500,7 @@ if ($id > 0) ...@@ -500,7 +500,7 @@ if ($id > 0)
{ {
$langs->load("members"); $langs->load("members");
$langs->load("users"); $langs->load("users");
print '<tr><td width="25%" valign="top">'.$langs->trans("LinkedToDolibarrMember").'</td>'; print '<tr><td width="25%">'.$langs->trans("LinkedToDolibarrMember").'</td>';
print '<td colspan="3">'; print '<td colspan="3">';
$adh=new Adherent($db); $adh=new Adherent($db);
$result=$adh->fetch('','',$object->id); $result=$adh->fetch('','',$object->id);
......
htdocs/compta/recap-compta.php
+ 1
− 1
View file @ 82536923
...@@ -115,7 +115,7 @@ if ($socid > 0) ...@@ -115,7 +115,7 @@ if ($socid > 0)
if (! $num > 0) if (! $num > 0)
{ {
print '<tr><td colspan="7">'.$langs->trans("NoInvoice").'</td></tr>'; print '<tr '.$bc[false].'><td colspan="7">'.$langs->trans("NoInvoice").'</td></tr>';
} }
$solde = 0; $solde = 0;
......
htdocs/societe/agenda.php
+ 2
− 2
View file @ 82536923
...@@ -87,7 +87,7 @@ if ($socid) ...@@ -87,7 +87,7 @@ if ($socid)
print '</td></tr>'; print '</td></tr>';
// Alias names (commercial, trademark or alias names) // Alias names (commercial, trademark or alias names)
print '<tr><td valign="top">'.$langs->trans('AliasNames').'</td><td colspan="3">'; print '<tr><td>'.$langs->trans('AliasNames').'</td><td colspan="3">';
print $object->name_alias; print $object->name_alias;
print "</td></tr>"; print "</td></tr>";
...@@ -119,7 +119,7 @@ if ($socid) ...@@ -119,7 +119,7 @@ if ($socid)
print '<tr><td>'.$langs->trans('Gencod').'</td><td colspan="3">'.$object->barcode.'</td></tr>'; print '<tr><td>'.$langs->trans('Gencod').'</td><td colspan="3">'.$object->barcode.'</td></tr>';
} }
print "<tr><td valign=\"top\">".$langs->trans('Address')."</td><td colspan=\"3\">"; print "<tr><td>".$langs->trans('Address')."</td><td colspan=\"3\">";
dol_print_address($object->address, 'gmap', 'thirdparty', $object->id); dol_print_address($object->address, 'gmap', 'thirdparty', $object->id);
print "</td></tr>"; print "</td></tr>";
......
htdocs/societe/consumption.php
+ 3
− 3
View file @ 82536923
<?php <?php
/* Copyright (C) 2012-2013 Philippe Berthet <berthet@systune.be> /* Copyright (C) 2012-2013 Philippe Berthet <berthet@systune.be>
* Copyright (C) 2004-2014 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2015 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2013-2015 Juanjo Menent <jmenent@2byte.es> * Copyright (C) 2013-2015 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2015 Marcos García <marcosgdf@gmail.com> * Copyright (C) 2015 Marcos García <marcosgdf@gmail.com>
* *
...@@ -121,8 +121,8 @@ print $form->showrefnav($object,'socid','',($user->societe_id?0:1),'rowid','nom' ...@@ -121,8 +121,8 @@ print $form->showrefnav($object,'socid','',($user->societe_id?0:1),'rowid','nom'
print '</td></tr>'; print '</td></tr>';
// Alias names (commercial, trademark or alias names) // Alias names (commercial, trademark or alias names)
print '<tr id="name_alias"><td valign="top"><label for="name_alias_input">'.$langs->trans('AliasNames').'</label></td>'; print '<tr id="name_alias"><td><label for="name_alias_input">'.$langs->trans('AliasNames').'</label></td>';
print '<td colspan="3"><input type="text" name="name_alias" id="name_alias_input" value="'.dol_escape_htmltag($object->name_alias).'" size="32"></td></tr>'; print '<td colspan="3">'.$object->name_alias.'</td></tr>';
if (! empty($conf->global->SOCIETE_USEPREFIX)) // Old not used prefix field if (! empty($conf->global->SOCIETE_USEPREFIX)) // Old not used prefix field
{ {
......
htdocs/societe/document.php
+ 1
− 1
View file @ 82536923
...@@ -119,7 +119,7 @@ if ($object->id) ...@@ -119,7 +119,7 @@ if ($object->id)
print '</td></tr>'; print '</td></tr>';
// Alias names (commercial, trademark or alias names) // Alias names (commercial, trademark or alias names)
print '<tr><td valign="top">'.$langs->trans('AliasNames').'</td><td colspan="3">'; print '<tr><td>'.$langs->trans('AliasNames').'</td><td colspan="3">';
print $object->name_alias; print $object->name_alias;
print "</td></tr>"; print "</td></tr>";
......
htdocs/societe/note.php
+ 1
− 1
View file @ 82536923
...@@ -83,7 +83,7 @@ if ($id > 0) ...@@ -83,7 +83,7 @@ if ($id > 0)
print '</td></tr>'; print '</td></tr>';
// Alias names (commercial, trademark or alias names) // Alias names (commercial, trademark or alias names)
print '<tr><td valign="top">'.$langs->trans('AliasNames').'</td><td colspan="3">'; print '<tr><td>'.$langs->trans('AliasNames').'</td><td colspan="3">';
print $object->name_alias; print $object->name_alias;
print "</td></tr>"; print "</td></tr>";
......
htdocs/societe/price.php
+ 10
− 8
View file @ 82536923
<?php <?php
/* Copyright (C) 2001-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2001-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2012 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2015 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005 Eric Seigne <eric.seigne@ryxeo.com> * Copyright (C) 2005 Eric Seigne <eric.seigne@ryxeo.com>
* Copyright (C) 2005-2013 Regis Houssin <regis.houssin@capnetworks.com> * Copyright (C) 2005-2013 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2006 Andre Cianfarani <acianfa@free.fr> * Copyright (C) 2006 Andre Cianfarani <acianfa@free.fr>
...@@ -138,7 +138,7 @@ print $form->showrefnav($soc, 'socid', '', ($user->societe_id ? 0 : 1), 'rowid', ...@@ -138,7 +138,7 @@ print $form->showrefnav($soc, 'socid', '', ($user->societe_id ? 0 : 1), 'rowid',
print '</td></tr>'; print '</td></tr>';
// Alias names (commercial, trademark or alias names) // Alias names (commercial, trademark or alias names)
print '<tr><td valign="top">'.$langs->trans('AliasNames').'</td><td colspan="3">'; print '<tr><td>'.$langs->trans('AliasNames').'</td><td colspan="3">';
print $soc->name_alias; print $soc->name_alias;
print "</td></tr>"; print "</td></tr>";
...@@ -169,7 +169,7 @@ if (! empty($conf->barcode->enabled)) { ...@@ -169,7 +169,7 @@ if (! empty($conf->barcode->enabled)) {
print '<tr><td>' . $langs->trans('Gencod') . '</td><td colspan="3">' . $soc->barcode . '</td></tr>'; print '<tr><td>' . $langs->trans('Gencod') . '</td><td colspan="3">' . $soc->barcode . '</td></tr>';
} }
print "<tr><td valign=\"top\">" . $langs->trans('Address') . "</td><td colspan=\"3\">"; print "<tr><td>" . $langs->trans('Address') . "</td><td colspan=\"3\">";
dol_print_address($soc->address, 'gmap', 'thirdparty', $soc->id); dol_print_address($soc->address, 'gmap', 'thirdparty', $soc->id);
print "</td></tr>"; print "</td></tr>";
...@@ -536,14 +536,16 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) { ...@@ -536,14 +536,16 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
// Action // Action
if ($user->rights->produit->creer || $user->rights->service->creer) { if ($user->rights->produit->creer || $user->rights->service->creer) {
print '<td align="right">'; print '<td align="right">';
print '<a href="' . $_SERVER["PHP_SELF"] . '?action=delete_customer_price&amp;socid=' . $soc->id . '&amp;lineid=' . $line->id . '">'; print '<a href="' . $_SERVER["PHP_SELF"] . '?action=showlog_customer_price&amp;socid=' . $soc->id . '&amp;prodid=' . $line->fk_product . '">';
print img_delete(); print img_info();
print '</a>'; print '</a>';
print ' ';
print '<a href="' . $_SERVER["PHP_SELF"] . '?action=edit_customer_price&amp;socid=' . $soc->id . '&amp;lineid=' . $line->id . '">'; print '<a href="' . $_SERVER["PHP_SELF"] . '?action=edit_customer_price&amp;socid=' . $soc->id . '&amp;lineid=' . $line->id . '">';
print img_edit(); print img_edit('default', 0, 'style="vertical-align: middle;"');
print '</a>'; print '</a>';
print '<a href="' . $_SERVER["PHP_SELF"] . '?action=showlog_customer_price&amp;socid=' . $soc->id . '&amp;prodid=' . $line->fk_product . '">'; print ' ';
print img_info(); print '<a href="' . $_SERVER["PHP_SELF"] . '?action=delete_customer_price&amp;socid=' . $soc->id . '&amp;lineid=' . $line->id . '">';
print img_delete('default', 'style="vertical-align: middle;"');
print '</a>'; print '</a>';
print '</td>'; print '</td>';
} }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment