mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2026-02-14 08:54:21 +01:00
Start to work on a common banner for tabs (goal is to have a nicer and
generic part for all element)
This commit is contained in:
Laurent Destailleur
@@ -434,6 +434,80 @@ abstract class CommonObject
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Return full address of contact
|
||||
*
|
||||
* @param Societe $object Object Societe or null
|
||||
* @return string Full address string
|
||||
*/
|
||||
function getBannerAddress($htmlkey, $object=null)
|
||||
{
|
||||
global $conf, $langs;
|
||||
|
||||
$countriesusingstate=array('AU','US','IN','GB','ES','UK','TR');
|
||||
|
||||
$out='';
|
||||
|
||||
$out.='<!-- BEGIN PHP TEMPLATE address_view.tpl.php -->';
|
||||
|
||||
$outdone=0;
|
||||
$coords = $this->getFullAddress(1,', ');
|
||||
if (! empty($conf->use_javascript_ajax))
|
||||
{
|
||||
$namecoords = $this->getFullName($langs,1).'<br>'.$coords;
|
||||
// hideonsmatphone because copyToClipboard call jquery dialog that does not work with jmobile
|
||||
$out.='<a href="#" class="hideonsmartphone" onclick="return copyToClipboard(\''.dol_escape_js($namecoords).'\',\''.dol_escape_js($langs->trans("HelpCopyToClipboard")).'\');">';
|
||||
$out.=img_picto($langs->trans("Address"), 'object_address.png');
|
||||
$out.='</a> ';
|
||||
}
|
||||
if ($coords) {
|
||||
$out.=dol_print_address($coords, 'address_'.$htmlkey.'_'.$this->id, $this->element, $this->id, 1); $outdone++;
|
||||
$outdone++;
|
||||
}
|
||||
|
||||
if (! in_array($object->country_code,$countriesusingstate) && empty($conf->global->MAIN_FORCE_STATE_INTO_ADDRESS)
|
||||
&& ! empty($conf->global->SOCIETE_DISABLE_STATE) && $this->state)
|
||||
{
|
||||
$out.=($outdone?'<br>':'').$this->state;
|
||||
$outdone++;
|
||||
}
|
||||
|
||||
if ($this->phone_pro || $this->phone_mobile || $this->phone_perso || $this->fax) $out.=($outdone?'<br>':'');
|
||||
if ($this->phone_pro) {
|
||||
$out.=dol_print_phone($this->phone_pro,$country_code['code'],$this->rowid,$object->id,'AC_TEL',' ','phone'); $outdone++;
|
||||
}
|
||||
if ($this->phone_mobile) {
|
||||
$out.=dol_print_phone($this->phone_mobile,$country_code['code'],$this->rowid,$object->id,'AC_TEL',' ','phone'); $outdone++;
|
||||
}
|
||||
if ($this->phone_perso) {
|
||||
$out.=dol_print_phone($this->phone_perso,$country_code['code'],$this->rowid,$object->id,'AC_TEL',' ','phone'); $outdone++;
|
||||
}
|
||||
if ($this->fax) {
|
||||
$out.=dol_print_phone($this->fax,$country_code['code'],$this->rowid,$object->id,'AC_FAX',' ','fax'); $outdone++;
|
||||
}
|
||||
|
||||
$out.='<div style="clear: both;"></div>';
|
||||
$outdone=0;
|
||||
if ($this->email)
|
||||
{
|
||||
$out.=dol_print_email($this->email,$this->id,$object->id,'AC_EMAIL',0,0,1);
|
||||
$outdone++;
|
||||
}
|
||||
if ($this->url)
|
||||
{
|
||||
$out.=dol_print_url($this->url,'',0,1);
|
||||
$outdone++;
|
||||
}
|
||||
if (! empty($conf->skype->enabled))
|
||||
{
|
||||
if ($this->skype) $out.=($outdone?'<br>':'').dol_print_skype($this->skype,$this->id,$object->id,'AC_SKYPE');
|
||||
}
|
||||
|
||||
$out.='<!-- END PHP TEMPLATE address_view.tpl.php -->';
|
||||
|
||||
return $out;
|
||||
}
|
||||
|
||||
/**
|
||||
* Add a link between element $this->element and a contact
|
||||
*
|
||||
|
||||
@@ -5042,16 +5042,18 @@ class Form
|
||||
* @param int $shownav Show Condition (navigation is shown if value is 1)
|
||||
* @param string $fieldid Nom du champ en base a utiliser pour select next et previous (we make the select max and min on this field)
|
||||
* @param string $fieldref Nom du champ objet ref (object->ref) a utiliser pour select next et previous
|
||||
* @param string $morehtmlref Code html supplementaire a afficher apres ref
|
||||
* @param string $morehtmlref More html to show after ref
|
||||
* @param string $moreparam More param to add in nav link url.
|
||||
* @param int $nodbprefix Do not include DB prefix to forge table name
|
||||
* @param string $morehtmlleft More html code to show before ref
|
||||
* @param string $morehtmlright More html code to show before navigation arrows
|
||||
* @return string Portion HTML avec ref + boutons nav
|
||||
*/
|
||||
function showrefnav($object,$paramid,$morehtml='',$shownav=1,$fieldid='rowid',$fieldref='ref',$morehtmlref='',$moreparam='',$nodbprefix=0)
|
||||
function showrefnav($object,$paramid,$morehtml='',$shownav=1,$fieldid='rowid',$fieldref='ref',$morehtmlref='',$moreparam='',$nodbprefix=0,$morehtmlleft='',$morehtmlright='')
|
||||
{
|
||||
global $langs,$conf;
|
||||
|
||||
$ret='';
|
||||
$ret='';
|
||||
if (empty($fieldid)) $fieldid='rowid';
|
||||
if (empty($fieldref)) $fieldref='ref';
|
||||
|
||||
@@ -5064,14 +5066,18 @@ class Form
|
||||
$next_ref = $object->ref_next?'<a data-role="button" data-icon="arrow-r" data-iconpos="right" href="'.$_SERVER["PHP_SELF"].'?'.$paramid.'='.urlencode($object->ref_next).$moreparam.'">'.(empty($conf->dol_use_jmobile)?'>':' ').'</a>':'';
|
||||
|
||||
//print "xx".$previous_ref."x".$next_ref;
|
||||
$ret.='<div style="vertical-align: middle"><div class="inline-block floatleft refid'.(($shownav && ($previous_ref || $next_ref))?' refidpadding':'').'">';
|
||||
$ret.='<div style="vertical-align: middle">';
|
||||
|
||||
$ret.='<div class="inline-block floatleft">'.$morehtmlleft.'</div>';
|
||||
|
||||
$ret.='<div class="inline-block floatleft valignmiddle refid'.(($shownav && ($previous_ref || $next_ref))?' refidpadding':'').'">';
|
||||
|
||||
$ret.=dol_htmlentities($object->$fieldref);
|
||||
if ($morehtmlref)
|
||||
{
|
||||
$ret.=' '.$morehtmlref;
|
||||
}
|
||||
$ret.='</div>';
|
||||
$ret.='</div>';
|
||||
|
||||
if ($previous_ref || $next_ref || $morehtml)
|
||||
{
|
||||
@@ -5079,23 +5085,20 @@ class Form
|
||||
}
|
||||
if ($morehtml)
|
||||
{
|
||||
//$ret.='</td><td class="paddingrightonly" align="right">'.$morehtml;
|
||||
$ret.='<li class="noborder litext">'.$morehtml.'</li>';
|
||||
}
|
||||
if ($shownav && ($previous_ref || $next_ref))
|
||||
{
|
||||
//$ret.='</td><td class="nobordernopadding" align="center" width="20">'.$previous_ref.'</td>';
|
||||
//$ret.='<td class="nobordernopadding" align="center" width="20">'.$next_ref;
|
||||
$ret.='<li class="pagination">'.$previous_ref.'</li>';
|
||||
$ret.='<li class="pagination">'.$next_ref.'</li>';
|
||||
}
|
||||
if ($previous_ref || $next_ref || $morehtml)
|
||||
{
|
||||
//$ret.='</td></tr></table>';
|
||||
$ret.='</ul></div>';
|
||||
}
|
||||
$ret.='</div>';
|
||||
|
||||
$ret.='<div class="statusref">'.$morehtmlright.'</div>';
|
||||
$ret.='</div>';
|
||||
|
||||
return $ret;
|
||||
}
|
||||
|
||||
@@ -5132,15 +5135,16 @@ class Form
|
||||
/**
|
||||
* Return HTML code to output a photo
|
||||
*
|
||||
* @param string $modulepart Key to define module concerned ('societe', 'userphoto', 'memberphoto')
|
||||
* @param object $object Object containing data to retrieve file name
|
||||
* @param int $width Width of photo
|
||||
* @param int $height Height of photo (auto if 0)
|
||||
* @param int $caneditfield Add edit fields
|
||||
* @param string $cssclass CSS name to use on img for photo
|
||||
* @return string HTML code to output photo
|
||||
* @param string $modulepart Key to define module concerned ('societe', 'userphoto', 'memberphoto')
|
||||
* @param object $object Object containing data to retrieve file name
|
||||
* @param int $width Width of photo
|
||||
* @param int $height Height of photo (auto if 0)
|
||||
* @param int $caneditfield Add edit fields
|
||||
* @param string $cssclass CSS name to use on img for photo
|
||||
* @param int $genericifundef Use a generic image if no image avaiable
|
||||
* @return string HTML code to output photo
|
||||
*/
|
||||
static function showphoto($modulepart, $object, $width=100, $height=0, $caneditfield=0, $cssclass='photowithmargin')
|
||||
static function showphoto($modulepart, $object, $width=100, $height=0, $caneditfield=0, $cssclass='photowithmargin', $genericifundef=0)
|
||||
{
|
||||
global $conf,$langs;
|
||||
|
||||
@@ -5199,7 +5203,7 @@ class Form
|
||||
else
|
||||
{
|
||||
$nophoto='/public/theme/common/nophoto.jpg';
|
||||
if (in_array($modulepart,array('userphoto','contact'))) // For module thar are "physical" users
|
||||
if (in_array($modulepart,array('userphoto','contact'))) // For module that are "physical" users
|
||||
{
|
||||
$nophoto='/public/theme/common/user_anonymous.png';
|
||||
if ($object->gender == 'man') $nophoto='/public/theme/common/user_man.png';
|
||||
|
||||
@@ -689,10 +689,9 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='')
|
||||
{
|
||||
$obj = $db->fetch_object($result);
|
||||
$var = !$var;
|
||||
print "<tr ".$bc[$var].">";
|
||||
|
||||
print '<td>';
|
||||
|
||||
$contactstatic->id = $obj->rowid;
|
||||
$contactstatic->ref = $obj->ref;
|
||||
$contactstatic->statut = $obj->statut;
|
||||
$contactstatic->lastname = $obj->lastname;
|
||||
$contactstatic->firstname = $obj->firstname;
|
||||
@@ -705,44 +704,23 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='')
|
||||
$contactstatic->phone_mobile = $obj->phone_mobile;
|
||||
$contactstatic->phone_perso = $obj->phone_perso;
|
||||
$contactstatic->email = $obj->email;
|
||||
$contactstatic->web = $obj->web;
|
||||
$contactstatic->skype = $obj->skype;
|
||||
|
||||
$country_code = getCountry($obj->country_id, 'all');
|
||||
$contactstatic->country_code = $country_code;
|
||||
|
||||
print "<tr ".$bc[$var].">";
|
||||
|
||||
print '<td>';
|
||||
print $contactstatic->getNomUrl(1,'',0,'&backtopage='.urlencode($backtopage));
|
||||
print '</td><td>';
|
||||
if ($obj->poste) print $obj->poste;
|
||||
print '</td>';
|
||||
|
||||
$country_code = getCountry($obj->country_id, 'all');
|
||||
|
||||
// Address and phone
|
||||
print '<td>';
|
||||
$outdone=0;
|
||||
$contactstatic->address = $obj->address;
|
||||
$contactstatic->zip = $obj->zip;
|
||||
$contactstatic->town = $obj->town;
|
||||
$contactstatic->country_id = $obj->country_id;
|
||||
$coords = $contactstatic->getFullAddress(1,', ');
|
||||
if (! empty($conf->use_javascript_ajax))
|
||||
{
|
||||
$namecoords = $contactstatic->getFullName($langs,1).'<br>'.$coords;
|
||||
// hideonsmatphone because copyToClipboard call jquery dialog that does not work with jmobile
|
||||
print '<a href="#" class="hideonsmartphone" onclick="return copyToClipboard(\''.dol_escape_js($namecoords).'\',\''.dol_escape_js($langs->trans("HelpCopyToClipboard")).'\');">';
|
||||
print img_picto($langs->trans("Address"), 'object_address.png');
|
||||
print '</a> ';
|
||||
}
|
||||
if ($coords) { print dol_print_address($coords,'address_contact_'.$obj->rowid, 'contact', $obj->rowid); $outdone++; }
|
||||
|
||||
if ($obj->phone_pro || $obj->phone_mobile || $obj->phone_perso || $obj->fax) print ($outdone?'<br>':'');
|
||||
if ($obj->phone_pro) { print dol_print_phone($obj->phone_pro,$country_code['code'],$obj->rowid,$object->id,'AC_TEL',' ','phone'); $outdone++; }
|
||||
if ($obj->phone_mobile) { print dol_print_phone($obj->phone_mobile,$country_code['code'],$obj->rowid,$object->id,'AC_TEL',' ','phone'); $outdone++; }
|
||||
if ($obj->phone_perso) { print dol_print_phone($obj->phone_perso,$country_code['code'],$obj->rowid,$object->id,'AC_TEL',' ','phone'); $outdone++; }
|
||||
if ($obj->fax) { print dol_print_phone($obj->fax,$country_code['code'],$obj->rowid,$object->id,'AC_FAX',' ','fax'); $outdone++; }
|
||||
|
||||
print '<div style="clear: both;"></div>';
|
||||
$outdone=0;
|
||||
if ($obj->email) print dol_print_email($obj->email,$obj->rowid,$object->id,'AC_EMAIL',0,0,1);
|
||||
if (! empty($conf->skype->enabled))
|
||||
{
|
||||
if ($obj->skype) print ($outdone?'<br>':'').dol_print_skype($obj->skype,$obj->rowid,$object->id,'AC_SKYPE');
|
||||
}
|
||||
print $contactstatic->getBannerAddress('contact', $object);
|
||||
print '</td>';
|
||||
|
||||
// Status
|
||||
|
||||
@@ -1315,20 +1315,25 @@ function dol_print_size($size,$shortvalue=0,$shortunit=0)
|
||||
* @param string $url Url to show
|
||||
* @param string $target Target for link
|
||||
* @param int $max Max number of characters to show
|
||||
* @param int $withpicto With picto
|
||||
* @return string HTML Link
|
||||
*/
|
||||
function dol_print_url($url,$target='_blank',$max=32)
|
||||
function dol_print_url($url,$target='_blank',$max=32,$withpicto=0)
|
||||
{
|
||||
global $langs;
|
||||
|
||||
if (empty($url)) return '';
|
||||
|
||||
$link='<a href="';
|
||||
if (! preg_match('/^http/i',$url)) $link.='http://';
|
||||
$link.=$url;
|
||||
if ($target) $link.='" target="'.$target.'">';
|
||||
$link.='"';
|
||||
if ($target) $link.=' target="'.$target.'"';
|
||||
$link.='>';
|
||||
if (! preg_match('/^http/i',$url)) $link.='http://';
|
||||
$link.=dol_trunc($url,$max);
|
||||
$link.='</a>';
|
||||
return $link;
|
||||
return '<div class="nospan float" style="margin-right: 10px">'.($withpicto?img_picto($langs->trans("Url"), 'object_globe.png').' ':'').$link.'</div>';
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -1591,26 +1596,30 @@ function dol_user_country()
|
||||
/**
|
||||
* Format address string
|
||||
*
|
||||
* @param string $address Address
|
||||
* @param int $htmlid Html ID (for example 'gmap')
|
||||
* @param int $mode thirdparty|contact|member|other
|
||||
* @param int $id Id of object
|
||||
* @return void
|
||||
* @param string $address Address
|
||||
* @param int $htmlid Html ID (for example 'gmap')
|
||||
* @param int $mode thirdparty|contact|member|other
|
||||
* @param int $id Id of object
|
||||
* @param int $noprint No output. Result is the function return
|
||||
* @return string|void Nothing if noprint is 0, formatted address if noprint is 1
|
||||
* @see dol_format_address
|
||||
*/
|
||||
function dol_print_address($address, $htmlid, $mode, $id)
|
||||
function dol_print_address($address, $htmlid, $mode, $id, $noprint=0)
|
||||
{
|
||||
global $conf, $user, $langs, $hookmanager;
|
||||
|
||||
$out = '';
|
||||
|
||||
if ($address)
|
||||
{
|
||||
if ($hookmanager) {
|
||||
$parameters = array('element' => $mode, 'id' => $id);
|
||||
$reshook = $hookmanager->executeHooks('printAddress', $parameters, $address);
|
||||
print $hookmanager->resPrint;
|
||||
$out.=$hookmanager->resPrint;
|
||||
}
|
||||
if (empty($reshook)) {
|
||||
print nl2br($address);
|
||||
if (empty($reshook))
|
||||
{
|
||||
$out.=nl2br($address);
|
||||
$showgmap=$showomap=0;
|
||||
if ($mode=='thirdparty' && ! empty($conf->google->enabled) && ! empty($conf->global->GOOGLE_ENABLE_GMAPS)) $showgmap=1;
|
||||
if ($mode=='contact' && ! empty($conf->google->enabled) && ! empty($conf->global->GOOGLE_ENABLE_GMAPS_CONTACTS)) $showgmap=1;
|
||||
@@ -1623,15 +1632,17 @@ function dol_print_address($address, $htmlid, $mode, $id)
|
||||
if ($showgmap)
|
||||
{
|
||||
$url=dol_buildpath('/google/gmaps.php?mode='.$mode.'&id='.$id,1);
|
||||
print ' <a href="'.$url.'" target="_gmaps"><img id="'.$htmlid.'" border="0" src="'.DOL_URL_ROOT.'/theme/common/gmap.png"></a>';
|
||||
$out.=' <a href="'.$url.'" target="_gmaps"><img id="'.$htmlid.'" border="0" src="'.DOL_URL_ROOT.'/theme/common/gmap.png"></a>';
|
||||
}
|
||||
if ($showomap)
|
||||
{
|
||||
$url=dol_buildpath('/openstreetmap/maps.php?mode='.$mode.'&id='.$id,1);
|
||||
print ' <a href="'.$url.'" target="_gmaps"><img id="'.$htmlid.'_openstreetmap" border="0" src="'.DOL_URL_ROOT.'/theme/common/gmap.png"></a>';
|
||||
$out.=' <a href="'.$url.'" target="_gmaps"><img id="'.$htmlid.'_openstreetmap" border="0" src="'.DOL_URL_ROOT.'/theme/common/gmap.png"></a>';
|
||||
}
|
||||
}
|
||||
}
|
||||
if ($noprint) return $out;
|
||||
else print $out;
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -1727,7 +1727,7 @@ else
|
||||
|
||||
// Capital
|
||||
print '<tr><td>'.fieldLabel('Capital','capital').'</td>';
|
||||
print '<td colspan="3"><input type="text" name="capital" id="capital" size="10" value="'.$object->capital.'"><font class="hideonsmartphone">'.$langs->trans("Currency".$conf->currency).'</font></td></tr>';
|
||||
print '<td colspan="3"><input type="text" name="capital" id="capital" size="10" value="'.$object->capital.'"> <font class="hideonsmartphone">'.$langs->trans("Currency".$conf->currency).'</font></td></tr>';
|
||||
|
||||
// Default language
|
||||
if (! empty($conf->global->MAIN_MULTILANGS))
|
||||
@@ -1863,10 +1863,30 @@ else
|
||||
|
||||
dol_htmloutput_errors($error,$errors);
|
||||
|
||||
$showlogo=$object->logo;
|
||||
//$showlogo=$object->logo;
|
||||
$showlogo=1;
|
||||
$showbarcode=empty($conf->barcode->enabled)?0:1;
|
||||
if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->lire_advance)) $showbarcode=0;
|
||||
|
||||
print '<div class="arearef heightref valignmiddle" width="100%">';
|
||||
//$morehtmlleft='<div class="floatleft inline-block valignmiddle divphotoref">'.img_picto('', 'title_companies', '', '').'</div>';
|
||||
if ($showlogo) $morehtmlleft.='<div class="floatleft inline-block valignmiddle divphotoref">'.$form->showphoto('societe',$object,0,0,0,'photoref').'</div>';
|
||||
//if ($showlogo) $morehtmlleft.='<div class="floatleft inline-block valignmiddle divphotoref">'.$form->showphoto('societe',$object,0,0,0,'photoref').'</div>';
|
||||
if ($showbarcode) $morehtmlleft.='<div class="floatleft inline-block valignmiddle divphotoref">'.$form->showbarcode($object).'</div>';
|
||||
if (! empty($conf->use_javascript_ajax) && $user->rights->societe->creer && ! empty($conf->global->MAIN_DIRECT_STATUS_UPDATE)) {
|
||||
$morehtmlright.=ajax_object_onoff($object, 'status', 'status', 'InActivity', 'ActivityCeased');
|
||||
} else {
|
||||
$morehtmlright.=$object->getLibStatut(2);
|
||||
}
|
||||
$morehtml='';
|
||||
if (! empty($object->ame_nalias)) $morehtml.='<div class="refidno">'.$object->name_alias.'</div>';
|
||||
$morehtml.='<div class="refidno">';
|
||||
$morehtml.=$object->getBannerAddress('refaddress',$object);
|
||||
$morehtml.='</div>';
|
||||
print $form->showrefnav($object, 'socid', '', ($user->societe_id?0:1), 'rowid', 'nom', $morehtml, '', 0, $morehtmlleft, $morehtmlright);
|
||||
print '</div>';
|
||||
print '<div class="underrefbanner clearboth"></div>';
|
||||
|
||||
print '<table class="border" width="100%">';
|
||||
|
||||
// Ref
|
||||
@@ -1879,18 +1899,21 @@ else
|
||||
*/
|
||||
|
||||
// Name
|
||||
/*
|
||||
print '<tr><td width="25%">'.$langs->trans('ThirdPartyName').'</td>';
|
||||
print '<td colspan="3">';
|
||||
print $form->showrefnav($object, 'socid', '', ($user->societe_id?0:1), 'rowid', 'nom');
|
||||
print '</td>';
|
||||
print '</tr>';
|
||||
|
||||
*/
|
||||
|
||||
// Alias names (commercial, trademark or alias names)
|
||||
print '<tr><td>'.$langs->trans('AliasNames').'</td><td colspan="3">';
|
||||
print '<tr><td>'.$langs->trans('AliasNames').'</td><td>';
|
||||
print $object->name_alias;
|
||||
print "</td></tr>";
|
||||
|
||||
// Logo+barcode
|
||||
/*
|
||||
$rowspan=6;
|
||||
if (! empty($conf->global->SOCIETE_USEPREFIX)) $rowspan++;
|
||||
if (! empty($object->client)) $rowspan++;
|
||||
@@ -1905,12 +1928,12 @@ else
|
||||
if ($showlogo && $showbarcode) $htmllogobar.='<br><br>';
|
||||
if ($showbarcode) $htmllogobar.=$form->showbarcode($object);
|
||||
$htmllogobar.='</td>';
|
||||
}
|
||||
}*/
|
||||
|
||||
// Prefix
|
||||
if (! empty($conf->global->SOCIETE_USEPREFIX)) // Old not used prefix field
|
||||
{
|
||||
print '<tr><td>'.$langs->trans('Prefix').'</td><td colspan="'.(2+(($showlogo || $showbarcode)?0:1)).'">'.$object->prefix_comm.'</td>';
|
||||
print '<tr><td>'.$langs->trans('Prefix').'</td><td>'.$object->prefix_comm.'</td>';
|
||||
print $htmllogobar; $htmllogobar='';
|
||||
print '</tr>';
|
||||
}
|
||||
@@ -1919,7 +1942,7 @@ else
|
||||
if ($object->client)
|
||||
{
|
||||
print '<tr><td>';
|
||||
print $langs->trans('CustomerCode').'</td><td colspan="'.(2+(($showlogo || $showbarcode)?0:1)).'">';
|
||||
print $langs->trans('CustomerCode').'</td><td>';
|
||||
print $object->code_client;
|
||||
if ($object->check_codeclient() <> 0) print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
|
||||
print '</td>';
|
||||
@@ -1931,7 +1954,7 @@ else
|
||||
if (! empty($conf->fournisseur->enabled) && $object->fournisseur && ! empty($user->rights->fournisseur->lire))
|
||||
{
|
||||
print '<tr><td>';
|
||||
print $langs->trans('SupplierCode').'</td><td colspan="'.(2+(($showlogo || $showbarcode)?0:1)).'">';
|
||||
print $langs->trans('SupplierCode').'</td><td>';
|
||||
print $object->code_fournisseur;
|
||||
if ($object->check_codefournisseur() <> 0) print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
|
||||
print '</td>';
|
||||
@@ -1943,13 +1966,16 @@ else
|
||||
if (! empty($conf->barcode->enabled))
|
||||
{
|
||||
print '<tr><td>';
|
||||
print $langs->trans('Gencod').'</td><td colspan="'.(2+(($showlogo || $showbarcode)?0:1)).'">'.$object->barcode;
|
||||
print $langs->trans('Gencod').'</td><td>'.$object->barcode;
|
||||
print '</td>';
|
||||
print $htmllogobar; $htmllogobar='';
|
||||
if ($htmllogobar) $htmllogobar.=$form->showbarcode($object);
|
||||
print $htmllogobar;
|
||||
$htmllogobar='';
|
||||
print '</tr>';
|
||||
}
|
||||
|
||||
// Status
|
||||
/*
|
||||
print '<tr><td>'.$langs->trans("Status").'</td>';
|
||||
print '<td colspan="'.(2+(($showlogo || $showbarcode)?0:1)).'">';
|
||||
if (! empty($conf->use_javascript_ajax) && $user->rights->societe->creer && ! empty($conf->global->MAIN_DIRECT_STATUS_UPDATE)) {
|
||||
@@ -1960,8 +1986,10 @@ else
|
||||
print '</td>';
|
||||
print $htmllogobar; $htmllogobar='';
|
||||
print '</tr>';
|
||||
|
||||
*/
|
||||
|
||||
// Address
|
||||
/*
|
||||
print '<tr><td class="tdtop">'.$langs->trans('Address').'</td><td colspan="'.(2+(($showlogo || $showbarcode)?0:1)).'">';
|
||||
dol_print_address($object->address,'gmap','thirdparty',$object->id);
|
||||
print '</td></tr>';
|
||||
@@ -2007,7 +2035,8 @@ else
|
||||
// Phone / Fax
|
||||
print '<tr><td>'.$langs->trans('Phone').'</td><td style="min-width: 25%;">'.dol_print_phone($object->phone,$object->country_code,0,$object->id,'AC_TEL').'</td>';
|
||||
print '<td>'.$langs->trans('Fax').'</td><td style="min-width: 25%;">'.dol_print_phone($object->fax,$object->country_code,0,$object->id,'AC_FAX').'</td></tr>';
|
||||
|
||||
*/
|
||||
|
||||
// Prof ids
|
||||
$i=1; $j=0;
|
||||
while ($i <= 6)
|
||||
@@ -2015,8 +2044,9 @@ else
|
||||
$idprof=$langs->transcountry('ProfId'.$i,$object->country_code);
|
||||
if ($idprof!='-')
|
||||
{
|
||||
if (($j % 2) == 0) print '<tr>';
|
||||
print '<td>'.$idprof.'</td><td>';
|
||||
//if (($j % 2) == 0) print '<tr>';
|
||||
print '<tr>';
|
||||
print '<td>'.$idprof.'</td><td>';
|
||||
$key='idprof'.$i;
|
||||
print $object->$key;
|
||||
if ($object->$key)
|
||||
@@ -2025,12 +2055,13 @@ else
|
||||
else print ' <font class="error">('.$langs->trans("ErrorWrongValue").')</font>';
|
||||
}
|
||||
print '</td>';
|
||||
if (($j % 2) == 1) print '</tr>';
|
||||
//if (($j % 2) == 1) print '</tr>';
|
||||
print '</tr>';
|
||||
$j++;
|
||||
}
|
||||
$i++;
|
||||
}
|
||||
if ($j % 2 == 1) print '<td colspan="2"></td></tr>';
|
||||
//if ($j % 2 == 1) print '<td colspan="2"></td></tr>';
|
||||
|
||||
// VAT payers
|
||||
print '<tr><td>';
|
||||
@@ -2038,9 +2069,11 @@ else
|
||||
print '</td><td>';
|
||||
print yn($object->tva_assuj);
|
||||
print '</td>';
|
||||
|
||||
print '</tr>';
|
||||
|
||||
// VAT Code
|
||||
print '<td class="nowrap">'.$langs->trans('VATIntra').'</td><td>';
|
||||
print '<tr>';
|
||||
print '<td class="nowrap">'.$langs->trans('VATIntra').'</td><td>';
|
||||
if ($object->tva_intra)
|
||||
{
|
||||
$s='';
|
||||
@@ -2083,7 +2116,7 @@ else
|
||||
{
|
||||
print '<tr><td>'.$langs->transcountry("LocalTax1IsUsed",$mysoc->country_code).'</td><td>';
|
||||
print yn($object->localtax1_assuj);
|
||||
print '</td><td>'.$langs->transcountry("LocalTax2IsUsed",$mysoc->country_code).'</td><td>';
|
||||
print '</td></tr><tr><td>'.$langs->transcountry("LocalTax2IsUsed",$mysoc->country_code).'</td><td>';
|
||||
print yn($object->localtax2_assuj);
|
||||
print '</td></tr>';
|
||||
|
||||
@@ -2177,13 +2210,14 @@ else
|
||||
// Type + Staff
|
||||
$arr = $formcompany->typent_array(1);
|
||||
$object->typent= $arr[$object->typent_code];
|
||||
print '<tr><td>'.$langs->trans("ThirdPartyType").'</td><td>'.$object->typent.'</td><td>'.$langs->trans("Staff").'</td><td>'.$object->effectif.'</td></tr>';
|
||||
print '<tr><td>'.$langs->trans("ThirdPartyType").'</td><td>'.$object->typent.'</td>';
|
||||
print '<tr><td>'.$langs->trans("Staff").'</td><td>'.$object->effectif.'</td></tr>';
|
||||
|
||||
// Legal
|
||||
print '<tr><td>'.$langs->trans('JuridicalStatus').'</td><td colspan="3">'.$object->forme_juridique.'</td></tr>';
|
||||
print '<tr><td>'.$langs->trans('JuridicalStatus').'</td><td>'.$object->forme_juridique.'</td></tr>';
|
||||
|
||||
// Capital
|
||||
print '<tr><td>'.$langs->trans('Capital').'</td><td colspan="3">';
|
||||
print '<tr><td>'.$langs->trans('Capital').'</td><td>';
|
||||
if ($object->capital) print price($object->capital,'',$langs,0,-1,-1, $conf->currency);
|
||||
else print ' ';
|
||||
print '</td></tr>';
|
||||
@@ -2192,7 +2226,7 @@ else
|
||||
if (! empty($conf->global->MAIN_MULTILANGS))
|
||||
{
|
||||
require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
|
||||
print '<tr><td>'.$langs->trans("DefaultLang").'</td><td colspan="3">';
|
||||
print '<tr><td>'.$langs->trans("DefaultLang").'</td><td>';
|
||||
//$s=picto_from_langcode($object->default_lang);
|
||||
//print ($s?$s.' ':'');
|
||||
$langs->load("languages");
|
||||
@@ -2207,7 +2241,7 @@ else
|
||||
// Customer
|
||||
if ($object->prospect || $object->client) {
|
||||
print '<tr><td>' . $langs->trans("CustomersCategoriesShort") . '</td>';
|
||||
print '<td colspan="3">';
|
||||
print '<td>';
|
||||
print $form->showCategories($object->id, 'customer', 1);
|
||||
print "</td></tr>";
|
||||
}
|
||||
@@ -2215,7 +2249,7 @@ else
|
||||
// Supplier
|
||||
if ($object->fournisseur) {
|
||||
print '<tr><td>' . $langs->trans("SuppliersCategoriesShort") . '</td>';
|
||||
print '<td colspan="3">';
|
||||
print '<td>';
|
||||
print $form->showCategories($object->id, 'supplier', 1);
|
||||
print "</td></tr>";
|
||||
}
|
||||
|
||||
@@ -604,6 +604,38 @@ div.attacharea {
|
||||
padding-bottom: 10px;
|
||||
}
|
||||
|
||||
div.arearef {
|
||||
/*border-bottom: 1px solid #bbb;*/
|
||||
padding-top: 2px;
|
||||
padding-bottom: 5px;
|
||||
/*padding-right: 3px;
|
||||
padding-left: 2px;*/
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
div.heightref {
|
||||
min-height: 74px;
|
||||
}
|
||||
div.divphotoref {
|
||||
padding-right: 10px;
|
||||
}
|
||||
div.statusref {
|
||||
float: right;
|
||||
padding-right: 12px;
|
||||
margin-top: 9px;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
img.photoref {
|
||||
height: 68px;
|
||||
width: 68px;
|
||||
border: 1px solid #CCC;
|
||||
-moz-box-shadow: 3px 3px 4px #DDD;
|
||||
-webkit-box-shadow: 3px 3px 4px #DDD;
|
||||
box-shadow: 3px 3px 4px #DDD;
|
||||
}
|
||||
.underrefbanner {
|
||||
border-bottom: 2px solid #888;
|
||||
}
|
||||
|
||||
/* ============================================================================== */
|
||||
/* Menu top et 1ere ligne tableau */
|
||||
/* ============================================================================== */
|
||||
@@ -2051,13 +2083,19 @@ table.liste td {
|
||||
|
||||
/* Pagination */
|
||||
div.refidpadding {
|
||||
padding-top: <?php print empty($conf->dol_use_jmobile)?'8':'12'; ?>px;
|
||||
/* padding-top: <?php print empty($conf->dol_use_jmobile)?'8':'12'; ?>px; */
|
||||
}
|
||||
div.refid {
|
||||
padding-top: <?php print empty($conf->dol_use_jmobile)?'5':'12'; ?>px;
|
||||
/* padding-top: <?php print empty($conf->dol_use_jmobile)?'5':'12'; ?>px; */
|
||||
font-weight: bold;
|
||||
color: #766;
|
||||
font-size: 120%;
|
||||
font-size: 160%;
|
||||
}
|
||||
div.refidno {
|
||||
padding-top: 2px;
|
||||
font-weight: normal;
|
||||
color: #444;
|
||||
font-size: <?php print $fontsize ?>px;
|
||||
}
|
||||
|
||||
div.pagination {
|
||||
|
||||
Reference in New Issue
Block a user