| id\">$propale->ref | \n"; - - print ''.strftime("%d %B %Y",$propale->datep).' | '; - - print ''.price($propale->price).' | '; - print 'statut | '; + print '
| Réf | "; + print 'Date | '; + print 'Prix | '; + print 'Statut | '; print '
| '.$i.' propales | '; - print 'Total : '.price($total).' | '; - print 'Euros HT | |
| Editer | "; + for ($i = 0; $i||||||||
| id\">$propale->ref | \n"; + + print ''.strftime("%d %B %Y",$propale->datep).' | '; + + print ''.price($propale->price).' | '; + print ''.$propale->statut.' | '; + print '|||||
| '.$i.' propales | '; + print 'Total : '.price($total).' | '; + print 'Euros HT | ||||||
| Editer | "; + print "- | "; print "- | "; diff --git a/htdocs/compta/index.php3 b/htdocs/compta/index.php3 index 29abccbb5fb..8f3fb33f9d7 100644 --- a/htdocs/compta/index.php3 +++ b/htdocs/compta/index.php3 @@ -30,7 +30,6 @@ if ($user->societe_id > 0) $socidp = $user->societe_id; } - llxHeader(); $db = new Db(); diff --git a/htdocs/compta/propal.php3 b/htdocs/compta/propal.php3 index be0e67884ce..628767fb080 100644 --- a/htdocs/compta/propal.php3 +++ b/htdocs/compta/propal.php3 @@ -36,7 +36,8 @@ llxHeader(); $db = new Db(); -if ($action == 'setstatut') { +if ($action == 'setstatut') +{ /* * Cloture de la propale */ @@ -233,8 +234,7 @@ if ($propalid) print '- | '; } - - + print "- | "; print "- | "; @@ -305,120 +305,111 @@ if ($propalid) if ($sortfield == "") { - $sortfield="lower(p.label)"; + $sortfield="p.datep"; } if ($sortorder == "") { - $sortorder="ASC"; + $sortorder="DESC"; } - $yn["t"] = "oui"; - $yn["f"] = "non"; - if ($page == -1) { $page = 0 ; } - $limit = 26; - $offset = $limit * $page ; + $pageprev = $page - 1; $pagenext = $page + 1; + $limit = $conf->liste_limit; + $offset = $limit * $page ; - - print "||||||||||||||||||||||||||||
Propositions commerciales | ";
- print "
| Total : ".price($subtotal)." | \n"; - print "Euros HT | |||||
| Réf | "; - print "Société | "; - print "Date | "; - print "Prix | "; - print "Statut statutid\">";
- print ' | ';
- print "||
| propalid\">$objp->ref | \n"; - print "idp\">$objp->nom | \n"; - - $now = time(); - $lim = 3600 * 24 * 15 ; - - if ( ($now - $objp->dp) > $lim && $objp->statutid == 1 ) { - print "> 15 jours | "; - } else { - print ""; - } - - print " | "; - $y = strftime("%Y",$objp->dp); - $m = strftime("%m",$objp->dp); - - print strftime("%d",$objp->dp)."\n"; - print " "; - print strftime("%B",$objp->dp)."\n"; - print " "; - print strftime("%Y",$objp->dp)." | \n"; - - print "".price($objp->price)." | \n"; - print "$objp->statut | \n"; - print "
| Réf | "; + print "Société | "; + print 'Date | '; + print 'Prix | '; + print 'Statut | '; + print "||
| propalid\">$objp->ref | \n"; + print "idp\">$objp->nom | \n"; + + $now = time(); + $lim = 3600 * 24 * 15 ; + + if ( ($now - $objp->dp) > $lim && $objp->statutid == 1 ) + { + print "> 15 jours | "; + } + else + { + print ""; + } + + print " | "; + $y = strftime("%Y",$objp->dp); + $m = strftime("%m",$objp->dp); + + print strftime("%d",$objp->dp)."\n"; + print " "; + print strftime("%B",$objp->dp)."\n"; + print " "; + print strftime("%Y",$objp->dp)." | \n"; + + print "".price($objp->price)." | \n"; + print "$objp->statut | \n"; + print "
$sql"; + } } $db->close(); llxFooter("Dernière modification $Date$ révision $Revision$"); diff --git a/htdocs/html.form.class.php b/htdocs/html.form.class.php index 51f56bd05f5..69c46268478 100644 --- a/htdocs/html.form.class.php +++ b/htdocs/html.form.class.php @@ -58,7 +58,7 @@ class Form { * * */ - Function select_tva($name='') + Function select_tva($name='', $defaulttx = 19.6) { if (! strlen(trim($name))) { diff --git a/htdocs/product.class.php3 b/htdocs/product.class.php3 index edd358cdb04..aa84eddb042 100644 --- a/htdocs/product.class.php3 +++ b/htdocs/product.class.php3 @@ -20,7 +20,8 @@ * */ -class Product { +class Product +{ var $db ; var $id ; @@ -29,28 +30,34 @@ class Product { var $description; var $price ; - Function Product($DB, $id=0) { - $this->db = $DB; - $this->id = $id ; - } + Function Product($DB, $id=0) + { + $this->db = $DB; + $this->id = $id ; + } /* * * * */ - Function create($user) { + Function create($user) + { - $sql = "INSERT INTO llx_product (fk_user_author) VALUES (".$user->id.")"; - - if ($this->db->query($sql) ) { - $id = $this->db->last_insert_id(); - - if ( $this->update($id, $user) ) { - return $id; - } - } else { - print $this->db->error() . ' in ' . $sql; - } + $sql = "INSERT INTO llx_product (fk_user_author) VALUES (".$user->id.")"; + + if ($this->db->query($sql) ) + { + $id = $this->db->last_insert_id(); + + if ( $this->update($id, $user) ) + { + return $id; + } + } + else + { + print $this->db->error() . ' in ' . $sql; + } } /* @@ -58,44 +65,53 @@ class Product { * * */ - Function update($id, $user) { + Function update($id, $user) + { - $sql = "UPDATE llx_product "; - $sql .= " SET label = '" . trim($this->libelle) ."'"; - $sql .= ",ref = '" . trim($this->ref) ."'"; - $sql .= ",price = " . $this->price ; - $sql .= ",description = '" . trim($this->description) ."'"; - - $sql .= " WHERE rowid = " . $id; - - if ( $this->db->query($sql) ) { - return 1; - } else { - print $this->db->error() . ' in ' . $sql; + $sql = "UPDATE llx_product "; + $sql .= " SET label = '" . trim($this->libelle) ."'"; + $sql .= ",ref = '" . trim($this->ref) ."'"; + $sql .= ",price = " . $this->price ; + $sql .= ",tva_tx = " . $this->tva_tx ; + $sql .= ",description = '" . trim($this->description) ."'"; + + $sql .= " WHERE rowid = " . $id; + + if ( $this->db->query($sql) ) + { + return 1; + } + else + { + print $this->db->error() . ' in ' . $sql; + } } - } /* * * * */ - Function fetch ($id) { + Function fetch ($id) + { - $sql = "SELECT rowid, ref, label, description, price FROM llx_product WHERE rowid = $id"; + $sql = "SELECT rowid, ref, label, description, price, tva_tx"; + $sql .= " FROM llx_product WHERE rowid = $id"; - $result = $this->db->query($sql) ; + $result = $this->db->query($sql) ; - if ( $result ) { - $result = $this->db->fetch_array(); + if ( $result ) + { + $result = $this->db->fetch_array(); - $this->id = $result["rowid"]; - $this->ref = $result["ref"]; - $this->label = $result["label"]; - $this->description = $result["description"]; - $this->price = $result["price"]; - } - $this->db->free(); - return $result; + $this->id = $result["rowid"]; + $this->ref = $result["ref"]; + $this->label = $result["label"]; + $this->description = $result["description"]; + $this->price = $result["price"]; + $this->tva_tx = $result["tva_tx"]; + } + $this->db->free(); + return $result; } }