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

Fix: rsidu de la suppression du champ "code" de la table llx_user

Browse Source
This commit is contained in:
Regis Houssin 2007-03-20 00:55:01 +00:00
parent cf6e9b4903
commit 4cf0a3a828
4 changed files with 23 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/contact.class.php
View File

@ -405,10 +405,9 @@ class Contact
$this->address = $obj->address;
$this->cp = $obj->cp;
$this->ville = $obj->ville;
$this->fk_pays = $obj->fk_pays;
$this->pays_code = $obj->fk_pays?$obj->pays_code:'';
//$this->pays = $obj->fk_pays?$obj->pays:'';
$this->pays = $langs->trans("Country".$obj->pays_code)?$langs->trans("Country".$obj->pays_code):'';
$this->fk_pays = $obj->fk_pays;
$this->pays_code = $obj->fk_pays?$obj->pays_code:'';
$this->pays = $langs->trans("Country".$obj->pays_code)?$langs->trans("Country".$obj->pays_code):'';
$this->societeid = $obj->fk_soc;
$this->socid = $obj->fk_soc;
@ -418,8 +417,7 @@ class Contact
$this->fax = trim($obj->fax);
$this->phone_perso = trim($obj->phone_perso);
$this->phone_mobile = trim($obj->phone_mobile);
$this->code = $obj->code;
$this->email = $obj->email;
$this->jabberid = $obj->jabberid;
$this->mail = $obj->email;

32
htdocs/includes/triggers/interface_webcal.class.php
View File

@ -155,7 +155,7 @@ class InterfaceWebCal
if ($object->prefix) $this->desc.=" (".$object->prefix.")";
//$this->desc.="\n".$langs->transnoentities("Customer").': '.yn($object->client);
//$this->desc.="\n".$langs->transnoentities("Supplier").': '.yn($object->fournisseur);
$this->desc.="\n".$langs->transnoentities("Author").': '.$user->code;
$this->desc.="\n".$langs->transnoentities("Author").': '.$user->login;
}
// Contracts
@ -169,7 +169,7 @@ class InterfaceWebCal
$this->duree=0;
$this->texte=$langs->transnoentities("ContractValidatedInDolibarr",$object->ref);
$this->desc=$langs->transnoentities("ContractValidatedInDolibarr",$object->ref);
$this->desc.="\n".$langs->transnoentities("Author").': '.$user->code;
$this->desc.="\n".$langs->transnoentities("Author").': '.$user->login;
}
elseif ($action == 'CONTRACT_CANCEL')
{
@ -180,7 +180,7 @@ class InterfaceWebCal
$this->duree=0;
$this->texte=$langs->transnoentities("ContractCanceledInDolibarr",$object->ref);
$this->desc=$langs->transnoentities("ContractCanceledInDolibarr",$object->ref);
$this->desc.="\n".$langs->transnoentities("Author").': '.$user->code;
$this->desc.="\n".$langs->transnoentities("Author").': '.$user->login;
}
elseif ($action == 'CONTRACT_CLOSE')
{
@ -191,7 +191,7 @@ class InterfaceWebCal
$this->duree=0;
$this->texte=$langs->transnoentities("ContractClosedInDolibarr",$object->ref);
$this->desc=$langs->transnoentities("ContractClosedInDolibarr",$object->ref);
$this->desc.="\n".$langs->transnoentities("Author").': '.$user->code;
$this->desc.="\n".$langs->transnoentities("Author").': '.$user->login;
}
// Proposals
@ -204,7 +204,7 @@ class InterfaceWebCal
$this->duree=0;
$this->texte=$langs->transnoentities("PropalValidatedInDolibarr",$object->ref);
$this->desc=$langs->transnoentities("PropalValidatedInDolibarr",$object->ref);
$this->desc.="\n".$langs->transnoentities("Author").': '.$user->code;
$this->desc.="\n".$langs->transnoentities("Author").': '.$user->login;
}
elseif ($action == 'PROPAL_CLOSE_SIGNED')
{
@ -215,7 +215,7 @@ class InterfaceWebCal
$this->duree=0;
$this->texte=$langs->transnoentities("PropalClosedSignedInDolibarr",$object->ref);
$this->desc=$langs->transnoentities("PropalClosedSignedInDolibarr",$object->ref);
$this->desc.="\n".$langs->transnoentities("Author").': '.$user->code;
$this->desc.="\n".$langs->transnoentities("Author").': '.$user->login;
}
elseif ($action == 'PROPAL_CLOSE_REFUSED')
{
@ -226,7 +226,7 @@ class InterfaceWebCal
$this->duree=0;
$this->texte=$langs->transnoentities("PropalClosedRefusedInDolibarr",$object->ref);
$this->desc=$langs->transnoentities("PropalClosedRefusedInDolibarr",$object->ref);
$this->desc.="\n".$langs->transnoentities("Author").': '.$user->code;
$this->desc.="\n".$langs->transnoentities("Author").': '.$user->login;
}
// Invoices
@ -239,7 +239,7 @@ class InterfaceWebCal
$this->duree=0;
$this->texte=$langs->transnoentities("InvoiceValidatedInDolibarr",$object->ref);
$this->desc=$langs->transnoentities("InvoiceValidatedInDolibarr",$object->ref);
$this->desc.="\n".$langs->transnoentities("Author").': '.$user->code;
$this->desc.="\n".$langs->transnoentities("Author").': '.$user->login;
}
elseif ($action == 'BILL_PAYED')
{
@ -250,7 +250,7 @@ class InterfaceWebCal
$this->duree=0;
$this->texte=$langs->transnoentities("InvoicePayedInDolibarr",$object->ref);
$this->desc=$langs->transnoentities("InvoicePayedInDolibarr",$object->ref);
$this->desc.="\n".$langs->transnoentities("Author").': '.$user->code;
$this->desc.="\n".$langs->transnoentities("Author").': '.$user->login;
}
elseif ($action == 'BILL_CANCELED')
{
@ -261,7 +261,7 @@ class InterfaceWebCal
$this->duree=0;
$this->texte=$langs->transnoentities("InvoiceCanceledInDolibarr",$object->ref);
$this->desc=$langs->transnoentities("InvoiceCanceledInDolibarr",$object->ref);
$this->desc.="\n".$langs->transnoentities("Author").': '.$user->code;
$this->desc.="\n".$langs->transnoentities("Author").': '.$user->login;
}
// Payments
@ -275,7 +275,7 @@ class InterfaceWebCal
$this->texte=$langs->transnoentities("CustomerPaymentDoneInDolibarr",$object->ref);
$this->desc=$langs->transnoentities("CustomerPaymentDoneInDolibarr",$object->ref);
$this->desc.="\n".$langs->transnoentities("AmountTTC").': '.$object->total;
$this->desc.="\n".$langs->transnoentities("Author").': '.$user->code;
$this->desc.="\n".$langs->transnoentities("Author").': '.$user->login;
}
elseif ($action == 'PAYMENT_SUPPLIER_CREATE')
{
@ -287,7 +287,7 @@ class InterfaceWebCal
$this->texte=$langs->transnoentities("SupplierPaymentDoneInDolibarr",$object->ref);
$this->desc=$langs->transnoentities("SupplierPaymentDoneInDolibarr",$object->ref);
$this->desc.="\n".$langs->transnoentities("AmountTTC").': '.$object->total;
$this->desc.="\n".$langs->transnoentities("Author").': '.$user->code;
$this->desc.="\n".$langs->transnoentities("Author").': '.$user->login;
}
// Members
@ -306,7 +306,7 @@ class InterfaceWebCal
$this->desc=$langs->transnoentities("MemberValidatedInDolibarr",$object->id);
$this->desc.="\n".$langs->transnoentities("Name").': '.$object->fullname;
$this->desc.="\n".$langs->transnoentities("Type").': '.$object->type;
$this->desc.="\n".$langs->transnoentities("Author").': '.$user->code;
$this->desc.="\n".$langs->transnoentities("Author").': '.$user->login;
}
elseif ($action == 'MEMBER_SUBSCRIPTION')
{
@ -322,7 +322,7 @@ class InterfaceWebCal
$this->desc.="\n".$langs->transnoentities("Type").': '.$object->type;
$this->desc.="\n".$langs->transnoentities("Amount").': '.$object->last_subscription_amount;
$this->desc.="\n".$langs->transnoentities("Period").': '.dolibarr_print_date($object->last_subscription_date_start,'day').' - '.dolibarr_print_date($object->last_subscription_date_end,'day');
$this->desc.="\n".$langs->transnoentities("Author").': '.$user->code;
$this->desc.="\n".$langs->transnoentities("Author").': '.$user->login;
}
elseif ($action == 'MEMBER_RESILIATE')
{
@ -336,7 +336,7 @@ class InterfaceWebCal
$this->desc=$langs->transnoentities("MemberResiliatedInDolibarr",$object->id);
$this->desc.="\n".$langs->transnoentities("Name").': '.$object->fullname;
$this->desc.="\n".$langs->transnoentities("Type").': '.$object->type;
$this->desc.="\n".$langs->transnoentities("Author").': '.$user->code;
$this->desc.="\n".$langs->transnoentities("Author").': '.$user->login;
}
elseif ($action == 'MEMBER_DELETE')
{
@ -350,7 +350,7 @@ class InterfaceWebCal
$this->desc=$langs->transnoentities("MemberDeletedInDolibarr",$object->id);
$this->desc.="\n".$langs->transnoentities("Name").': '.$object->fullname;
$this->desc.="\n".$langs->transnoentities("Type").': '.$object->type;
$this->desc.="\n".$langs->transnoentities("Author").': '.$user->code;
$this->desc.="\n".$langs->transnoentities("Author").': '.$user->login;
}
// If not found

5
htdocs/telephonie/client/facture.php
View File

@ -609,7 +609,8 @@ if ($_GET["facid"] > 0)
/*
* Liste des actions propres à la facture
*/
$sql = "SELECT id, ".$db->pdate("a.datea")." as da, a.label, a.note, code";
$sql = "SELECT id, ".$db->pdate("a.datea")." as da, a.label, a.note";
$sql .= ", u.login";
$sql .= " FROM ".MAIN_DB_PREFIX."actioncomm as a, ".MAIN_DB_PREFIX."user as u ";
$sql .= " WHERE a.fk_user_author = u.rowid ";
$sql .= " AND a.fk_action in (9,10) ";
@ -639,7 +640,7 @@ if ($_GET["facid"] > 0)
print '<td>'.img_object($langs->trans("ShowTask"),"task").' '.$objp->id.'</td>';
print '<td>'.dolibarr_print_date($objp->da)."</td>\n";
print '<td>'.stripslashes($objp->label).'</td>';
print '<td>'.$objp->code.'</td>';
print '<td>'.$objp->login.'</td>';
print "</tr>\n";
$i++;
}

1
htdocs/user.class.php
View File

@ -148,7 +148,6 @@ class User
$this->fullname = trim($this->prenom . ' ' . $this->nom);
$this->login = $obj->login;
$this->code = $obj->login; // \deprecated
$this->pass_indatabase = $obj->pass;
if (! $conf->password_encrypted) $this->pass = $obj->pass;
$this->office_phone = $obj->office_phone;