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

Can use empty prefix for oscommerce module

Browse Source
This commit is contained in:
Laurent Destailleur 2009-01-31 01:17:53 +00:00
parent f2b6dcfe16
commit dc4448c423
27 changed files with 179 additions and 162 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/admin/osc-languages.php
View File

@ -57,7 +57,7 @@ $offset = $limit * $page ;
print_barre_liste("Liste des langues oscommerce", $page, "osc-languages.php"); print_barre_liste("Liste des langues oscommerce", $page, "osc-languages.php");
$sql = "SELECT l.languages_id, l.name, l.code FROM ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."languages as l"; $sql = "SELECT l.languages_id, l.name, l.code FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."languages as l";
$sql .= $db->plimit( $limit ,$offset); $sql .= $db->plimit( $limit ,$offset);

3
htdocs/boutique/client/client.class.php
View File

@ -52,8 +52,9 @@ class Client
function fetch ($id) function fetch ($id)
{ {
global $conf;
$sql = "SELECT customers_id, customers_lastname, customers_firstname FROM ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."customers WHERE customers_id = $id"; $sql = "SELECT customers_id, customers_lastname, customers_firstname FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."customers WHERE customers_id = $id";
$result = $this->db->query($sql) ; $result = $this->db->query($sql) ;

2
htdocs/boutique/client/fiche.php
View File

@ -62,7 +62,7 @@ if ($_GET['id'])
* *
*/ */
$sql = "SELECT o.orders_id, o.customers_id,".$dbosc->pdate("date_purchased")." as date_purchased, t.value as total"; $sql = "SELECT o.orders_id, o.customers_id,".$dbosc->pdate("date_purchased")." as date_purchased, t.value as total";
$sql .= " FROM ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."orders as o, ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."orders_total as t"; $sql .= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders as o, ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders_total as t";
$sql .= " WHERE o.customers_id = " . $client->id; $sql .= " WHERE o.customers_id = " . $client->id;
$sql .= " AND o.orders_id = t.orders_id AND t.class = 'ot_total'"; $sql .= " AND o.orders_id = t.orders_id AND t.class = 'ot_total'";
if ( $dbosc->query($sql) ) if ( $dbosc->query($sql) )

2
htdocs/boutique/client/index.php
View File

@ -48,7 +48,7 @@ $offset = $limit * $page ;
print_barre_liste("Liste des clients", $page, "index.php"); print_barre_liste("Liste des clients", $page, "index.php");
$sql = "SELECT c.customers_id, c.customers_lastname, c.customers_firstname, c.customers_email_address, c.customers_newsletter"; $sql = "SELECT c.customers_id, c.customers_lastname, c.customers_firstname, c.customers_email_address, c.customers_newsletter";
$sql .= " FROM ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."customers as c"; $sql .= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."customers as c";
$sql .= " ORDER BY $sortfield $sortorder "; $sql .= " ORDER BY $sortfield $sortorder ";
$sql .= $dbosc->plimit( $limit ,$offset); $sql .= $dbosc->plimit( $limit ,$offset);

4
htdocs/boutique/commande/ca.php
View File

@ -51,7 +51,7 @@ print '<tr class="liste_titre"><td>'.$langs->trans("Description").'</td>';
print '<td align="right">'.$langs->trans("Lastname").'</td></tr>'; print '<td align="right">'.$langs->trans("Lastname").'</td></tr>';
$sql = "SELECT sum(t.value) as value"; $sql = "SELECT sum(t.value) as value";
$sql .= " FROM ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."orders_total as t"; $sql .= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders_total as t";
$sql .= " WHERE t.class = 'ot_subtotal'"; $sql .= " WHERE t.class = 'ot_subtotal'";
if ( $dbosc->query($sql) ) if ( $dbosc->query($sql) )
@ -79,7 +79,7 @@ else
} }
$sql = "SELECT sum(t.value) as value"; $sql = "SELECT sum(t.value) as value";
$sql .= " FROM ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."orders_total as t"; $sql .= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders_total as t";
$sql .= " WHERE t.class = 'ot_shipping'"; $sql .= " WHERE t.class = 'ot_shipping'";
if ( $dbosc->query($sql) ) if ( $dbosc->query($sql) )

6
htdocs/boutique/commande/commande.class.php
View File

@ -57,8 +57,10 @@ class Commande
*/ */
function fetch ($id,$ref='') function fetch ($id,$ref='')
{ {
global $conf;
$sql = "SELECT orders_id, customers_id, customers_name, customers_company, customers_street_address, customers_suburb, customers_city, customers_postcode, customers_state, customers_country, customers_telephone, customers_email_address, customers_address_format_id, delivery_name, delivery_company, delivery_street_address, delivery_suburb, delivery_city, delivery_postcode, delivery_state, delivery_country, delivery_address_format_id, billing_name, billing_company, billing_street_address, billing_suburb, billing_city, billing_postcode, billing_state, billing_country, billing_address_format_id, payment_method, cc_type, cc_owner, cc_number, cc_expires, last_modified, ".$this->db->pdate("date_purchased") . " as date_purchased, orders_status, orders_date_finished, currency, currency_value"; $sql = "SELECT orders_id, customers_id, customers_name, customers_company, customers_street_address, customers_suburb, customers_city, customers_postcode, customers_state, customers_country, customers_telephone, customers_email_address, customers_address_format_id, delivery_name, delivery_company, delivery_street_address, delivery_suburb, delivery_city, delivery_postcode, delivery_state, delivery_country, delivery_address_format_id, billing_name, billing_company, billing_street_address, billing_suburb, billing_city, billing_postcode, billing_state, billing_country, billing_address_format_id, payment_method, cc_type, cc_owner, cc_number, cc_expires, last_modified, ".$this->db->pdate("date_purchased") . " as date_purchased, orders_status, orders_date_finished, currency, currency_value";
$sql.= " FROM ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."orders"; $sql.= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders";
$sql.= " WHERE orders_id = ".$id; $sql.= " WHERE orders_id = ".$id;
$result = $this->db->query($sql) ; $result = $this->db->query($sql) ;
@ -93,7 +95,7 @@ class Commande
* Totaux * Totaux
*/ */
$sql = "SELECT value, class "; $sql = "SELECT value, class ";
$sql .= " FROM ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."orders_total WHERE orders_id = $id"; $sql .= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders_total WHERE orders_id = $id";
$result = $this->db->query($sql) ; $result = $this->db->query($sql) ;

2
htdocs/boutique/commande/fiche.php
View File

@ -66,7 +66,7 @@ if ($_GET['id'])
* *
*/ */
$sql = "SELECT orders_id, products_id, products_model, products_name, products_price, final_price, products_quantity"; $sql = "SELECT orders_id, products_id, products_model, products_name, products_price, final_price, products_quantity";
$sql .= " FROM ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."orders_products"; $sql .= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders_products";
$sql .= " WHERE orders_id = " . $commande->id; $sql .= " WHERE orders_id = " . $commande->id;
if ( $dbosc->query($sql) ) if ( $dbosc->query($sql) )

2
htdocs/boutique/commande/index.php
View File

@ -48,7 +48,7 @@ print_barre_liste("Liste des commandes", $page, "commande.php");
$sql = "SELECT o.orders_id, customers_id, customers_name, customers_company, customers_street_address, customers_suburb, customers_city, customers_postcode, customers_state, customers_country, customers_telephone, customers_email_address, customers_address_format_id, delivery_name, delivery_company, delivery_street_address, delivery_suburb, delivery_city, delivery_postcode, delivery_state, delivery_country, delivery_address_format_id, billing_name, billing_company, billing_street_address, billing_suburb, billing_city, billing_postcode, billing_state, billing_country, billing_address_format_id, payment_method, cc_type, cc_owner, cc_number, cc_expires, last_modified,".$dbosc->pdate("date_purchased")." as date_purchased, orders_status, orders_date_finished, currency, currency_value, t.value"; $sql = "SELECT o.orders_id, customers_id, customers_name, customers_company, customers_street_address, customers_suburb, customers_city, customers_postcode, customers_state, customers_country, customers_telephone, customers_email_address, customers_address_format_id, delivery_name, delivery_company, delivery_street_address, delivery_suburb, delivery_city, delivery_postcode, delivery_state, delivery_country, delivery_address_format_id, billing_name, billing_company, billing_street_address, billing_suburb, billing_city, billing_postcode, billing_state, billing_country, billing_address_format_id, payment_method, cc_type, cc_owner, cc_number, cc_expires, last_modified,".$dbosc->pdate("date_purchased")." as date_purchased, orders_status, orders_date_finished, currency, currency_value, t.value";
$sql .= " FROM ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."orders as o, ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."orders_total as t"; $sql .= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders as o, ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders_total as t";
$sql .= " WHERE o.orders_id = t.orders_id AND t.class = 'ot_total'"; $sql .= " WHERE o.orders_id = t.orders_id AND t.class = 'ot_total'";
$sql .= " ORDER BY $sortfield $sortorder "; $sql .= " ORDER BY $sortfield $sortorder ";
$sql .= $dbosc->plimit( $limit ,$offset); $sql .= $dbosc->plimit( $limit ,$offset);

2
htdocs/boutique/critiques/bestproduct.php
View File

@ -48,7 +48,7 @@ $offset = $limit * $page ;
print_barre_liste("Liste des produits classés pas critiques", $page, "bestproduct.php"); print_barre_liste("Liste des produits classés pas critiques", $page, "bestproduct.php");
$sql = "SELECT sum(r.reviews_rating)/count(r.reviews_rating) as rat, r.products_id, p.products_model, p.products_quantity, p.products_status"; $sql = "SELECT sum(r.reviews_rating)/count(r.reviews_rating) as rat, r.products_id, p.products_model, p.products_quantity, p.products_status";
$sql .= " FROM ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."reviews as r,".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."products as p "; $sql .= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."reviews as r,".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."products as p ";
$sql .= " WHERE r.products_id = p.products_id"; $sql .= " WHERE r.products_id = p.products_id";
$sql .= " GROUP BY r.products_id, p.products_model, p.products_quantity, p.products_status"; $sql .= " GROUP BY r.products_id, p.products_model, p.products_quantity, p.products_status";

8
htdocs/boutique/critiques/critique.class.php
View File

@ -48,15 +48,15 @@ class Critique {
* *
*/ */
function fetch ($id) { function fetch ($id) {
global $conf;
$sql = "SELECT r.reviews_id, r.reviews_rating, d.reviews_text, p.products_name"; $sql = "SELECT r.reviews_id, r.reviews_rating, d.reviews_text, p.products_name";
$sql .= " FROM ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."reviews as r, ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."reviews_description as d"; $sql .= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."reviews as r, ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."reviews_description as d";
$sql .= " ,".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."products_description as p"; $sql .= " ,".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."products_description as p";
$sql .= " WHERE r.reviews_id = d.reviews_id AND r.products_id=p.products_id"; $sql .= " WHERE r.reviews_id = d.reviews_id AND r.products_id=p.products_id";
$sql .= " AND p.language_id = ".OSC_LANGUAGE_ID. " AND d.languages_id=".OSC_LANGUAGE_ID; $sql .= " AND p.language_id = ".$conf->global->OSC_LANGUAGE_ID. " AND d.languages_id=".$conf->global->OSC_LANGUAGE_ID;
$sql .= " AND r.reviews_id=$id"; $sql .= " AND r.reviews_id=$id";
$result = $this->db->query($sql) ; $result = $this->db->query($sql) ;

4
htdocs/boutique/critiques/index.php
View File

@ -45,9 +45,9 @@ $offset = $limit * $page ;
print_barre_liste("Critiques", $page, "index.php"); print_barre_liste("Critiques", $page, "index.php");
$sql = "SELECT r.reviews_id, r.reviews_rating, d.reviews_text, p.products_name FROM ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."reviews as r, ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."reviews_description as d, ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."products_description as p"; $sql = "SELECT r.reviews_id, r.reviews_rating, d.reviews_text, p.products_name FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."reviews as r, ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."reviews_description as d, ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."products_description as p";
$sql .= " WHERE r.reviews_id = d.reviews_id AND r.products_id=p.products_id"; $sql .= " WHERE r.reviews_id = d.reviews_id AND r.products_id=p.products_id";
$sql .= " AND p.language_id = ".OSC_LANGUAGE_ID. " AND d.languages_id=".OSC_LANGUAGE_ID; $sql .= " AND p.language_id = ".$conf->global->OSC_LANGUAGE_ID. " AND d.languages_id=".$conf->global->OSC_LANGUAGE_ID;
$sql .= " ORDER BY $sortfield $sortorder "; $sql .= " ORDER BY $sortfield $sortorder ";
$sql .= $dbosc->plimit( $limit ,$offset); $sql .= $dbosc->plimit( $limit ,$offset);

18
htdocs/boutique/index.php
View File

@ -53,8 +53,8 @@ print '<tr class="liste_titre"><td>'.$langs->trans("Description").'</td>';
print '<td align="right">'.$langs->trans("Total").'</td></tr>'; print '<td align="right">'.$langs->trans("Total").'</td></tr>';
$sql = "SELECT sum(t.value) as value, MONTH(o.date_purchased) as mois"; $sql = "SELECT sum(t.value) as value, MONTH(o.date_purchased) as mois";
$sql .= " FROM ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."orders_total as t"; $sql .= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders_total as t";
$sql .= " JOIN ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."orders as o ON o.orders_id = t.orders_id"; $sql .= " JOIN ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders as o ON o.orders_id = t.orders_id";
$sql .= " WHERE t.class = 'ot_subtotal' AND YEAR(o.date_purchased) = YEAR(".$dbosc->idate(mktime()).")"; $sql .= " WHERE t.class = 'ot_subtotal' AND YEAR(o.date_purchased) = YEAR(".$dbosc->idate(mktime()).")";
$sql .= " GROUP BY mois ORDER BY mois"; $sql .= " GROUP BY mois ORDER BY mois";
@ -90,8 +90,8 @@ else
/* mensuel /* mensuel
$sql = "SELECT sum(t.value) as value"; $sql = "SELECT sum(t.value) as value";
$sql .= " FROM ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."orders_total as t"; $sql .= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders_total as t";
$sql .= " JOIN ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."orders as o ON o.orders_id = t.orders_id"; $sql .= " JOIN ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders as o ON o.orders_id = t.orders_id";
$sql .= " WHERE t.class = 'ot_subtotal' AND YEAR(o.date_purchased) = YEAR(".$dbosc->db->idate(mktime()).") AND MONTH(o.date_purchased) = MONTH(".$this->db->idate(mktime()).")"; $sql .= " WHERE t.class = 'ot_subtotal' AND YEAR(o.date_purchased) = YEAR(".$dbosc->db->idate(mktime()).") AND MONTH(o.date_purchased) = MONTH(".$this->db->idate(mktime()).")";
if ( $dbosc->query($sql) ) if ( $dbosc->query($sql) )
@ -128,7 +128,7 @@ from orders_total as t
join orders as o on o.orders_id = t.orders_id where t.class = 'ot_subtotal' order by o.date_purchased desc join orders as o on o.orders_id = t.orders_id where t.class = 'ot_subtotal' order by o.date_purchased desc
*/ */
$sql = "SELECT o.orders_id, o.customers_name, o.date_purchased, t.value, o.payment_method"; $sql = "SELECT o.orders_id, o.customers_name, o.date_purchased, t.value, o.payment_method";
$sql .= " FROM ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."orders_total as t JOIN ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."orders as o on o.orders_id = t.orders_id "; $sql .= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders_total as t JOIN ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders as o on o.orders_id = t.orders_id ";
$sql .= " WHERE t.class = 'ot_subtotal' ORDER BY o.date_purchased desc"; $sql .= " WHERE t.class = 'ot_subtotal' ORDER BY o.date_purchased desc";
if ( $dbosc->query($sql) ) if ( $dbosc->query($sql) )
@ -162,7 +162,7 @@ else
* 5 dernières commandes en attente * 5 dernières commandes en attente
*/ */
$sql = "SELECT o.orders_id, o.customers_name, o.date_purchased, t.value, o.payment_method"; $sql = "SELECT o.orders_id, o.customers_name, o.date_purchased, t.value, o.payment_method";
$sql .= " FROM ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."orders_total as t JOIN ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."orders as o on o.orders_id = t.orders_id "; $sql .= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders_total as t JOIN ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders as o on o.orders_id = t.orders_id ";
$sql .= " WHERE t.class = 'ot_subtotal' and o.orders_status = 5 order by o.date_purchased desc"; $sql .= " WHERE t.class = 'ot_subtotal' and o.orders_status = 5 order by o.date_purchased desc";
if ( $dbosc->query($sql) ) if ( $dbosc->query($sql) )
@ -196,7 +196,7 @@ else
* Commandes à traiter * Commandes à traiter
*/ */
$sql = "SELECT o.orders_id, o.customers_name, o.date_purchased, t.value, o.payment_method"; $sql = "SELECT o.orders_id, o.customers_name, o.date_purchased, t.value, o.payment_method";
$sql .= " FROM ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."orders_total as t JOIN ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."orders as o on o.orders_id = t.orders_id "; $sql .= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders_total as t JOIN ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders as o on o.orders_id = t.orders_id ";
$sql .= " WHERE t.class = 'ot_subtotal' and o.orders_status = 2 order by o.date_purchased desc"; $sql .= " WHERE t.class = 'ot_subtotal' and o.orders_status = 2 order by o.date_purchased desc";
if ( $dbosc->query($sql) ) if ( $dbosc->query($sql) )
@ -232,8 +232,8 @@ print '</td></tr><tr>';
* Derniers clients qui ont commandé * Derniers clients qui ont commandé
*/ */
$sql = "SELECT o.orders_id, o.customers_name, o.delivery_country, o.date_purchased, t.value, s.orders_status_name as statut"; $sql = "SELECT o.orders_id, o.customers_name, o.delivery_country, o.date_purchased, t.value, s.orders_status_name as statut";
$sql .= " FROM ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."orders_total as t JOIN ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."orders as o on o.orders_id = t.orders_id "; $sql .= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders_total as t JOIN ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders as o on o.orders_id = t.orders_id ";
$sql .= " JOIN ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."orders_status as s on o.orders_status = s.orders_status_id and s.language_id = 1"; $sql .= " JOIN ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders_status as s on o.orders_status = s.orders_status_id and s.language_id = 1";
$sql .= " WHERE t.class = 'ot_subtotal' order by o.date_purchased desc"; $sql .= " WHERE t.class = 'ot_subtotal' order by o.date_purchased desc";
if ( $dbosc->query($sql) ) if ( $dbosc->query($sql) )

6
htdocs/boutique/notification/index.php
View File

@ -49,10 +49,10 @@ $offset = $limit * $page ;
print_barre_liste("Liste des notifications", $page, "index.php"); print_barre_liste("Liste des notifications", $page, "index.php");
$sql = "SELECT c.customers_id, c.customers_lastname, c.customers_firstname, p.products_name, p.products_id"; $sql = "SELECT c.customers_id, c.customers_lastname, c.customers_firstname, p.products_name, p.products_id";
$sql .= " FROM ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."products_notifications as n,".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."products_description as p"; $sql .= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."products_notifications as n,".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."products_description as p";
$sql .= ",".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."customers as c"; $sql .= ",".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."customers as c";
$sql .= " WHERE n.customers_id = c.customers_id AND p.products_id=n.products_id"; $sql .= " WHERE n.customers_id = c.customers_id AND p.products_id=n.products_id";
$sql .= " AND p.language_id = ".OSC_LANGUAGE_ID; $sql .= " AND p.language_id = ".$conf->global->OSC_LANGUAGE_ID;
$sql .= " ORDER BY $sortfield $sortorder "; $sql .= " ORDER BY $sortfield $sortorder ";
$sql .= $dbosc->plimit( $limit ,$offset); $sql .= $dbosc->plimit( $limit ,$offset);

8
htdocs/boutique/notification/notification.class.php
View File

@ -138,11 +138,13 @@ class Editeur {
*/ */
function delete($user) { function delete($user) {
$sql = "DELETE FROM ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."products WHERE products_id = $idosc "; global $conf;
$sql = "DELETE FROM ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."products_to_categories WHERE products_id = $idosc"; $sql = "DELETE FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."products WHERE products_id = $idosc ";
$sql = "DELETE FROM ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."products_description WHERE products_id = $idosc"; $sql = "DELETE FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."products_to_categories WHERE products_id = $idosc";
$sql = "DELETE FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."products_description WHERE products_id = $idosc";
$sql = "DELETE FROM ".MAIN_DB_PREFIX."livre WHERE rowid = $id"; $sql = "DELETE FROM ".MAIN_DB_PREFIX."livre WHERE rowid = $id";

4
htdocs/boutique/notification/produits.php
View File

@ -47,9 +47,9 @@ $offset = $limit * $page ;
print_barre_liste("Liste des produits suivis", $page, "produits.php"); print_barre_liste("Liste des produits suivis", $page, "produits.php");
$sql = "SELECT p.products_name, p.products_id, count(p.products_id) as nb"; $sql = "SELECT p.products_name, p.products_id, count(p.products_id) as nb";
$sql .= " FROM ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."products_notifications as n,".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."products_description as p"; $sql .= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."products_notifications as n,".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."products_description as p";
$sql .= " WHERE p.products_id=n.products_id"; $sql .= " WHERE p.products_id=n.products_id";
$sql .= " AND p.language_id = ".OSC_LANGUAGE_ID; $sql .= " AND p.language_id = ".$conf->global->OSC_LANGUAGE_ID;
$sql .= " GROUP BY p.products_name, p.products_id"; $sql .= " GROUP BY p.products_name, p.products_id";
$sql .= $dbosc->plimit( $limit ,$offset); $sql .= $dbosc->plimit( $limit ,$offset);

4
htdocs/boutique/produits/osc-liste.php
View File

@ -46,8 +46,8 @@ $offset = $limit * $page ;
print_barre_liste("Liste des produits oscommerce", $page, "osc-liste.php"); print_barre_liste("Liste des produits oscommerce", $page, "osc-liste.php");
$sql = "SELECT p.products_id, p.products_model, p.products_quantity, p.products_status, d.products_name, m.manufacturers_name, m.manufacturers_id"; $sql = "SELECT p.products_id, p.products_model, p.products_quantity, p.products_status, d.products_name, m.manufacturers_name, m.manufacturers_id";
$sql .= " FROM ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."products as p, ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."products_description as d, ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."manufacturers as m"; $sql .= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."products as p, ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."products_description as d, ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."manufacturers as m";
$sql .= " WHERE p.products_id = d.products_id AND d.language_id =" . OSC_LANGUAGE_ID; $sql .= " WHERE p.products_id = d.products_id AND d.language_id =" . $conf->global->OSC_LANGUAGE_ID;
$sql .= " AND p.manufacturers_id=m.manufacturers_id"; $sql .= " AND p.manufacturers_id=m.manufacturers_id";
if ($reqstock=='epuise') if ($reqstock=='epuise')
{ {

4
htdocs/boutique/promotion/index.php
View File

@ -61,8 +61,8 @@ $urladd = "&sortorder=$sortorder&sortfield=$sortfield";
$sql = "SELECT pd.products_name, s.specials_new_products_price, p.products_price, p.products_model, s.status, p.products_id"; $sql = "SELECT pd.products_name, s.specials_new_products_price, p.products_price, p.products_model, s.status, p.products_id";
$sql .= ",".$dbosc->pdate("expires_date")." as fin"; $sql .= ",".$dbosc->pdate("expires_date")." as fin";
$sql .= " FROM ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."specials as s,".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."products_description as pd,".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."products as p"; $sql .= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."specials as s,".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."products_description as pd,".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."products as p";
$sql .= " WHERE s.products_id = pd.products_id AND pd.products_id = p.products_id AND pd.language_id = ".OSC_LANGUAGE_ID; $sql .= " WHERE s.products_id = pd.products_id AND pd.products_id = p.products_id AND pd.language_id = ".$conf->global->OSC_LANGUAGE_ID;
$sql .= " ORDER BY $sortfield $sortorder "; $sql .= " ORDER BY $sortfield $sortorder ";
$sql .= $dbosc->plimit( $limit ,$offset); $sql .= $dbosc->plimit( $limit ,$offset);

26
htdocs/boutique/promotion/promotion.class.php
View File

@ -42,9 +42,10 @@ class Promotion {
* *
*/ */
function create($user, $pid, $percent) { function create($user, $pid, $percent) {
global $conf;
$sql = "SELECT products_price "; $sql = "SELECT products_price ";
$sql .= " FROM ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."products as p"; $sql .= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."products as p";
$sql .= " WHERE p.products_id = $pid"; $sql .= " WHERE p.products_id = $pid";
$result = $this->db->query($sql) ; $result = $this->db->query($sql) ;
@ -59,7 +60,7 @@ class Promotion {
$date_exp = "2003-05-01"; $date_exp = "2003-05-01";
$sql = "INSERT INTO ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."specials "; $sql = "INSERT INTO ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."specials ";
$sql .= " (products_id, specials_new_products_price, specials_date_added, specials_last_modified, expires_date, date_status_change, status) "; $sql .= " (products_id, specials_new_products_price, specials_date_added, specials_last_modified, expires_date, date_status_change, status) ";
$sql .= " VALUES ($pid, $newprice, ".$this->db->idate(mktime()).", NULL, '$date_exp',NULL,1)"; $sql .= " VALUES ($pid, $newprice, ".$this->db->idate(mktime()).", NULL, '$date_exp',NULL,1)";
@ -100,7 +101,9 @@ class Promotion {
*/ */
function set_active($id) function set_active($id)
{ {
$sql = "UPDATE ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."specials"; global $conf;
$sql = "UPDATE ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."specials";
$sql .= " SET status = 1"; $sql .= " SET status = 1";
$sql .= " WHERE products_id = " . $id; $sql .= " WHERE products_id = " . $id;
@ -116,7 +119,9 @@ class Promotion {
*/ */
function set_inactive($id) function set_inactive($id)
{ {
$sql = "UPDATE ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."specials"; global $conf;
$sql = "UPDATE ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."specials";
$sql .= " SET status = 0"; $sql .= " SET status = 0";
$sql .= " WHERE products_id = " . $id; $sql .= " WHERE products_id = " . $id;
@ -133,10 +138,11 @@ class Promotion {
* *
*/ */
function fetch ($id) { function fetch ($id) {
global $conf;
$sql = "SELECT c.categories_id, cd.categories_name, c.parent_id"; $sql = "SELECT c.categories_id, cd.categories_name, c.parent_id";
$sql .= " FROM ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."categories as c,".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."categories_description as cd"; $sql .= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."categories as c,".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."categories_description as cd";
$sql .= " WHERE c.categories_id = cd.categories_id AND cd.language_id = ".OSC_LANGUAGE_ID; $sql .= " WHERE c.categories_id = cd.categories_id AND cd.language_id = ".$conf->global->OSC_LANGUAGE_ID;
$sql .= " AND c.categories_id = $id"; $sql .= " AND c.categories_id = $id";
$result = $this->db->query($sql) ; $result = $this->db->query($sql) ;
@ -162,11 +168,13 @@ class Promotion {
*/ */
function delete($user) { function delete($user) {
$sql = "DELETE FROM ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."products WHERE products_id = $idosc "; global $conf;
$sql = "DELETE FROM ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."products_to_categories WHERE products_id = $idosc"; $sql = "DELETE FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."products WHERE products_id = $idosc ";
$sql = "DELETE FROM ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."products_description WHERE products_id = $idosc"; $sql = "DELETE FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."products_to_categories WHERE products_id = $idosc";
$sql = "DELETE FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."products_description WHERE products_id = $idosc";
} }

4
htdocs/commande/osccommande.class.php
View File

@ -45,7 +45,9 @@ class OscCommande
*/ */
function fetch ($id) function fetch ($id)
{ {
$sql = "SELECT o.orders_id, o.customers_name, o.orders_status FROM ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."orders as o"; global $conf;
$sql = "SELECT o.orders_id, o.customers_name, o.orders_status FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders as o";
$sql .= " WHERE o.orders_id = $id"; $sql .= " WHERE o.orders_id = $id";
$result = $this->db->query($sql) ; $result = $this->db->query($sql) ;

4
htdocs/includes/boxes/box_osc_client.php
View File

@ -57,7 +57,7 @@ class box_osc_clients extends ModeleBoxes {
*/ */
function loadBox($max=5) function loadBox($max=5)
{ {
global $user, $langs, $db; global $conf, $user, $langs, $db;
$langs->load("boxes"); $langs->load("boxes");
$this->max=$max; $this->max=$max;
@ -66,7 +66,7 @@ class box_osc_clients extends ModeleBoxes {
if ($user->rights->boutique->lire) if ($user->rights->boutique->lire)
{ {
$sql = "SELECT count(*) as cus FROM ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."customers"; $sql = "SELECT count(*) as cus FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."customers";
$resql = $db->query($sql); $resql = $db->query($sql);
if ($resql) if ($resql)

2
htdocs/includes/modules/fichinter/pdf_soleil.modules.php
View File

@ -1,6 +1,6 @@
<?php <?php
/* Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2008 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2009 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2008 Raphael Bertrand (Resultic) <raphael.bertrand@resultic.fr> * Copyright (C) 2008 Raphael Bertrand (Resultic) <raphael.bertrand@resultic.fr>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify

1
htdocs/langs/en_US/projects.lang
View File

@ -50,3 +50,4 @@ ActivityOnProjectThisYear=Activity on project this year
ChildOfTaks=Child of project/task ChildOfTaks=Child of project/task
NotOwnerOfProject=Not owner of this private project NotOwnerOfProject=Not owner of this private project
AffectedTo=Affected to AffectedTo=Affected to
CantRemoveProject=This project can't be removed as it is referenced by some other objects (invoice, orders or other). See referers tab.

1
htdocs/langs/fr_FR/projects.lang
View File

@ -50,3 +50,4 @@ ActivityOnProjectThisYear=Activité sur les projets cette année
ChildOfTaks=Fille du projet/tâche ChildOfTaks=Fille du projet/tâche
NotOwnerOfProject=Non responsable de ce projet privé NotOwnerOfProject=Non responsable de ce projet privé
AffectedTo=Affecté à AffectedTo=Affecté à
CantRemoveProject=Ce projet ne peut être supprimé car il est référencé par de nombreux objets (factures, commandes ou autre). voir la liste sur l'onglet Reférents.

2
htdocs/lib/functions.lib.php
View File

@ -1599,11 +1599,11 @@ function dol_print_error($db='',$error='')
{ {
if ($_SERVER['DOCUMENT_ROOT']) // Mode web if ($_SERVER['DOCUMENT_ROOT']) // Mode web
{ {
print "<br>\n";
print "<b>".$langs->trans("DatabaseTypeManager").":</b> ".$db->type."<br>\n"; print "<b>".$langs->trans("DatabaseTypeManager").":</b> ".$db->type."<br>\n";
print "<b>".$langs->trans("RequestLastAccessInError").":</b> ".($db->lastqueryerror()?$db->lastqueryerror():$langs->trans("ErrorNoRequestInError"))."<br>\n"; print "<b>".$langs->trans("RequestLastAccessInError").":</b> ".($db->lastqueryerror()?$db->lastqueryerror():$langs->trans("ErrorNoRequestInError"))."<br>\n";
print "<b>".$langs->trans("ReturnCodeLastAccessInError").":</b> ".($db->lasterrno()?$db->lasterrno():$langs->trans("ErrorNoRequestInError"))."<br>\n"; print "<b>".$langs->trans("ReturnCodeLastAccessInError").":</b> ".($db->lasterrno()?$db->lasterrno():$langs->trans("ErrorNoRequestInError"))."<br>\n";
print "<b>".$langs->trans("InformationLastAccessInError").":</b> ".($db->lasterror()?$db->lasterror():$langs->trans("ErrorNoRequestInError"))."<br>\n"; print "<b>".$langs->trans("InformationLastAccessInError").":</b> ".($db->lasterror()?$db->lasterror():$langs->trans("ErrorNoRequestInError"))."<br>\n";
print "<br>\n";
} }
else // Mode CLI else // Mode CLI
{ {

6
htdocs/project.class.php
View File

@ -266,17 +266,19 @@ class Project extends CommonObject
*/ */
function delete($user) function delete($user)
{ {
$sql = "DELETE FROM ".MAIN_DB_PREFIX."projet"; $sql = "DELETE FROM ".MAIN_DB_PREFIX."projet";
$sql.= " WHERE rowid=".$this->id; $sql.= " WHERE rowid=".$this->id;
dolibarr_syslog("Project::delete sql=".$sql, LOG_DEBUG);
$resql = $this->db->query($sql); $resql = $this->db->query($sql);
if ($resql) if ($resql)
{ {
return 0; return 1;
} }
else else
{ {
$this->error=$this->db->lasterror();
dolibarr_syslog("Project::delete ".$this->error, LOG_ERR);
return -1; return -1;
} }
} }

16
htdocs/projet/fiche.php
View File

@ -1,6 +1,6 @@
<?php <?php
/* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2008 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2009 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2007 Regis Houssin <regis@dolibarr.fr> * Copyright (C) 2005-2007 Regis Houssin <regis@dolibarr.fr>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@ -116,15 +116,15 @@ if ($_POST["action"] == 'confirm_delete' && $_POST["confirm"] == "yes" && $user-
{ {
$projet = new Project($db); $projet = new Project($db);
$projet->id = $_GET["id"]; $projet->id = $_GET["id"];
if ($projet->delete($user) == 0) $result=$projet->delete($user);
if ($result >= 0)
{ {
Header("Location: index.php"); Header("Location: index.php");
exit; exit;
} }
else else
{ {
Header("Location: fiche.php?id=".$projet->id); $mesg='<div class="error">'.$langs->trans("CantRemoveProject").'</div>';
exit;
} }
} }
@ -191,11 +191,9 @@ else
$projet = new Project($db); $projet = new Project($db);
$projet->fetch($_GET["id"],$_GET["ref"]); $projet->fetch($_GET["id"],$_GET["ref"]);
$projet->societe->fetch($projet->societe->id);
if ($projet->user_resp_id > 0) if ($projet->societe->id > 0) $result=$projet->societe->fetch($projet->societe->id);
{ if ($projet->user_resp_id > 0) $result=$projet->fetch_user($projet->user_resp_id);
$result=$projet->fetch_user($projet->user_resp_id);
}
$head=project_prepare_head($projet); $head=project_prepare_head($projet);
dolibarr_fiche_head($head, 'project', $langs->trans("Project")); dolibarr_fiche_head($head, 'project', $langs->trans("Project"));

2
htdocs/translate.class.php
View File

@ -176,7 +176,7 @@ class Translate {
*/ */
function Load($domain,$alt=0) function Load($domain,$alt=0)
{ {
dolibarr_syslog("Translate::Load domain=".$domain." alt=".$alt); //dolibarr_syslog("Translate::Load domain=".$domain." alt=".$alt);
// Check parameters // Check parameters
if (empty($domain)) if (empty($domain))