From 88458ca466fd90e69023db3599d7af8944f6c277 Mon Sep 17 00:00:00 2001 From: Grand Philippe Date: Sat, 23 Feb 2013 10:18:05 +0100 Subject: [PATCH] english standardization --- htdocs/product/stock/class/entrepot.class.php | 6 ++---- htdocs/product/stock/fiche-valo.php | 2 +- htdocs/product/stock/fiche.php | 6 ++---- htdocs/product/stock/liste.php | 4 ++-- htdocs/product/stock/valo.php | 2 +- 5 files changed, 8 insertions(+), 12 deletions(-) diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php index f3f84b42262..3f597aae505 100644 --- a/htdocs/product/stock/class/entrepot.class.php +++ b/htdocs/product/stock/class/entrepot.class.php @@ -44,7 +44,6 @@ class Entrepot extends CommonObject var $address; //! Code Postal var $cp; // deprecated - var $ville; // deprecated var $zip; var $town; @@ -155,7 +154,7 @@ class Entrepot extends CommonObject $sql .= ", lieu = '" . $this->db->escape($this->lieu) ."'"; $sql .= ", address = '" . $this->db->escape($this->address) ."'"; $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 .= " WHERE rowid = " . $id; @@ -247,7 +246,7 @@ class Entrepot extends CommonObject { 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"; if ($id) @@ -277,7 +276,6 @@ class Entrepot extends CommonObject $this->lieu = $obj->lieu; $this->address = $obj->address; $this->cp = $obj->zip; // deprecated - $this->ville = $obj->town; // deprecated $this->pays_id = $obj->country_id; // deprecated $this->zip = $obj->zip; $this->town = $obj->town; diff --git a/htdocs/product/stock/fiche-valo.php b/htdocs/product/stock/fiche-valo.php index 05d1053a0a5..b8da31aa889 100644 --- a/htdocs/product/stock/fiche-valo.php +++ b/htdocs/product/stock/fiche-valo.php @@ -78,7 +78,7 @@ if ($_GET["id"]) print ''; print ''.$langs->trans('Zip').''.$entrepot->cp.''; - print ''.$langs->trans('Town').''.$entrepot->ville.''; + print ''.$langs->trans('Town').''.$entrepot->town.''; print ''.$langs->trans('Country').''; print $entrepot->pays; diff --git a/htdocs/product/stock/fiche.php b/htdocs/product/stock/fiche.php index 5737bd04e62..07b01bb7d34 100644 --- a/htdocs/product/stock/fiche.php +++ b/htdocs/product/stock/fiche.php @@ -65,7 +65,6 @@ if ($action == 'add' && $user->rights->stock->creer) $object->lieu = $_POST["lieu"]; $object->address = $_POST["address"]; $object->cp = $_POST["zipcode"]; - $object->ville = $_POST["town"]; $object->pays_id = $_POST["country_id"]; $object->zip = $_POST["zipcode"]; $object->town = $_POST["town"]; @@ -118,7 +117,6 @@ if ($action == 'update' && $_POST["cancel"] <> $langs->trans("Cancel")) $object->lieu = $_POST["lieu"]; $object->address = $_POST["address"]; $object->cp = $_POST["zipcode"]; - $object->ville = $_POST["town"]; $object->pays_id = $_POST["country_id"]; $object->zip = $_POST["zipcode"]; $object->town = $_POST["town"]; @@ -270,7 +268,7 @@ else print $object->address; print ''; - // Ville + // Town print ''.$langs->trans('Zip').''.$object->zip.''; print ''.$langs->trans('Town').''.$object->town.''; @@ -281,7 +279,7 @@ else print $object->country; print ''; - // Statut + // Status print ''.$langs->trans("Status").''.$object->getLibStatut(4).''; $calcproducts=$object->nb_products(); diff --git a/htdocs/product/stock/liste.php b/htdocs/product/stock/liste.php index a17cc1891c5..e9ab3819d33 100644 --- a/htdocs/product/stock/liste.php +++ b/htdocs/product/stock/liste.php @@ -45,7 +45,7 @@ $limit = $conf->liste_limit; $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.= " WHERE e.entity = ".$conf->entity; if ($sref) @@ -54,7 +54,7 @@ if ($sref) } 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.= $db->plimit($limit+1, $offset); diff --git a/htdocs/product/stock/valo.php b/htdocs/product/stock/valo.php index 1c3ef982667..842c2163202 100644 --- a/htdocs/product/stock/valo.php +++ b/htdocs/product/stock/valo.php @@ -68,7 +68,7 @@ if ($sall) $sql.= " OR e.description LIKE '%".$db->escape($sall)."%'"; $sql.= " OR e.lieu 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.= $db->order($sortfield,$sortorder);