diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index ccc7449bd9a..e61380e27f5 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -577,13 +577,6 @@ if ($_POST['action'] == 'classin') $propal->set_project($user, $_POST['projetidp']); } -if ($_POST['action'] == 'set_contact') -{ - $propal = new Propal($db); - $propal->fetch($_GET['propalid']); - $propal->set_contact($user, $_POST['contactidp']); -} - // Conditions de règlement if ($_POST["action"] == 'setconditions') { @@ -1042,7 +1035,7 @@ if ($_GET['propalid'] > 0) print ''; print img_object($langs->trans("ShowReduc"),'reduc').' '.$langs->trans("Discount"); print ''; - if ($objp->description) print ': '.nl2br($objp->description); + if ($objp->description) print ' - '.nl2br($objp->description); } else { diff --git a/htdocs/comm/propal/apercu.php b/htdocs/comm/propal/apercu.php index f899ac8ade1..074494f3a3a 100644 --- a/htdocs/comm/propal/apercu.php +++ b/htdocs/comm/propal/apercu.php @@ -82,9 +82,9 @@ if ($_GET["propalid"] > 0) * Propal */ $sql = 'SELECT s.nom, s.idp, p.price, p.fk_projet, p.remise, p.tva, p.total, p.ref, p.fk_statut, '.$db->pdate('p.datep').' as dp, p.note,'; - $sql.= ' x.firstname, x.name, x.fax, x.phone, x.email, p.fk_user_author, p.fk_user_valid, p.fk_user_cloture, p.datec, p.date_valid, p.date_cloture'; - $sql.= ' FROM '.MAIN_DB_PREFIX.'societe as s, '.MAIN_DB_PREFIX.'propal as p, '.MAIN_DB_PREFIX.'socpeople as x'; - $sql.= ' WHERE p.fk_soc = s.idp AND p.fk_soc_contact = x.idp AND p.rowid = '.$propal->id; + $sql.= ' p.fk_user_author, p.fk_user_valid, p.fk_user_cloture, p.datec, p.date_valid, p.date_cloture'; + $sql.= ' FROM '.MAIN_DB_PREFIX.'societe as s, '.MAIN_DB_PREFIX.'propal as p'; + $sql.= ' WHERE p.fk_soc = s.idp AND p.rowid = '.$propal->id; if ($socidp) $sql .= ' AND s.idp = '.$socidp; $result = $db->query($sql); diff --git a/htdocs/commande/apercu.php b/htdocs/commande/apercu.php index e0531e77766..466d235fb83 100644 --- a/htdocs/commande/apercu.php +++ b/htdocs/commande/apercu.php @@ -89,12 +89,10 @@ if ($_GET["id"] > 0) { /* * Commande */ - $sql = 'SELECT s.nom, s.idp, c.amount_ht, c.fk_projet, c.remise, c.tva, c.total_ttc, c.ref, c.fk_statut, '.$db->pdate('c.date_commande').' as dp, c.note,'; - $sql.= ' x.firstname, x.name, x.fax, x.phone, x.email, c.fk_user_author, c.fk_user_valid, c.fk_user_cloture, c.date_creation, c.date_valid, c.date_cloture'; - $sql.= ' FROM '.MAIN_DB_PREFIX.'societe as s, '.MAIN_DB_PREFIX.'commande as c, '.MAIN_DB_PREFIX.'socpeople as x'; + $sql.= ' c.fk_user_author, c.fk_user_valid, c.fk_user_cloture, c.date_creation, c.date_valid, c.date_cloture'; + $sql.= ' FROM '.MAIN_DB_PREFIX.'societe as s, '.MAIN_DB_PREFIX.'commande as c'; $sql.= ' WHERE c.fk_soc = s.idp'; - //$sql.= ' AND c.fk_soc_contact = x.idp'; //le champs fk_soc_contact est vide dans la base llx_commande $sql.= ' AND c.rowid = '.$commande->id; if ($socidp) $sql .= ' AND s.idp = '.$socidp; diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php index fad875d3ec1..8482b910350 100644 --- a/htdocs/commande/fiche.php +++ b/htdocs/commande/fiche.php @@ -664,12 +664,12 @@ if ($_GET['action'] == 'create' && $user->rights->commande->creer) print ''.$langs->trans('Customer').''.$soc->getNomUrl(1).''; print ''; - /* - * Contact de la propale - */ - print "".$langs->trans("DefaultContact")."\n"; - $html->select_contacts($soc->id,$setcontact,'contactidp',1); - print ''; + /* + * Contact de la propale + */ + print "".$langs->trans("DefaultContact").''; + $html->select_contacts($soc->id,$setcontact,'contactidp',1); + print ''; // Ligne info remises tiers print ''.$langs->trans('Discounts').''; diff --git a/htdocs/compta/commande/fiche.php b/htdocs/compta/commande/fiche.php index 657f1cfce79..8d269a9f26f 100644 --- a/htdocs/compta/commande/fiche.php +++ b/htdocs/compta/commande/fiche.php @@ -350,7 +350,7 @@ if ($_GET["id"] > 0) print ''; print img_object($langs->trans("ShowReduc"),'reduc').' '.$langs->trans("Discount"); print ''; - if ($objp->description) print ': '.nl2br($objp->description); + if ($objp->description) print ' - '.nl2br($objp->description); } else { diff --git a/htdocs/compta/propal.php b/htdocs/compta/propal.php index c2f744a2d47..2a270b0e9a3 100644 --- a/htdocs/compta/propal.php +++ b/htdocs/compta/propal.php @@ -230,32 +230,6 @@ if ($_GET["propalid"] > 0) } print ''; - // Destinataire -/* Remplacé par contacts de propal - $langs->load('mails'); - print ''; - print ''.$langs->trans('MailTo').''; - - if ($propal->statut == 0 && $user->rights->propale->creer) - { - print ''; - $html->form_contacts($_SERVER['PHP_SELF'].'?propalid='.$propal->id,$societe,$propal->contactid,'none'); - print ''; - } - else - { - if (!empty($propal->contactid)) - { - print ''; - $html->form_contacts($_SERVER['PHP_SELF'].'?propalid='.$propal->id,$societe,$propal->contactid,'none'); - print ''; - } - else { - print ' '; - } - } -*/ - // Projet if ($conf->projet->enabled) { diff --git a/htdocs/html.form.class.php b/htdocs/html.form.class.php index fd6f3309c5e..3246711a17e 100644 --- a/htdocs/html.form.class.php +++ b/htdocs/html.form.class.php @@ -1745,8 +1745,8 @@ class Form * \param page Page * \param selected Id condition présélectionnée * \param htmlname Nom du formulaire select - * \param origin origine de l'appel pour pouvoir créer un retour - * \param originid id de l'origine + * \param origin Origine de l'appel pour pouvoir créer un retour + * \param originid Id de l'origine */ function form_adresse_livraison($page, $selected='', $socid, $htmlname='adresse_livraison_id', $origin='', $originid='') { diff --git a/htdocs/propal.class.php b/htdocs/propal.class.php index b9397dc6d17..0f92cd3adcd 100644 --- a/htdocs/propal.class.php +++ b/htdocs/propal.class.php @@ -746,7 +746,7 @@ class Propal extends CommonObject */ function fetch($rowid) { - $sql = "SELECT rowid,ref,total,price,remise,remise_percent,remise_absolue,tva,fk_soc,fk_soc_contact"; + $sql = "SELECT rowid,ref,total,price,remise,remise_percent,remise_absolue,tva,fk_soc"; $sql.= ", ".$this->db->pdate("datep")." as dp"; $sql.= ", ".$this->db->pdate("fin_validite")." as dfv"; $sql.= ", ".$this->db->pdate("date_livraison")." as date_livraison"; @@ -786,7 +786,6 @@ class Propal extends CommonObject $this->total_ttc = $obj->total; $this->socidp = $obj->fk_soc; $this->projetidp = $obj->fk_projet; - $this->contactid = $obj->fk_soc_contact; $this->modelpdf = $obj->model_pdf; $this->note = $obj->note; $this->note_public = $obj->note_public; @@ -1132,62 +1131,32 @@ class Propal extends CommonObject * * */ - function set_project($user, $project_id) - { - if ($user->rights->propale->creer) - { - //verif que le projet et la société concordent - $sql = 'SELECT p.rowid, p.title FROM '.MAIN_DB_PREFIX.'projet as p WHERE p.fk_soc ='.$this->socidp.' AND p.rowid='.$project_id; - $sqlres = $this->db->query($sql); - if ($sqlres) - { - $numprojet = $this->db->num_rows($sqlres); - if ($numprojet > 0) - { - $this->projetidp=$project_id; - $sql = 'UPDATE '.MAIN_DB_PREFIX.'propal SET fk_projet = '.$project_id; - $sql .= ' WHERE rowid = '.$this->id.' AND fk_statut = 0 ;'; - $this->db->query($sql); - } - } - else - { + function set_project($user, $project_id) + { + if ($user->rights->propale->creer) + { + //verif que le projet et la société concordent + $sql = 'SELECT p.rowid, p.title FROM '.MAIN_DB_PREFIX.'projet as p WHERE p.fk_soc ='.$this->socidp.' AND p.rowid='.$project_id; + $sqlres = $this->db->query($sql); + if ($sqlres) + { + $numprojet = $this->db->num_rows($sqlres); + if ($numprojet > 0) + { + $this->projetidp=$project_id; + $sql = 'UPDATE '.MAIN_DB_PREFIX.'propal SET fk_projet = '.$project_id; + $sql .= ' WHERE rowid = '.$this->id.' AND fk_statut = 0 ;'; + $this->db->query($sql); + } + } + else + { + + dolibarr_syslog("Propal::set_project Erreur SQL"); + } + } + } - dolibarr_syslog("Propal::set_project Erreur SQL"); - } - } - } - - /* - * - * - * - */ - - function set_contact($user, $contact_id) - { - if ($user->rights->propale->creer) - { - //verif que le contact et la société concordent - $sql = 'SELECT p.idp FROM '.MAIN_DB_PREFIX.'socpeople as p WHERE p.fk_soc = '.$this->socidp.' AND p.idp='.$contact_id; - $sqlres = $this->db->query($sql); - if ($sqlres) - { - $numprojet = $this->db->num_rows($sqlres); - if ($numprojet > 0) - { - $this->projetidp=$project_id; - $sql = 'UPDATE '.MAIN_DB_PREFIX.'propal SET fk_soc_contact = '.$contact_id; - $sql .= ' WHERE rowid = '.$this->id.' AND fk_statut = 0 ;'; - $this->db->query($sql); - } - } - else - { - dolibarr_syslog("Propal::set_contact Erreur SQL"); - } - } - } /** * \brief Positionne modele derniere generation @@ -1867,9 +1836,9 @@ class Propal extends CommonObject $this->fin_validite = $this->datep + ($this->duree_validite * 24 * 3600); // Insertion dans la base - $sql = "INSERT INTO ".MAIN_DB_PREFIX."propal (fk_soc, fk_soc_contact, price, remise, remise_percent, remise_absolue,"; + $sql = "INSERT INTO ".MAIN_DB_PREFIX."propal (fk_soc, price, remise, remise_percent, remise_absolue,"; $sql.= " tva, total, datep, datec, ref, fk_user_author, note, note_public, model_pdf, fin_validite, fk_cond_reglement, fk_mode_reglement, date_livraison, fk_adresse_livraison) "; - $sql.= " VALUES ('$this->socidp', '$this->contactid', '0', '$this->remise', '$this->remise_percent', '$this->remise_absolue',"; + $sql.= " VALUES ('$this->socidp', '0', '$this->remise', '$this->remise_percent', '$this->remise_absolue',"; $sql.= " '0','0','".$this->db->idate($this->datep)."', now(), '$this->ref', '$this->author',"; $sql.= "'".addslashes($this->note)."',"; $sql.= "'".addslashes($this->note_public)."',"; diff --git a/mysql/data/propal_dev.sql b/mysql/data/propal_dev.sql index ff7c14ec19a..81d88283a30 100644 --- a/mysql/data/propal_dev.sql +++ b/mysql/data/propal_dev.sql @@ -9,18 +9,19 @@ -- -INSERT INTO llx_propal (rowid, fk_soc, fk_soc_contact, fk_projet, ref, datec, date_valid, date_cloture, datep, fk_user_author, fk_user_valid, fk_user_cloture, fk_statut, price, remise, tva, total, note) VALUES (1,1,10,0,'PR-BO-020509','2002-05-09 03:04:29','2002-05-09 03:04:37','2002-05-09 03:04:42','2002-05-09',1,1,1,2,10000,0,1960,11960,'----------\r\n'); -INSERT INTO llx_propal (rowid, fk_soc, fk_soc_contact, fk_projet, ref, datec, date_valid, date_cloture, datep, fk_user_author, fk_user_valid, fk_user_cloture, fk_statut, price, remise, tva, total, note) VALUES (2,1,11,0,'PR-BO-020111','2002-05-09 03:08:33','2002-05-09 03:36:25','2002-05-09 03:36:29','2002-01-11',1,1,1,2,20,0,3.92,23.92,'----------\r\n'); -INSERT INTO llx_propal (rowid, fk_soc, fk_soc_contact, fk_projet, ref, datec, date_valid, date_cloture, datep, fk_user_author, fk_user_valid, fk_user_cloture, fk_statut, price, remise, tva, total, note) VALUES (3,1,11,0,'PR-BO-020113','2002-05-09 03:08:50','2002-05-09 03:40:09','2002-05-09 03:40:13','2002-01-13',1,1,1,2,30,0,5.88,35.88,'----------\r\n'); -INSERT INTO llx_propal (rowid, fk_soc, fk_soc_contact, fk_projet, ref, datec, date_valid, date_cloture, datep, fk_user_author, fk_user_valid, fk_user_cloture, fk_statut, price, remise, tva, total, note) VALUES (4,1,11,0,'PR-BO-020313','2002-05-09 03:09:13','2002-05-09 03:21:06','2002-05-09 03:21:10','2002-03-13',1,1,1,2,10,0,1.96,11.96,'----------\r\n'); -INSERT INTO llx_propal (rowid, fk_soc, fk_soc_contact, fk_projet, ref, datec, date_valid, date_cloture, datep, fk_user_author, fk_user_valid, fk_user_cloture, fk_statut, price, remise, tva, total, note) VALUES (5,1,11,0,'PR-BO-020313.1','2002-05-09 03:09:28','2002-05-09 03:42:09','2002-05-09 03:42:15','2002-03-13',1,1,1,3,20,0,3.92,23.92,'----------\r\n'); -INSERT INTO llx_propal (rowid, fk_soc, fk_soc_contact, fk_projet, ref, datec, date_valid, date_cloture, datep, fk_user_author, fk_user_valid, fk_user_cloture, fk_statut, price, remise, tva, total, note) VALUES (6,3,30,0,'PR-DO-020404','2002-05-09 03:16:26','2002-05-09 03:17:04','2002-05-09 03:17:13','2002-04-04',1,1,1,3,1010,0,197.96,1207.96,'----------\r\n'); -INSERT INTO llx_propal (rowid, fk_soc, fk_soc_contact, fk_projet, ref, datec, date_valid, date_cloture, datep, fk_user_author, fk_user_valid, fk_user_cloture, fk_statut, price, remise, tva, total, note) VALUES (7,3,30,0,'PR-DO-020405','2002-05-09 03:16:51','2002-05-09 03:17:24','2002-05-09 03:17:28','2002-04-05',1,1,1,2,1010,100,178.36,1088.36,'----------\r\n'); -INSERT INTO llx_propal (rowid, fk_soc, fk_soc_contact, fk_projet, ref, datec, date_valid, date_cloture, datep, fk_user_author, fk_user_valid, fk_user_cloture, fk_statut, price, remise, tva, total, note) VALUES (8,2,20,0,'PR-CU-020202','2002-05-09 03:22:49','2002-05-09 03:23:00','2002-05-09 03:23:05','2002-02-02',1,1,1,2,10000,0,1960,11960,'----------\r\n'); -INSERT INTO llx_propal (rowid, fk_soc, fk_soc_contact, fk_projet, ref, datec, date_valid, date_cloture, datep, fk_user_author, fk_user_valid, fk_user_cloture, fk_statut, price, remise, tva, total, note) VALUES (9,2,20,0,'PR-CU-020409','2002-05-09 03:46:39','2002-05-09 03:46:45','2002-05-09 03:46:50','2002-04-09',1,1,1,2,20000,0,3920,23920,'----------\r\n'); -INSERT INTO llx_propal (rowid, fk_soc, fk_soc_contact, fk_projet, ref, datec, date_valid, date_cloture, datep, fk_user_author, fk_user_valid, fk_user_cloture, fk_statut, price, remise, tva, total, note) VALUES (10,4,41,0,'PR-FOO-020509','2002-05-09 14:43:47','2002-05-09 15:07:19','2002-05-09 15:07:23','2002-05-09',1,1,1,2,12110,0,2373.56,14483.56,'----------\r\n'); -INSERT INTO llx_propal (rowid, fk_soc, fk_soc_contact, fk_projet, ref, datec, date_valid, date_cloture, datep, fk_user_author, fk_user_valid, fk_user_cloture, fk_statut, price, remise, tva, total, note) VALUES (11,4,41,0,'PR-FOO-020304','2002-05-09 14:44:08','2002-05-09 14:44:18','2002-05-09 14:44:22','2002-03-04',1,1,1,2,12110,0,2373.56,14483.56,'----------\r\n'); -INSERT INTO llx_propal (rowid, fk_soc, fk_soc_contact, fk_projet, ref, datec, date_valid, date_cloture, datep, fk_user_author, fk_user_valid, fk_user_cloture, fk_statut, price, remise, tva, total, note) VALUES (12,2,20,0,'PR-CU-020509','2002-05-09 15:01:37','2002-05-09 15:01:45','2002-05-09 15:01:49','2002-05-09',1,1,1,2,36250,0,7105,43355,'----------\r\n'); +INSERT INTO llx_propal (rowid, fk_soc, fk_projet, ref, datec, date_valid, date_cloture, datep, fk_user_author, fk_user_valid, fk_user_cloture, fk_statut, price, remise, tva, total, note) VALUES ( 1,1,0,'PR-BO-020509','2002-05-09 03:04:29','2002-05-09 03:04:37','2002-05-09 03:04:42','2002-05-09',1,1,1,2,10000,0,1960,11960,''); +INSERT INTO llx_propal (rowid, fk_soc, fk_projet, ref, datec, date_valid, date_cloture, datep, fk_user_author, fk_user_valid, fk_user_cloture, fk_statut, price, remise, tva, total, note) VALUES ( 2,1,0,'PR-BO-020111','2002-05-09 03:08:33','2002-05-09 03:36:25','2002-05-09 03:36:29','2002-01-11',1,1,1,2,20,0,3.92,23.92,''); +INSERT INTO llx_propal (rowid, fk_soc, fk_projet, ref, datec, date_valid, date_cloture, datep, fk_user_author, fk_user_valid, fk_user_cloture, fk_statut, price, remise, tva, total, note) VALUES ( 3,1,0,'PR-BO-020113','2002-05-09 03:08:50','2002-05-09 03:40:09','2002-05-09 03:40:13','2002-01-13',1,1,1,2,30,0,5.88,35.88,''); +INSERT INTO llx_propal (rowid, fk_soc, fk_projet, ref, datec, date_valid, date_cloture, datep, fk_user_author, fk_user_valid, fk_user_cloture, fk_statut, price, remise, tva, total, note) VALUES ( 4,1,0,'PR-BO-020313','2002-05-09 03:09:13','2002-05-09 03:21:06','2002-05-09 03:21:10','2002-03-13',1,1,1,2,10,0,1.96,11.96,''); +INSERT INTO llx_propal (rowid, fk_soc, fk_projet, ref, datec, date_valid, date_cloture, datep, fk_user_author, fk_user_valid, fk_user_cloture, fk_statut, price, remise, tva, total, note) VALUES ( 5,1,0,'PR-BO-020313.1','2002-05-09 03:09:28','2002-05-09 03:42:09','2002-05-09 03:42:15','2002-03-13',1,1,1,3,20,0,3.92,23.92,''); +INSERT INTO llx_propal (rowid, fk_soc, fk_projet, ref, datec, date_valid, date_cloture, datep, fk_user_author, fk_user_valid, fk_user_cloture, fk_statut, price, remise, tva, total, note) VALUES ( 6,3,0,'PR-DO-020404','2002-05-09 03:16:26','2002-05-09 03:17:04','2002-05-09 03:17:13','2002-04-04',1,1,1,3,1010,0,197.96,1207.96,''); +INSERT INTO llx_propal (rowid, fk_soc, fk_projet, ref, datec, date_valid, date_cloture, datep, fk_user_author, fk_user_valid, fk_user_cloture, fk_statut, price, remise, tva, total, note) VALUES ( 7,3,0,'PR-DO-020405','2002-05-09 03:16:51','2002-05-09 03:17:24','2002-05-09 03:17:28','2002-04-05',1,1,1,2,1010,100,178.36,1088.36,''); +INSERT INTO llx_propal (rowid, fk_soc, fk_projet, ref, datec, date_valid, date_cloture, datep, fk_user_author, fk_user_valid, fk_user_cloture, fk_statut, price, remise, tva, total, note) VALUES ( 8,2,0,'PR-CU-020202','2002-05-09 03:22:49','2002-05-09 03:23:00','2002-05-09 03:23:05','2002-02-02',1,1,1,2,10000,0,1960,11960,''); +INSERT INTO llx_propal (rowid, fk_soc, fk_projet, ref, datec, date_valid, date_cloture, datep, fk_user_author, fk_user_valid, fk_user_cloture, fk_statut, price, remise, tva, total, note) VALUES ( 9,2,0,'PR-CU-020409','2002-05-09 03:46:39','2002-05-09 03:46:45','2002-05-09 03:46:50','2002-04-09',1,1,1,2,20000,0,3920,23920,''); +INSERT INTO llx_propal (rowid, fk_soc, fk_projet, ref, datec, date_valid, date_cloture, datep, fk_user_author, fk_user_valid, fk_user_cloture, fk_statut, price, remise, tva, total, note) VALUES (10,4,0,'PR-FOO-020509','2002-05-09 14:43:47','2002-05-09 15:07:19','2002-05-09 15:07:23','2002-05-09',1,1,1,2,12110,0,2373.56,14483.56,''); +INSERT INTO llx_propal (rowid, fk_soc, fk_projet, ref, datec, date_valid, date_cloture, datep, fk_user_author, fk_user_valid, fk_user_cloture, fk_statut, price, remise, tva, total, note) VALUES (11,4,0,'PR-FOO-020304','2002-05-09 14:44:08','2002-05-09 14:44:18','2002-05-09 14:44:22','2002-03-04',1,1,1,2,12110,0,2373.56,14483.56,''); +INSERT INTO llx_propal (rowid, fk_soc, fk_projet, ref, datec, date_valid, date_cloture, datep, fk_user_author, fk_user_valid, fk_user_cloture, fk_statut, price, remise, tva, total, note) VALUES (12,2,0,'PR-CU-020509','2002-05-09 15:01:37','2002-05-09 15:01:45','2002-05-09 15:01:49','2002-05-09',1,1,1,2,36250,0,7105,43355,''); + -- MySQL dump 8.21 -- diff --git a/mysql/migration/2.0.0-2.1.0.sql b/mysql/migration/2.0.0-2.1.0.sql index 899af1141d4..d43bac4a9ef 100644 --- a/mysql/migration/2.0.0-2.1.0.sql +++ b/mysql/migration/2.0.0-2.1.0.sql @@ -268,7 +268,7 @@ create table llx_livraison alter table llx_livraison drop foreign key fk_livraison_societe; alter table llx_livraison drop column fk_soc; -alter table llx_livraison drop column fk_soc_contact; + create table llx_livraisondet ( @@ -318,4 +318,10 @@ alter table llx_propal add column ref_client varchar(30) after ref; alter table llx_societe_adresse_livraison drop column fk_departement; -alter table llx_user add column ldap_sid varchar(255)DEFAULT NULL; \ No newline at end of file +alter table llx_user add column ldap_sid varchar(255)DEFAULT NULL; + + +alter table llx_commande_fournisseur drop column fk_soc_contact; +alter table llx_commande drop column fk_soc_contact; +alter table llx_livraison drop column fk_soc_contact; +alter table llx_propal drop column fk_soc_contact; diff --git a/mysql/tables/llx_commande.sql b/mysql/tables/llx_commande.sql index afe9acc5a87..8370fd8e0a8 100644 --- a/mysql/tables/llx_commande.sql +++ b/mysql/tables/llx_commande.sql @@ -25,10 +25,10 @@ create table llx_commande rowid integer AUTO_INCREMENT PRIMARY KEY, tms timestamp, fk_soc integer NOT NULL, - fk_soc_contact integer, fk_projet integer DEFAULT 0, -- projet auquel est rattache la commande ref varchar(30) NOT NULL, -- order number ref_client varchar(30), -- customer order number + date_creation datetime, -- date de creation date_valid datetime, -- date de validation date_cloture datetime, -- date de cloture diff --git a/mysql/tables/llx_commande_fournisseur.sql b/mysql/tables/llx_commande_fournisseur.sql index 5d920753b33..a3eeb53a81c 100644 --- a/mysql/tables/llx_commande_fournisseur.sql +++ b/mysql/tables/llx_commande_fournisseur.sql @@ -25,7 +25,6 @@ create table llx_commande_fournisseur rowid integer AUTO_INCREMENT PRIMARY KEY, tms timestamp, fk_soc integer NOT NULL, - fk_soc_contact integer, fk_projet integer DEFAULT 0, -- projet auquel est rattache la commande ref varchar(30) NOT NULL, -- order number diff --git a/mysql/tables/llx_propal.sql b/mysql/tables/llx_propal.sql index eb2b708d6a5..e2f9b04d17f 100644 --- a/mysql/tables/llx_propal.sql +++ b/mysql/tables/llx_propal.sql @@ -24,10 +24,10 @@ create table llx_propal ( rowid integer AUTO_INCREMENT PRIMARY KEY, fk_soc integer, - fk_soc_contact integer, fk_projet integer DEFAULT 0, -- projet auquel est rattache la propale ref varchar(30) NOT NULL, -- propal number ref_client varchar(30), -- customer order number + datec datetime, -- date de creation datep date, -- date de la propal fin_validite datetime, -- date de fin de validite diff --git a/pgsql/data/propal_dev.sql b/pgsql/data/propal_dev.sql index 28fb8913e44..1ddc8924507 100644 --- a/pgsql/data/propal_dev.sql +++ b/pgsql/data/propal_dev.sql @@ -25,18 +25,18 @@ -INSERT INTO llx_propal (rowid, fk_soc, fk_soc_contact, fk_projet, ref, datec, date_valid, date_cloture, datep, fk_user_author, fk_user_valid, fk_user_cloture, fk_statut, price, remise, tva, total, note) VALUES (1,1,10,0,'PR-BO-020509','2002-05-09 03:04:29','2002-05-09 03:04:37','2002-05-09 03:04:42','2002-05-09',1,1,1,2,10000,0,1960,11960,'----------\r\n'); -INSERT INTO llx_propal (rowid, fk_soc, fk_soc_contact, fk_projet, ref, datec, date_valid, date_cloture, datep, fk_user_author, fk_user_valid, fk_user_cloture, fk_statut, price, remise, tva, total, note) VALUES (2,1,11,0,'PR-BO-020111','2002-05-09 03:08:33','2002-05-09 03:36:25','2002-05-09 03:36:29','2002-01-11',1,1,1,2,20,0,3.92,23.92,'----------\r\n'); -INSERT INTO llx_propal (rowid, fk_soc, fk_soc_contact, fk_projet, ref, datec, date_valid, date_cloture, datep, fk_user_author, fk_user_valid, fk_user_cloture, fk_statut, price, remise, tva, total, note) VALUES (3,1,11,0,'PR-BO-020113','2002-05-09 03:08:50','2002-05-09 03:40:09','2002-05-09 03:40:13','2002-01-13',1,1,1,2,30,0,5.88,35.88,'----------\r\n'); -INSERT INTO llx_propal (rowid, fk_soc, fk_soc_contact, fk_projet, ref, datec, date_valid, date_cloture, datep, fk_user_author, fk_user_valid, fk_user_cloture, fk_statut, price, remise, tva, total, note) VALUES (4,1,11,0,'PR-BO-020313','2002-05-09 03:09:13','2002-05-09 03:21:06','2002-05-09 03:21:10','2002-03-13',1,1,1,2,10,0,1.96,11.96,'----------\r\n'); -INSERT INTO llx_propal (rowid, fk_soc, fk_soc_contact, fk_projet, ref, datec, date_valid, date_cloture, datep, fk_user_author, fk_user_valid, fk_user_cloture, fk_statut, price, remise, tva, total, note) VALUES (5,1,11,0,'PR-BO-020313.1','2002-05-09 03:09:28','2002-05-09 03:42:09','2002-05-09 03:42:15','2002-03-13',1,1,1,3,20,0,3.92,23.92,'----------\r\n'); -INSERT INTO llx_propal (rowid, fk_soc, fk_soc_contact, fk_projet, ref, datec, date_valid, date_cloture, datep, fk_user_author, fk_user_valid, fk_user_cloture, fk_statut, price, remise, tva, total, note) VALUES (6,3,30,0,'PR-DO-020404','2002-05-09 03:16:26','2002-05-09 03:17:04','2002-05-09 03:17:13','2002-04-04',1,1,1,3,1010,0,197.96,1207.96,'----------\r\n'); -INSERT INTO llx_propal (rowid, fk_soc, fk_soc_contact, fk_projet, ref, datec, date_valid, date_cloture, datep, fk_user_author, fk_user_valid, fk_user_cloture, fk_statut, price, remise, tva, total, note) VALUES (7,3,30,0,'PR-DO-020405','2002-05-09 03:16:51','2002-05-09 03:17:24','2002-05-09 03:17:28','2002-04-05',1,1,1,2,1010,100,178.36,1088.36,'----------\r\n'); -INSERT INTO llx_propal (rowid, fk_soc, fk_soc_contact, fk_projet, ref, datec, date_valid, date_cloture, datep, fk_user_author, fk_user_valid, fk_user_cloture, fk_statut, price, remise, tva, total, note) VALUES (8,2,20,0,'PR-CU-020202','2002-05-09 03:22:49','2002-05-09 03:23:00','2002-05-09 03:23:05','2002-02-02',1,1,1,2,10000,0,1960,11960,'----------\r\n'); -INSERT INTO llx_propal (rowid, fk_soc, fk_soc_contact, fk_projet, ref, datec, date_valid, date_cloture, datep, fk_user_author, fk_user_valid, fk_user_cloture, fk_statut, price, remise, tva, total, note) VALUES (9,2,20,0,'PR-CU-020409','2002-05-09 03:46:39','2002-05-09 03:46:45','2002-05-09 03:46:50','2002-04-09',1,1,1,2,20000,0,3920,23920,'----------\r\n'); -INSERT INTO llx_propal (rowid, fk_soc, fk_soc_contact, fk_projet, ref, datec, date_valid, date_cloture, datep, fk_user_author, fk_user_valid, fk_user_cloture, fk_statut, price, remise, tva, total, note) VALUES (10,4,41,0,'PR-FOO-020509','2002-05-09 14:43:47','2002-05-09 15:07:19','2002-05-09 15:07:23','2002-05-09',1,1,1,2,12110,0,2373.56,14483.56,'----------\r\n'); -INSERT INTO llx_propal (rowid, fk_soc, fk_soc_contact, fk_projet, ref, datec, date_valid, date_cloture, datep, fk_user_author, fk_user_valid, fk_user_cloture, fk_statut, price, remise, tva, total, note) VALUES (11,4,41,0,'PR-FOO-020304','2002-05-09 14:44:08','2002-05-09 14:44:18','2002-05-09 14:44:22','2002-03-04',1,1,1,2,12110,0,2373.56,14483.56,'----------\r\n'); -INSERT INTO llx_propal (rowid, fk_soc, fk_soc_contact, fk_projet, ref, datec, date_valid, date_cloture, datep, fk_user_author, fk_user_valid, fk_user_cloture, fk_statut, price, remise, tva, total, note) VALUES (12,2,20,0,'PR-CU-020509','2002-05-09 15:01:37','2002-05-09 15:01:45','2002-05-09 15:01:49','2002-05-09',1,1,1,2,36250,0,7105,43355,'----------\r\n'); +INSERT INTO llx_propal (rowid, fk_soc, fk_projet, ref, datec, date_valid, date_cloture, datep, fk_user_author, fk_user_valid, fk_user_cloture, fk_statut, price, remise, tva, total, note) VALUES ( 1,1,0,'PR-BO-020509','2002-05-09 03:04:29','2002-05-09 03:04:37','2002-05-09 03:04:42','2002-05-09',1,1,1,2,10000,0,1960,11960,''); +INSERT INTO llx_propal (rowid, fk_soc, fk_projet, ref, datec, date_valid, date_cloture, datep, fk_user_author, fk_user_valid, fk_user_cloture, fk_statut, price, remise, tva, total, note) VALUES ( 2,1,0,'PR-BO-020111','2002-05-09 03:08:33','2002-05-09 03:36:25','2002-05-09 03:36:29','2002-01-11',1,1,1,2,20,0,3.92,23.92,''); +INSERT INTO llx_propal (rowid, fk_soc, fk_projet, ref, datec, date_valid, date_cloture, datep, fk_user_author, fk_user_valid, fk_user_cloture, fk_statut, price, remise, tva, total, note) VALUES ( 3,1,0,'PR-BO-020113','2002-05-09 03:08:50','2002-05-09 03:40:09','2002-05-09 03:40:13','2002-01-13',1,1,1,2,30,0,5.88,35.88,''); +INSERT INTO llx_propal (rowid, fk_soc, fk_projet, ref, datec, date_valid, date_cloture, datep, fk_user_author, fk_user_valid, fk_user_cloture, fk_statut, price, remise, tva, total, note) VALUES ( 4,1,0,'PR-BO-020313','2002-05-09 03:09:13','2002-05-09 03:21:06','2002-05-09 03:21:10','2002-03-13',1,1,1,2,10,0,1.96,11.96,''); +INSERT INTO llx_propal (rowid, fk_soc, fk_projet, ref, datec, date_valid, date_cloture, datep, fk_user_author, fk_user_valid, fk_user_cloture, fk_statut, price, remise, tva, total, note) VALUES ( 5,1,0,'PR-BO-020313.1','2002-05-09 03:09:28','2002-05-09 03:42:09','2002-05-09 03:42:15','2002-03-13',1,1,1,3,20,0,3.92,23.92,''); +INSERT INTO llx_propal (rowid, fk_soc, fk_projet, ref, datec, date_valid, date_cloture, datep, fk_user_author, fk_user_valid, fk_user_cloture, fk_statut, price, remise, tva, total, note) VALUES ( 6,3,0,'PR-DO-020404','2002-05-09 03:16:26','2002-05-09 03:17:04','2002-05-09 03:17:13','2002-04-04',1,1,1,3,1010,0,197.96,1207.96,''); +INSERT INTO llx_propal (rowid, fk_soc, fk_projet, ref, datec, date_valid, date_cloture, datep, fk_user_author, fk_user_valid, fk_user_cloture, fk_statut, price, remise, tva, total, note) VALUES ( 7,3,0,'PR-DO-020405','2002-05-09 03:16:51','2002-05-09 03:17:24','2002-05-09 03:17:28','2002-04-05',1,1,1,2,1010,100,178.36,1088.36,''); +INSERT INTO llx_propal (rowid, fk_soc, fk_projet, ref, datec, date_valid, date_cloture, datep, fk_user_author, fk_user_valid, fk_user_cloture, fk_statut, price, remise, tva, total, note) VALUES ( 8,2,0,'PR-CU-020202','2002-05-09 03:22:49','2002-05-09 03:23:00','2002-05-09 03:23:05','2002-02-02',1,1,1,2,10000,0,1960,11960,''); +INSERT INTO llx_propal (rowid, fk_soc, fk_projet, ref, datec, date_valid, date_cloture, datep, fk_user_author, fk_user_valid, fk_user_cloture, fk_statut, price, remise, tva, total, note) VALUES ( 9,2,0,'PR-CU-020409','2002-05-09 03:46:39','2002-05-09 03:46:45','2002-05-09 03:46:50','2002-04-09',1,1,1,2,20000,0,3920,23920,''); +INSERT INTO llx_propal (rowid, fk_soc, fk_projet, ref, datec, date_valid, date_cloture, datep, fk_user_author, fk_user_valid, fk_user_cloture, fk_statut, price, remise, tva, total, note) VALUES (10,4,0,'PR-FOO-020509','2002-05-09 14:43:47','2002-05-09 15:07:19','2002-05-09 15:07:23','2002-05-09',1,1,1,2,12110,0,2373.56,14483.56,''); +INSERT INTO llx_propal (rowid, fk_soc, fk_projet, ref, datec, date_valid, date_cloture, datep, fk_user_author, fk_user_valid, fk_user_cloture, fk_statut, price, remise, tva, total, note) VALUES (11,4,0,'PR-FOO-020304','2002-05-09 14:44:08','2002-05-09 14:44:18','2002-05-09 14:44:22','2002-03-04',1,1,1,2,12110,0,2373.56,14483.56,''); +INSERT INTO llx_propal (rowid, fk_soc, fk_projet, ref, datec, date_valid, date_cloture, datep, fk_user_author, fk_user_valid, fk_user_cloture, fk_statut, price, remise, tva, total, note) VALUES (12,2,0,'PR-CU-020509','2002-05-09 15:01:37','2002-05-09 15:01:45','2002-05-09 15:01:49','2002-05-09',1,1,1,2,36250,0,7105,43355,''); -- -- Dumping data for table 'llx_propaldet' diff --git a/pgsql/tables/llx_commande.sql b/pgsql/tables/llx_commande.sql index 9e93050c6a0..45c70f0c5c3 100644 --- a/pgsql/tables/llx_commande.sql +++ b/pgsql/tables/llx_commande.sql @@ -31,7 +31,6 @@ create table llx_commande rowid SERIAL PRIMARY KEY, "tms" timestamp, "fk_soc" integer NOT NULL, - "fk_soc_contact" integer, "fk_projet" integer DEFAULT 0, -- projet auquel est rattache la commande "ref" varchar(30) NOT NULL, -- order number "ref_client" varchar(30), -- customer order number diff --git a/pgsql/tables/llx_commande_fournisseur.sql b/pgsql/tables/llx_commande_fournisseur.sql index c605d6ac45d..c60e7567aa9 100644 --- a/pgsql/tables/llx_commande_fournisseur.sql +++ b/pgsql/tables/llx_commande_fournisseur.sql @@ -32,7 +32,6 @@ create table llx_commande_fournisseur rowid SERIAL PRIMARY KEY, "tms" timestamp, "fk_soc" integer NOT NULL, - "fk_soc_contact" integer, "fk_projet" integer DEFAULT 0, -- projet auquel est rattache la commande "ref" varchar(30) NOT NULL, -- order number "date_creation" timestamp, -- date de creation diff --git a/pgsql/tables/llx_livraison.sql b/pgsql/tables/llx_livraison.sql index 47750d02fa5..84c992117ef 100644 --- a/pgsql/tables/llx_livraison.sql +++ b/pgsql/tables/llx_livraison.sql @@ -30,7 +30,6 @@ create table llx_livraison rowid SERIAL PRIMARY KEY, "tms" timestamp, "fk_soc" integer NOT NULL, - "fk_soc_contact" integer, "fk_commande" integer DEFAULT 0, -- commande auquel est rattache le bon de livraison "fk_expedition" integer, -- expedition auquel est rattache le bon de livraison "ref" varchar(30) NOT NULL, -- delivery number diff --git a/pgsql/tables/llx_propal.sql b/pgsql/tables/llx_propal.sql index 3cd81cdfdae..161f275c8ae 100644 --- a/pgsql/tables/llx_propal.sql +++ b/pgsql/tables/llx_propal.sql @@ -29,7 +29,6 @@ create table llx_propal ( rowid SERIAL PRIMARY KEY, "fk_soc" integer, - "fk_soc_contact" integer, "fk_projet" integer DEFAULT 0, -- projet auquel est rattache la propale "ref" varchar(30) NOT NULL, -- propal number "datec" timestamp, -- date de creation