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

english language standardization

Browse Source
This commit is contained in:
Grand Philippe 2013-02-23 15:36:12 +01:00
parent f862adc4d9
commit b699b79a15
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
htdocs/compta/dons/class/don.class.php
View File

@ -39,8 +39,8 @@ class Don extends CommonObject
var $ref; var $ref;
var $date; var $date;
var $amount; var $amount;
var $prenom; var $firstname;
var $nom; var $lastname;
var $societe; var $societe;
var $address; var $address;
var $cp; var $cp;
@ -181,8 +181,8 @@ class Don extends CommonObject
$this->id=0; $this->id=0;
$this->ref = 'SPECIMEN'; $this->ref = 'SPECIMEN';
$this->specimen=1; $this->specimen=1;
$this->nom = 'Doe'; $this->lastname = 'Doe';
$this->prenom = 'John'; $this->firstname = 'John';
$this->socid = 1; $this->socid = 1;
$this->date = dol_now(); $this->date = dol_now();
$this->amount = 100; $this->amount = 100;
@ -210,7 +210,7 @@ class Don extends CommonObject
if (dol_strlen(trim($this->societe)) == 0) if (dol_strlen(trim($this->societe)) == 0)
{ {
if ((dol_strlen(trim($this->nom)) + dol_strlen(trim($this->prenom))) == 0) if ((dol_strlen(trim($this->lastname)) + dol_strlen(trim($this->firstname))) == 0)
{ {
$error_string[$err] = "Vous devez saisir vos nom et prenom ou le nom de votre societe."; $error_string[$err] = "Vous devez saisir vos nom et prenom ou le nom de votre societe.";
$err++; $err++;
@ -310,8 +310,8 @@ class Don extends CommonObject
$sql.= ", entity"; $sql.= ", entity";
$sql.= ", amount"; $sql.= ", amount";
$sql.= ", fk_paiement"; $sql.= ", fk_paiement";
$sql.= ", prenom"; $sql.= ", firstname";
$sql.= ", nom"; $sql.= ", lastname";
$sql.= ", societe"; $sql.= ", societe";
$sql.= ", address"; $sql.= ", address";
$sql.= ", cp"; $sql.= ", cp";
@ -331,8 +331,8 @@ class Don extends CommonObject
$sql.= ", ".$conf->entity; $sql.= ", ".$conf->entity;
$sql.= ", ".price2num($this->amount); $sql.= ", ".price2num($this->amount);
$sql.= ", ".($this->modepaiementid?$this->modepaiementid:"null"); $sql.= ", ".($this->modepaiementid?$this->modepaiementid:"null");
$sql.= ", '".$this->db->escape($this->prenom)."'"; $sql.= ", '".$this->db->escape($this->firstname)."'";
$sql.= ", '".$this->db->escape($this->nom)."'"; $sql.= ", '".$this->db->escape($this->lastname)."'";
$sql.= ", '".$this->db->escape($this->societe)."'"; $sql.= ", '".$this->db->escape($this->societe)."'";
$sql.= ", '".$this->db->escape($this->address)."'"; $sql.= ", '".$this->db->escape($this->address)."'";
$sql.= ", '".$this->db->escape($this->zip)."'"; $sql.= ", '".$this->db->escape($this->zip)."'";
@ -391,8 +391,8 @@ class Don extends CommonObject
$sql = "UPDATE ".MAIN_DB_PREFIX."don SET "; $sql = "UPDATE ".MAIN_DB_PREFIX."don SET ";
$sql .= "amount = " . price2num($this->amount); $sql .= "amount = " . price2num($this->amount);
$sql .= ",fk_paiement = ".($this->modepaiementid?$this->modepaiementid:"null"); $sql .= ",fk_paiement = ".($this->modepaiementid?$this->modepaiementid:"null");
$sql .= ",prenom = '".$this->db->escape($this->prenom)."'"; $sql .= ",firstname = '".$this->db->escape($this->firstname)."'";
$sql .= ",nom='".$this->db->escape($this->nom)."'"; $sql .= ",lastname='".$this->db->escape($this->lastname)."'";
$sql .= ",societe='".$this->db->escape($this->societe)."'"; $sql .= ",societe='".$this->db->escape($this->societe)."'";
$sql .= ",address='".$this->db->escape($this->address)."'"; $sql .= ",address='".$this->db->escape($this->address)."'";
$sql .= ",cp='".$this->db->escape($this->zip)."'"; $sql .= ",cp='".$this->db->escape($this->zip)."'";
@ -463,7 +463,7 @@ class Don extends CommonObject
global $conf; global $conf;
$sql = "SELECT d.rowid, d.datec, d.tms as datem, d.datedon,"; $sql = "SELECT d.rowid, d.datec, d.tms as datem, d.datedon,";
$sql.= " d.prenom, d.nom, d.societe, d.amount, d.fk_statut, d.address, d.cp, d.town, d.pays, d.public, d.amount, d.fk_paiement, d.note, cp.libelle, d.email, d.phone, d.phone_mobile, d.fk_don_projet,"; $sql.= " d.firstname, d.lastname, d.societe, d.amount, d.fk_statut, d.address, d.cp, d.town, d.pays, d.public, d.amount, d.fk_paiement, d.note, cp.libelle, d.email, d.phone, d.phone_mobile, d.fk_don_projet,";
$sql.= " p.title as project_label"; $sql.= " p.title as project_label";
$sql.= " FROM ".MAIN_DB_PREFIX."don as d"; $sql.= " FROM ".MAIN_DB_PREFIX."don as d";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."projet as p ON p.rowid = d.fk_don_projet"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."projet as p ON p.rowid = d.fk_don_projet";
@ -483,8 +483,8 @@ class Don extends CommonObject
$this->datec = $this->db->jdate($obj->datec); $this->datec = $this->db->jdate($obj->datec);
$this->datem = $this->db->jdate($obj->datem); $this->datem = $this->db->jdate($obj->datem);
$this->date = $this->db->jdate($obj->datedon); $this->date = $this->db->jdate($obj->datedon);
$this->prenom = $obj->prenom; $this->firstname = $obj->firstname;
$this->nom = $obj->nom; $this->lastname = $obj->lastname;
$this->societe = $obj->societe; $this->societe = $obj->societe;
$this->statut = $obj->fk_statut; $this->statut = $obj->fk_statut;
$this->address = $obj->address; $this->address = $obj->address;

2
htdocs/install/mysql/migration/3.3.0-3.4.0.sql
View File

@ -47,6 +47,8 @@ alter table llx_propal CHANGE COLUMN fk_adresse_livraison fk_delivery_address
alter table llx_commande CHANGE COLUMN fk_adresse_livraison fk_delivery_address integer; alter table llx_commande CHANGE COLUMN fk_adresse_livraison fk_delivery_address integer;
alter table llx_don CHANGE COLUMN adresse address text; alter table llx_don CHANGE COLUMN adresse address text;
alter table llx_don CHANGE COLUMN ville town text; alter table llx_don CHANGE COLUMN ville town text;
alter table llx_don CHANGE COLUMN prenom firstname varchar(50);
alter table llx_don CHANGE COLUMN nom lastname varchar(50);
alter table llx_adherent CHANGE COLUMN adresse address text; alter table llx_adherent CHANGE COLUMN adresse address text;
alter table llx_adherent CHANGE COLUMN nom lastname varchar(50); alter table llx_adherent CHANGE COLUMN nom lastname varchar(50);
alter table llx_adherent CHANGE COLUMN prenom firstname varchar(50); alter table llx_adherent CHANGE COLUMN prenom firstname varchar(50);