lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: missing status on contacts

Browse Source
This commit is contained in:
Laurent Destailleur 2015-07-14 11:51:27 +02:00
parent 0c9e984bb1
commit 581b6d0001
5 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/comm/card.php
View File

@ -1,6 +1,6 @@
<?php <?php
/* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2014 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2015 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2004 Eric Seigne <eric.seigne@ryxeo.com> * Copyright (C) 2004 Eric Seigne <eric.seigne@ryxeo.com>
* Copyright (C) 2006 Andre Cianfarani <acianfa@free.fr> * Copyright (C) 2006 Andre Cianfarani <acianfa@free.fr>
* Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com> * Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com>
@ -227,8 +227,8 @@ if ($id > 0)
print $form->showrefnav($object,'socid','',($user->societe_id?0:1),'rowid','nom','',''); 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 name (commercial, trademark or alias name)
print '<tr><td>'.$langs->trans('AliasNames').'</td><td colspan="3">'; print '<tr><td>'.$langs->trans('AliasNameShort').'</td><td colspan="3">';
print $object->name_alias; print $object->name_alias;
print "</td></tr>"; print "</td></tr>";

11
htdocs/core/boxes/box_contacts.php
View File

@ -1,6 +1,6 @@
<?php <?php
/* Copyright (C) 2003-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2003-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2010 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2015 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2009 Regis Houssin <regis.houssin@capnetworks.com> * Copyright (C) 2005-2009 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2015 Frederic France <frederic.france@free.fr> * Copyright (C) 2015 Frederic France <frederic.france@free.fr>
* *
@ -62,7 +62,7 @@ class box_contacts extends ModeleBoxes
if ($user->rights->societe->lire) if ($user->rights->societe->lire)
{ {
$sql = "SELECT sp.rowid as id, sp.lastname, sp.firstname, sp.civility as civility_id, sp.datec, sp.tms, sp.fk_soc"; $sql = "SELECT sp.rowid as id, sp.lastname, sp.firstname, sp.civility as civility_id, sp.datec, sp.tms, sp.fk_soc, sp.statut as status";
$sql.= ", s.nom as socname"; $sql.= ", s.nom as socname";
$sql.= ", s.code_client"; $sql.= ", s.code_client";
$sql.= " FROM ".MAIN_DB_PREFIX."socpeople as sp"; $sql.= " FROM ".MAIN_DB_PREFIX."socpeople as sp";
@ -91,6 +91,7 @@ class box_contacts extends ModeleBoxes
$contactstatic->lastname=$objp->lastname; $contactstatic->lastname=$objp->lastname;
$contactstatic->firstname=$objp->firstname; $contactstatic->firstname=$objp->firstname;
$contactstatic->civility_id=$objp->civility_id; $contactstatic->civility_id=$objp->civility_id;
$contactstatic->statut=$objp->status;
$societestatic->id = $objp->fk_soc; $societestatic->id = $objp->fk_soc;
$societestatic->code_client = $objp->code_client; $societestatic->code_client = $objp->code_client;
@ -113,6 +114,12 @@ class box_contacts extends ModeleBoxes
'text' => dol_print_date($datem, "day"), 'text' => dol_print_date($datem, "day"),
); );
$this->info_box_contents[$line][] = array(
'td' => 'align="right" class="nowrap" width="18"',
'text' => $contactstatic->getLibStatut(3),
'asis'=>1,
);
$line++; $line++;
} }

2
htdocs/fourn/card.php
View File

@ -139,7 +139,7 @@ if ($object->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('AliasNameShort').'</td><td colspan="3">';
print $object->name_alias; print $object->name_alias;
print "</td></tr>"; print "</td></tr>";

3
htdocs/langs/en_US/companies.lang
View File

@ -30,7 +30,8 @@ ThirdPartyContact=Third party contact/address
StatusContactValidated=Status of contact/address StatusContactValidated=Status of contact/address
Company=Company Company=Company
CompanyName=Company name CompanyName=Company name
AliasNames=Alias names (commercial, trademark, ...) AliasNames=Alias name (commercial, trademark, ...)
AliasNameShort=Alias name
Companies=Companies Companies=Companies
CountryIsInEEC=Country is inside European Economic Community CountryIsInEEC=Country is inside European Economic Community
ThirdPartyName=Third party name ThirdPartyName=Third party name

2
htdocs/theme/eldy/style.css.php
View File

@ -258,7 +258,7 @@ textarea.cke_source:focus
input, input.flat, textarea, textarea.flat, form.flat select, select, select.flat, .dataTables_length label select { input, input.flat, textarea, textarea.flat, form.flat select, select, select.flat, .dataTables_length label select {
font-size: <?php print $fontsize ?>px; font-size: <?php print $fontsize ?>px;
font-family: <?php print $fontlist ?>; font-family: <?php print $fontlist ?>;
background: #FDFDFD; background: #FFF;
color: #111; color: #111;
border: 1px solid #C0C0C0; border: 1px solid #C0C0C0;
margin: 0px 0px 0px 0px; margin: 0px 0px 0px 0px;