From fb277bbbab3ee34eab72d6974b744e0faa481d00 Mon Sep 17 00:00:00 2001 From: Florian HENRY Date: Tue, 13 May 2014 19:32:04 +0200 Subject: [PATCH] fix llx_societe.datea call in request --- htdocs/comm/action/fiche.php | 2 +- htdocs/comm/list.php | 2 +- htdocs/comm/prospect/list.php | 2 +- htdocs/fourn/index.php | 2 +- htdocs/fourn/liste.php | 2 +- htdocs/societe/class/address.class.php | 2 +- htdocs/societe/societe.php | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/htdocs/comm/action/fiche.php b/htdocs/comm/action/fiche.php index d7a4c7daa6f..278145eb644 100644 --- a/htdocs/comm/action/fiche.php +++ b/htdocs/comm/action/fiche.php @@ -203,7 +203,7 @@ if ($action == 'add_action') $action = 'create'; $mesg='
'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("DateEnd")).'
'; } - if (! empty($datea) && GETPOST('percentage') == 0) + if (! empty($datep) && GETPOST('percentage') == 0) { $error++; $action = 'create'; diff --git a/htdocs/comm/list.php b/htdocs/comm/list.php index beff565811a..78d2b14c7bc 100644 --- a/htdocs/comm/list.php +++ b/htdocs/comm/list.php @@ -105,7 +105,7 @@ $help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas'; llxHeader('',$langs->trans("ThirdParty"),$help_url); $sql = "SELECT s.rowid, s.nom as name, s.client, s.zip, s.town, st.libelle as stcomm, s.prefix_comm, s.code_client, s.code_compta, s.status as status,"; -$sql.= " s.datec, s.datea, s.canvas"; +$sql.= " s.datec, s.canvas"; if ((!$user->rights->societe->client->voir && !$socid) || $search_sale) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects) $sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; if (! empty($search_categ) || ! empty($catid)) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_societe as cs ON s.rowid = cs.fk_societe"; // We need this table joined to the select in order to filter by categ diff --git a/htdocs/comm/prospect/list.php b/htdocs/comm/prospect/list.php index 767a29f0b88..abd6564779f 100644 --- a/htdocs/comm/prospect/list.php +++ b/htdocs/comm/prospect/list.php @@ -177,7 +177,7 @@ if ($action == 'cstc') $formother=new FormOther($db); $form=new Form($db); -$sql = "SELECT s.rowid, s.nom, s.zip, s.town, s.datec, s.datea, s.status as status, s.code_client, s.client,"; +$sql = "SELECT s.rowid, s.nom, s.zip, s.town, s.datec, s.status as status, s.code_client, s.client,"; $sql.= " st.libelle as stcomm, s.prefix_comm, s.fk_stcomm, s.fk_prospectlevel,"; $sql.= " d.nom as departement"; if ((!$user->rights->societe->client->voir && !$socid) || $search_sale) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects) diff --git a/htdocs/fourn/index.php b/htdocs/fourn/index.php index 6f6bfb67040..bfdf1b1ce45 100644 --- a/htdocs/fourn/index.php +++ b/htdocs/fourn/index.php @@ -233,7 +233,7 @@ print '
'; * List last modified supliers */ $max=10; -$sql = "SELECT s.rowid as socid, s.nom, s.town, s.datec, s.datea, s.tms, s.prefix_comm, s.code_fournisseur, s.code_compta_fournisseur"; +$sql = "SELECT s.rowid as socid, s.nom, s.town, s.datec, s.tms, s.prefix_comm, s.code_fournisseur, s.code_compta_fournisseur"; $sql.= ", st.libelle as stcomm"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; $sql.= ", ".MAIN_DB_PREFIX."c_stcomm as st"; diff --git a/htdocs/fourn/liste.php b/htdocs/fourn/liste.php index fad3fac6b1e..81837feb41f 100644 --- a/htdocs/fourn/liste.php +++ b/htdocs/fourn/liste.php @@ -78,7 +78,7 @@ $thirdpartystatic=new Societe($db); $help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas'; llxHeader('',$langs->trans("ThirdParty"),$help_url); -$sql = "SELECT s.rowid as socid, s.nom, s.zip, s.town, s.datec, s.datea, st.libelle as stcomm, s.prefix_comm, s.status as status, "; +$sql = "SELECT s.rowid as socid, s.nom, s.zip, s.town, s.datec, st.libelle as stcomm, s.prefix_comm, s.status as status, "; $sql.= "code_fournisseur, code_compta_fournisseur"; if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user "; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; diff --git a/htdocs/societe/class/address.class.php b/htdocs/societe/class/address.class.php index 33266590146..174afbe5671 100644 --- a/htdocs/societe/class/address.class.php +++ b/htdocs/societe/class/address.class.php @@ -445,7 +445,7 @@ class Address */ function info($id) { - $sql = "SELECT s.rowid, s.nom, datec as date_creation, datea as date_modification,"; + $sql = "SELECT s.rowid, s.nom, datec as date_creation, tms as date_modification,"; $sql.= " fk_user_creat, fk_user_modif"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; $sql.= " WHERE s.rowid = ".$id; diff --git a/htdocs/societe/societe.php b/htdocs/societe/societe.php index ffeb128cda1..c8d2d68ebb7 100644 --- a/htdocs/societe/societe.php +++ b/htdocs/societe/societe.php @@ -187,7 +187,7 @@ if ($socname) */ $title=$langs->trans("ListOfThirdParties"); -$sql = "SELECT s.rowid, s.nom as name, s.barcode, s.town, s.datec, s.datea, s.code_client, s.code_fournisseur, "; +$sql = "SELECT s.rowid, s.nom as name, s.barcode, s.town, s.datec, s.code_client, s.code_fournisseur, "; $sql.= " st.libelle as stcomm, s.prefix_comm, s.client, s.fournisseur, s.canvas, s.status as status,"; $sql.= " s.siren as idprof1, s.siret as idprof2, ape as idprof3, idprof4 as idprof4"; // We'll need these fields in order to filter by sale (including the case where the user can only see his prospects)