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

english standardization

Browse Source
This commit is contained in:
Grand Philippe 2013-02-23 10:18:05 +01:00
parent 182fdbce32
commit 88458ca466
5 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/product/stock/class/entrepot.class.php
View File

@ -44,7 +44,6 @@ class Entrepot extends CommonObject
var $address; var $address;
//! Code Postal //! Code Postal
var $cp; // deprecated var $cp; // deprecated
var $ville; // deprecated
var $zip; var $zip;
var $town; var $town;
@ -155,7 +154,7 @@ class Entrepot extends CommonObject
$sql .= ", lieu = '" . $this->db->escape($this->lieu) ."'"; $sql .= ", lieu = '" . $this->db->escape($this->lieu) ."'";
$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) ."'";
$sql .= ", ville = '" . $this->db->escape($this->town) ."'"; $sql .= ", town = '" . $this->db->escape($this->town) ."'";
$sql .= ", fk_pays = " . $this->country_id; $sql .= ", fk_pays = " . $this->country_id;
$sql .= " WHERE rowid = " . $id; $sql .= " WHERE rowid = " . $id;
@ -247,7 +246,7 @@ class Entrepot extends CommonObject
{ {
global $conf; global $conf;
$sql = "SELECT rowid, label, description, statut, lieu, address, cp as zip, ville as town, fk_pays as country_id"; $sql = "SELECT rowid, label, description, statut, lieu, address, cp as zip, town, fk_pays as country_id";
$sql .= " FROM ".MAIN_DB_PREFIX."entrepot"; $sql .= " FROM ".MAIN_DB_PREFIX."entrepot";
if ($id) if ($id)
@ -277,7 +276,6 @@ class Entrepot extends CommonObject
$this->lieu = $obj->lieu; $this->lieu = $obj->lieu;
$this->address = $obj->address; $this->address = $obj->address;
$this->cp = $obj->zip; // deprecated $this->cp = $obj->zip; // deprecated
$this->ville = $obj->town; // deprecated
$this->pays_id = $obj->country_id; // deprecated $this->pays_id = $obj->country_id; // deprecated
$this->zip = $obj->zip; $this->zip = $obj->zip;
$this->town = $obj->town; $this->town = $obj->town;

2
htdocs/product/stock/fiche-valo.php
View File

@ -78,7 +78,7 @@ if ($_GET["id"])
print '</td></tr>'; print '</td></tr>';
print '<tr><td width="25%">'.$langs->trans('Zip').'</td><td width="25%">'.$entrepot->cp.'</td>'; print '<tr><td width="25%">'.$langs->trans('Zip').'</td><td width="25%">'.$entrepot->cp.'</td>';
print '<td width="25%">'.$langs->trans('Town').'</td><td width="25%">'.$entrepot->ville.'</td></tr>'; print '<td width="25%">'.$langs->trans('Town').'</td><td width="25%">'.$entrepot->town.'</td></tr>';
print '<tr><td>'.$langs->trans('Country').'</td><td colspan="3">'; print '<tr><td>'.$langs->trans('Country').'</td><td colspan="3">';
print $entrepot->pays; print $entrepot->pays;

6
htdocs/product/stock/fiche.php
View File

@ -65,7 +65,6 @@ if ($action == 'add' && $user->rights->stock->creer)
$object->lieu = $_POST["lieu"]; $object->lieu = $_POST["lieu"];
$object->address = $_POST["address"]; $object->address = $_POST["address"];
$object->cp = $_POST["zipcode"]; $object->cp = $_POST["zipcode"];
$object->ville = $_POST["town"];
$object->pays_id = $_POST["country_id"]; $object->pays_id = $_POST["country_id"];
$object->zip = $_POST["zipcode"]; $object->zip = $_POST["zipcode"];
$object->town = $_POST["town"]; $object->town = $_POST["town"];
@ -118,7 +117,6 @@ if ($action == 'update' && $_POST["cancel"] <> $langs->trans("Cancel"))
$object->lieu = $_POST["lieu"]; $object->lieu = $_POST["lieu"];
$object->address = $_POST["address"]; $object->address = $_POST["address"];
$object->cp = $_POST["zipcode"]; $object->cp = $_POST["zipcode"];
$object->ville = $_POST["town"];
$object->pays_id = $_POST["country_id"]; $object->pays_id = $_POST["country_id"];
$object->zip = $_POST["zipcode"]; $object->zip = $_POST["zipcode"];
$object->town = $_POST["town"]; $object->town = $_POST["town"];
@ -270,7 +268,7 @@ else
print $object->address; print $object->address;
print '</td></tr>'; print '</td></tr>';
// Ville // Town
print '<tr><td width="25%">'.$langs->trans('Zip').'</td><td width="25%">'.$object->zip.'</td>'; print '<tr><td width="25%">'.$langs->trans('Zip').'</td><td width="25%">'.$object->zip.'</td>';
print '<td width="25%">'.$langs->trans('Town').'</td><td width="25%">'.$object->town.'</td></tr>'; print '<td width="25%">'.$langs->trans('Town').'</td><td width="25%">'.$object->town.'</td></tr>';
@ -281,7 +279,7 @@ else
print $object->country; print $object->country;
print '</td></tr>'; print '</td></tr>';
// Statut // Status
print '<tr><td>'.$langs->trans("Status").'</td><td colspan="3">'.$object->getLibStatut(4).'</td></tr>'; print '<tr><td>'.$langs->trans("Status").'</td><td colspan="3">'.$object->getLibStatut(4).'</td></tr>';
$calcproducts=$object->nb_products(); $calcproducts=$object->nb_products();

4
htdocs/product/stock/liste.php
View File

@ -45,7 +45,7 @@ $limit = $conf->liste_limit;
$offset = $limit * $page; $offset = $limit * $page;
$sql = "SELECT e.rowid, e.label as ref, e.statut, e.lieu, e.address, e.cp, e.ville, e.fk_pays"; $sql = "SELECT e.rowid, e.label as ref, e.statut, e.lieu, e.address, e.cp, e.town, e.fk_pays";
$sql.= " FROM ".MAIN_DB_PREFIX."entrepot as e"; $sql.= " FROM ".MAIN_DB_PREFIX."entrepot as e";
$sql.= " WHERE e.entity = ".$conf->entity; $sql.= " WHERE e.entity = ".$conf->entity;
if ($sref) if ($sref)
@ -54,7 +54,7 @@ if ($sref)
} }
if ($sall) if ($sall)
{ {
$sql.= " AND (e.description like '%".$sall."%' OR e.lieu like '%".$sall."%' OR e.address like '%".$sall."%' OR e.ville like '%".$sall."%')"; $sql.= " AND (e.description like '%".$sall."%' OR e.lieu like '%".$sall."%' OR e.address like '%".$sall."%' OR e.town like '%".$sall."%')";
} }
$sql.= " ORDER BY $sortfield $sortorder"; $sql.= " ORDER BY $sortfield $sortorder";
$sql.= $db->plimit($limit+1, $offset); $sql.= $db->plimit($limit+1, $offset);

2
htdocs/product/stock/valo.php
View File

@ -68,7 +68,7 @@ if ($sall)
$sql.= " OR e.description LIKE '%".$db->escape($sall)."%'"; $sql.= " OR e.description LIKE '%".$db->escape($sall)."%'";
$sql.= " OR e.lieu LIKE '%".$db->escape($sall)."%'"; $sql.= " OR e.lieu LIKE '%".$db->escape($sall)."%'";
$sql.= " OR e.address LIKE '%".$db->escape($sall)."%'"; $sql.= " OR e.address LIKE '%".$db->escape($sall)."%'";
$sql.= " OR e.ville LIKE '%".$db->escape($sall)."%')"; $sql.= " OR e.town LIKE '%".$db->escape($sall)."%')";
} }
$sql.= " GROUP BY e.rowid, e.label, e.statut, e.lieu"; $sql.= " GROUP BY e.rowid, e.label, e.statut, e.lieu";
$sql.= $db->order($sortfield,$sortorder); $sql.= $db->order($sortfield,$sortorder);