[Dolibarr-dev] corrections interface dolibarr OSC

dolibarr-dev

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Dolibarr-dev] corrections interface dolibarr OSC

From:	jean
Subject:	[Dolibarr-dev] corrections interface dolibarr OSC
Date:	Mon, 24 Sep 2007 15:52:35 +0200
User-agent:	IceDove 1.5.0.12 (X11/20070607)

Quelques corrections

import d'un produit dans labonne catégorie

diff -Naur --exclude=CVS --exclude='.#*' --exclude='*~' --exclude=documents 
/home/jean/projets/dolidev/sources/dolibarr_devref/dolibarr/htdocs/oscommerce_ws/clients/fiche.php
 
/home/jean/projets/dolidev/sources/dolibarr/htdocs/oscommerce_ws/clients/fiche.php
--- 
/home/jean/projets/dolidev/sources/dolibarr_devref/dolibarr/htdocs/oscommerce_ws/clients/fiche.php
  2007-05-26 20:17:01.000000000 +0200
+++ 
/home/jean/projets/dolidev/sources/dolibarr/htdocs/oscommerce_ws/clients/fiche.php
  2007-05-27 05:00:16.000000000 +0200
@@ -16,7 +16,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
- * $Source: 
/sources/dolibarr/dolibarr/htdocs/oscommerce_ws/clients/fiche.php,v $
+ * $Source: 
/cvsroot/dolibarr/dolibarr/htdocs/oscommerce_ws/clients/fiche.php,v $
  *
  */
 require("./pre.inc.php");
diff -Naur --exclude=CVS --exclude='.#*' --exclude='*~' --exclude=documents 
/home/jean/projets/dolidev/sources/dolibarr_devref/dolibarr/htdocs/oscommerce_ws/clients/osc_customer.class.php
 
/home/jean/projets/dolidev/sources/dolibarr/htdocs/oscommerce_ws/clients/osc_customer.class.php
--- 
/home/jean/projets/dolidev/sources/dolibarr_devref/dolibarr/htdocs/oscommerce_ws/clients/osc_customer.class.php
     2007-08-10 23:48:07.000000000 +0200
+++ 
/home/jean/projets/dolidev/sources/dolibarr/htdocs/oscommerce_ws/clients/osc_customer.class.php
     2007-08-11 05:00:17.000000000 +0200
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
  * $Id: osc_customer.class.php,v 1.8 2007/08/10 21:48:07 eldy Exp $
- * $Source: 
/sources/dolibarr/dolibarr/htdocs/oscommerce_ws/clients/osc_customer.class.php,v
 $
+ * $Source: 
/cvsroot/dolibarr/dolibarr/htdocs/oscommerce_ws/clients/osc_customer.class.php,v
 $
  */
 
 /**
diff -Naur --exclude=CVS --exclude='.#*' --exclude='*~' --exclude=documents 
/home/jean/projets/dolidev/sources/dolibarr_devref/dolibarr/htdocs/oscommerce_ws/clients/pre.inc.php
 
/home/jean/projets/dolidev/sources/dolibarr/htdocs/oscommerce_ws/clients/pre.inc.php
--- 
/home/jean/projets/dolidev/sources/dolibarr_devref/dolibarr/htdocs/oscommerce_ws/clients/pre.inc.php
        2007-06-27 22:18:19.000000000 +0200
+++ 
/home/jean/projets/dolidev/sources/dolibarr/htdocs/oscommerce_ws/clients/pre.inc.php
        2007-06-28 05:00:16.000000000 +0200
@@ -18,7 +18,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
  * $Id: pre.inc.php,v 1.2 2007/06/27 20:18:19 eldy Exp $
- * $Source: 
/sources/dolibarr/dolibarr/htdocs/oscommerce_ws/clients/pre.inc.php,v $
+ * $Source: 
/cvsroot/dolibarr/dolibarr/htdocs/oscommerce_ws/clients/pre.inc.php,v $
  */
  
 /**
diff -Naur --exclude=CVS --exclude='.#*' --exclude='*~' --exclude=documents 
/home/jean/projets/dolidev/sources/dolibarr_devref/dolibarr/htdocs/oscommerce_ws/commandes/fiche.php
 
/home/jean/projets/dolidev/sources/dolibarr/htdocs/oscommerce_ws/commandes/fiche.php
--- 
/home/jean/projets/dolidev/sources/dolibarr_devref/dolibarr/htdocs/oscommerce_ws/commandes/fiche.php
        2007-06-27 22:18:20.000000000 +0200
+++ 
/home/jean/projets/dolidev/sources/dolibarr/htdocs/oscommerce_ws/commandes/fiche.php
        2007-06-28 05:00:16.000000000 +0200
@@ -16,7 +16,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
- * $Source: 
/sources/dolibarr/dolibarr/htdocs/oscommerce_ws/commandes/fiche.php,v $
+ * $Source: 
/cvsroot/dolibarr/dolibarr/htdocs/oscommerce_ws/commandes/fiche.php,v $
  *
  */
 require("./pre.inc.php");
diff -Naur --exclude=CVS --exclude='.#*' --exclude='*~' --exclude=documents 
/home/jean/projets/dolidev/sources/dolibarr_devref/dolibarr/htdocs/oscommerce_ws/commandes/osc_order.class.php
 
/home/jean/projets/dolidev/sources/dolibarr/htdocs/oscommerce_ws/commandes/osc_order.class.php
--- 
/home/jean/projets/dolidev/sources/dolibarr_devref/dolibarr/htdocs/oscommerce_ws/commandes/osc_order.class.php
      2007-08-10 23:48:07.000000000 +0200
+++ 
/home/jean/projets/dolidev/sources/dolibarr/htdocs/oscommerce_ws/commandes/osc_order.class.php
      2007-08-11 05:00:17.000000000 +0200
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
  * $Id: osc_order.class.php,v 1.9 2007/08/10 21:48:07 eldy Exp $
- * $Source: 
/sources/dolibarr/dolibarr/htdocs/oscommerce_ws/commandes/osc_order.class.php,v 
$
+ * $Source: 
/cvsroot/dolibarr/dolibarr/htdocs/oscommerce_ws/commandes/osc_order.class.php,v 
$
  */
 
 /**
diff -Naur --exclude=CVS --exclude='.#*' --exclude='*~' --exclude=documents 
/home/jean/projets/dolidev/sources/dolibarr_devref/dolibarr/htdocs/oscommerce_ws/commandes/pre.inc.php
 
/home/jean/projets/dolidev/sources/dolibarr/htdocs/oscommerce_ws/commandes/pre.inc.php
--- 
/home/jean/projets/dolidev/sources/dolibarr_devref/dolibarr/htdocs/oscommerce_ws/commandes/pre.inc.php
      2007-06-27 22:18:20.000000000 +0200
+++ 
/home/jean/projets/dolidev/sources/dolibarr/htdocs/oscommerce_ws/commandes/pre.inc.php
      2007-06-28 05:00:16.000000000 +0200
@@ -18,7 +18,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
  * $Id: pre.inc.php,v 1.2 2007/06/27 20:18:20 eldy Exp $
- * $Source: 
/sources/dolibarr/dolibarr/htdocs/oscommerce_ws/commandes/pre.inc.php,v $
+ * $Source: 
/cvsroot/dolibarr/dolibarr/htdocs/oscommerce_ws/commandes/pre.inc.php,v $
  */
  
 /**
diff -Naur --exclude=CVS --exclude='.#*' --exclude='*~' --exclude=documents 
/home/jean/projets/dolidev/sources/dolibarr_devref/dolibarr/htdocs/oscommerce_ws/includes/configure.php
 
/home/jean/projets/dolidev/sources/dolibarr/htdocs/oscommerce_ws/includes/configure.php
--- 
/home/jean/projets/dolidev/sources/dolibarr_devref/dolibarr/htdocs/oscommerce_ws/includes/configure.php
     2007-06-27 22:18:20.000000000 +0200
+++ 
/home/jean/projets/dolidev/sources/dolibarr/htdocs/oscommerce_ws/includes/configure.php
     2007-09-19 21:23:33.000000000 +0200
@@ -40,10 +40,10 @@
 //
 
 define(OSC_ENTREPOT, 1); //l'entrepot lié au stock du site web
-define(TX_CURRENCY, 119.33); // le taux de conversion monnaie site osc - 
monnaie dolibarr (1 euro = 119.33 XPF)
-define(NB_DECIMALS, 0);
+define(TX_CURRENCY, 1); // le taux de conversion monnaie site osc - monnaie 
dolibarr (1 euro = 119.33 XPF)
+define(NB_DECIMALS, 2);
 define(NB_DECIMALSITE, 2); // nb de décimales sur le site
-define(FK_PORT, 159); // l'id du service frais de port défini. 
+define(FK_PORT, 2); // l'id du service frais de port défini. 
 
 // fonctions
 
diff -Naur --exclude=CVS --exclude='.#*' --exclude='*~' --exclude=documents 
/home/jean/projets/dolidev/sources/dolibarr_devref/dolibarr/htdocs/oscommerce_ws/index.php
 /home/jean/projets/dolidev/sources/dolibarr/htdocs/oscommerce_ws/index.php
--- 
/home/jean/projets/dolidev/sources/dolibarr_devref/dolibarr/htdocs/oscommerce_ws/index.php
  2007-09-09 12:40:18.000000000 +0200
+++ /home/jean/projets/dolidev/sources/dolibarr/htdocs/oscommerce_ws/index.php  
2007-09-10 05:00:19.000000000 +0200
@@ -17,7 +17,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
  * $Id: index.php,v 1.7 2007/09/09 10:40:18 hregis Exp $
- * $Source: /sources/dolibarr/dolibarr/htdocs/oscommerce_ws/index.php,v $
+ * $Source: /cvsroot/dolibarr/dolibarr/htdocs/oscommerce_ws/index.php,v $
  */
  
 /**
diff -Naur --exclude=CVS --exclude='.#*' --exclude='*~' --exclude=documents 
/home/jean/projets/dolidev/sources/dolibarr_devref/dolibarr/htdocs/oscommerce_ws/pre.inc.php
 /home/jean/projets/dolidev/sources/dolibarr/htdocs/oscommerce_ws/pre.inc.php
--- 
/home/jean/projets/dolidev/sources/dolibarr_devref/dolibarr/htdocs/oscommerce_ws/pre.inc.php
        2007-06-27 22:18:19.000000000 +0200
+++ 
/home/jean/projets/dolidev/sources/dolibarr/htdocs/oscommerce_ws/pre.inc.php    
    2007-06-28 05:00:16.000000000 +0200
@@ -18,7 +18,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
  * $Id: pre.inc.php,v 1.3 2007/06/27 20:18:19 eldy Exp $
- * $Source: /sources/dolibarr/dolibarr/htdocs/oscommerce_ws/pre.inc.php,v $
+ * $Source: /cvsroot/dolibarr/dolibarr/htdocs/oscommerce_ws/pre.inc.php,v $
  */
  
 /**
diff -Naur --exclude=CVS --exclude='.#*' --exclude='*~' --exclude=documents 
/home/jean/projets/dolidev/sources/dolibarr_devref/dolibarr/htdocs/oscommerce_ws/produits/categories.php
 
/home/jean/projets/dolidev/sources/dolibarr/htdocs/oscommerce_ws/produits/categories.php
--- 
/home/jean/projets/dolidev/sources/dolibarr_devref/dolibarr/htdocs/oscommerce_ws/produits/categories.php
    2007-08-11 00:00:35.000000000 +0200
+++ 
/home/jean/projets/dolidev/sources/dolibarr/htdocs/oscommerce_ws/produits/categories.php
    2007-08-11 05:00:17.000000000 +0200
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
  * $Id: categories.php,v 1.3 2007/08/10 22:00:35 eldy Exp $
- * $Source: 
/sources/dolibarr/dolibarr/htdocs/oscommerce_ws/produits/categories.php,v $
+ * $Source: 
/cvsroot/dolibarr/dolibarr/htdocs/oscommerce_ws/produits/categories.php,v $
  */
 
 /**
diff -Naur --exclude=CVS --exclude='.#*' --exclude='*~' --exclude=documents 
/home/jean/projets/dolidev/sources/dolibarr_devref/dolibarr/htdocs/oscommerce_ws/produits/fiche.php
 
/home/jean/projets/dolidev/sources/dolibarr/htdocs/oscommerce_ws/produits/fiche.php
--- 
/home/jean/projets/dolidev/sources/dolibarr_devref/dolibarr/htdocs/oscommerce_ws/produits/fiche.php
 2007-06-27 22:18:20.000000000 +0200
+++ 
/home/jean/projets/dolidev/sources/dolibarr/htdocs/oscommerce_ws/produits/fiche.php
 2007-09-19 22:45:31.000000000 +0200
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
  * $Id: fiche.php,v 1.7 2007/06/27 20:18:20 eldy Exp $
- * $Source: 
/sources/dolibarr/dolibarr/htdocs/oscommerce_ws/produits/fiche.php,v $
+ * $Source: 
/cvsroot/dolibarr/dolibarr/htdocs/oscommerce_ws/produits/fiche.php,v $
  *
  */
 require("./pre.inc.php");
@@ -90,6 +90,7 @@
                        //      exit;
                }
                $product = $osc_prod->osc2dolibarr($_GET['id']);
+
                } 
                else
                {
diff -Naur --exclude=CVS --exclude='.#*' --exclude='*~' --exclude=documents 
/home/jean/projets/dolidev/sources/dolibarr_devref/dolibarr/htdocs/oscommerce_ws/produits/index.php
 
/home/jean/projets/dolidev/sources/dolibarr/htdocs/oscommerce_ws/produits/index.php
--- 
/home/jean/projets/dolidev/sources/dolibarr_devref/dolibarr/htdocs/oscommerce_ws/produits/index.php
 2007-09-09 12:40:53.000000000 +0200
+++ 
/home/jean/projets/dolidev/sources/dolibarr/htdocs/oscommerce_ws/produits/index.php
 2007-09-10 05:00:19.000000000 +0200
@@ -17,7 +17,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
  * $Id: index.php,v 1.8 2007/09/09 10:40:53 hregis Exp $
- * $Source: 
/sources/dolibarr/dolibarr/htdocs/oscommerce_ws/produits/index.php,v $
+ * $Source: 
/cvsroot/dolibarr/dolibarr/htdocs/oscommerce_ws/produits/index.php,v $
  */
 
 require("./pre.inc.php");
diff -Naur --exclude=CVS --exclude='.#*' --exclude='*~' --exclude=documents 
/home/jean/projets/dolidev/sources/dolibarr_devref/dolibarr/htdocs/oscommerce_ws/produits/osc_categories.class.php
 
/home/jean/projets/dolidev/sources/dolibarr/htdocs/oscommerce_ws/produits/osc_categories.class.php
--- 
/home/jean/projets/dolidev/sources/dolibarr_devref/dolibarr/htdocs/oscommerce_ws/produits/osc_categories.class.php
  2007-06-27 22:18:20.000000000 +0200
+++ 
/home/jean/projets/dolidev/sources/dolibarr/htdocs/oscommerce_ws/produits/osc_categories.class.php
  2007-09-19 22:22:32.000000000 +0200
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
  * $Id: osc_categories.class.php,v 1.1 2007/06/27 20:18:20 eldy Exp $
- * $Source: 
/sources/dolibarr/dolibarr/htdocs/oscommerce_ws/produits/osc_categories.class.php,v
 $
+ * $Source: 
/cvsroot/dolibarr/dolibarr/htdocs/oscommerce_ws/produits/osc_categories.class.php,v
 $
  */
 
 /**
@@ -207,6 +207,7 @@
         $sql.= " WHERE t.osccatid = ".$oscid;
     
        dolibarr_syslog("Osc_Categorie.class::fetch_osccat sql=".$sql);
+
         $resql=$this->db->query($sql);
         if ($resql)
         {
@@ -219,7 +220,6 @@
                 $this->osccatid = $obj->osccatid;
             }
             $this->db->free($resql);
-            
             return 1;
         }
         else
diff -Naur --exclude=CVS --exclude='.#*' --exclude='*~' --exclude=documents 
/home/jean/projets/dolidev/sources/dolibarr_devref/dolibarr/htdocs/oscommerce_ws/produits/osc_product.class.php
 
/home/jean/projets/dolidev/sources/dolibarr/htdocs/oscommerce_ws/produits/osc_product.class.php
--- 
/home/jean/projets/dolidev/sources/dolibarr_devref/dolibarr/htdocs/oscommerce_ws/produits/osc_product.class.php
     2007-08-15 00:23:37.000000000 +0200
+++ 
/home/jean/projets/dolidev/sources/dolibarr/htdocs/oscommerce_ws/produits/osc_product.class.php
     2007-09-19 23:04:33.000000000 +0200
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
  * $Id: osc_product.class.php,v 1.12 2007/08/14 22:23:37 ywarnier Exp $
- * $Source: 
/sources/dolibarr/dolibarr/htdocs/oscommerce_ws/produits/osc_product.class.php,v
 $
+ * $Source: 
/cvsroot/dolibarr/dolibarr/htdocs/oscommerce_ws/produits/osc_product.class.php,v
 $
  */
 
 /**
@@ -46,9 +46,11 @@
        var $osc_stock;
        var $osc_four;
        var $osc_image;
+       var $osc_catid;
        
        var $error;
        
+
     /**
      *    \brief      Constructeur de la classe
      *    \param      id          Id produit (0 par defaut)
@@ -110,6 +112,7 @@
                        $this->osc_four = $obj[manufacturers_id];
                        $this->osc_price = $obj[products_price];
                        $this->osc_image = $obj[image];
+                       $this->osc_catid = $obj[categories_id                   
];
                        }
                else {
                    $this->error = 'Erreur '.$client->getError();
@@ -138,9 +141,10 @@
                        $product->price = convert_price($this->osc_price);
                        $product->tva_tx = $this->osc_tva;
                        $product->type = 0;
+                       $product->catid = $this->get_catid($this->osc_catid) ;
                        $product->seuil_stock_alerte = 0; /* on force */
        /* on force */
-                               $product->catid = 0; /* à voir avec la gestion 
des catégories */
+                                /* à voir avec la gestion des catégories */
                                $product->status = 1; /* en vente */
 
                 return $product;                 
@@ -212,6 +216,21 @@
 // test d'erreurs
                if ($row) return $row[0];       
                else return -1; 
+       }
+       
+       function get_catid($osccatid)
+       {
+      require_once("./osc_categories.class.php");
+               $mycat=new Osc_categorie($this->db);            
+
+               if ($mycat->fetch_osccat($osccatid) > 0) 
+               {
+                       $x = $mycat->dolicatid;
+                       print'<p>'.$x.'</p>';                   
+                       return $x ;
+               }
+               else return 0;
+               
        }       
        
          /**
diff -Naur --exclude=CVS --exclude='.#*' --exclude='*~' --exclude=documents 
/home/jean/projets/dolidev/sources/dolibarr_devref/dolibarr/htdocs/oscommerce_ws/produits/OSCvente.php
 
/home/jean/projets/dolidev/sources/dolibarr/htdocs/oscommerce_ws/produits/OSCvente.php
--- 
/home/jean/projets/dolidev/sources/dolibarr_devref/dolibarr/htdocs/oscommerce_ws/produits/OSCvente.php
      2007-08-15 05:10:01.000000000 +0200
+++ 
/home/jean/projets/dolidev/sources/dolibarr/htdocs/oscommerce_ws/produits/OSCvente.php
      2007-08-16 05:00:17.000000000 +0200
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
  * $Id: OSCvente.php,v 1.4 2007/08/15 03:10:01 ywarnier Exp $
- * $Source: 
/sources/dolibarr/dolibarr/htdocs/oscommerce_ws/produits/OSCvente.php,v $
+ * $Source: 
/cvsroot/dolibarr/dolibarr/htdocs/oscommerce_ws/produits/OSCvente.php,v $
  *
  */
 require("./pre.inc.php");
diff -Naur --exclude=CVS --exclude='.#*' --exclude='*~' --exclude=documents 
/home/jean/projets/dolidev/sources/dolibarr_devref/dolibarr/htdocs/oscommerce_ws/produits/pre.inc.php
 
/home/jean/projets/dolidev/sources/dolibarr/htdocs/oscommerce_ws/produits/pre.inc.php
--- 
/home/jean/projets/dolidev/sources/dolibarr_devref/dolibarr/htdocs/oscommerce_ws/produits/pre.inc.php
       2007-06-27 22:18:21.000000000 +0200
+++ 
/home/jean/projets/dolidev/sources/dolibarr/htdocs/oscommerce_ws/produits/pre.inc.php
       2007-06-28 05:00:16.000000000 +0200
@@ -18,7 +18,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
  * $Id: pre.inc.php,v 1.3 2007/06/27 20:18:21 eldy Exp $
- * $Source: 
/sources/dolibarr/dolibarr/htdocs/oscommerce_ws/produits/pre.inc.php,v $
+ * $Source: 
/cvsroot/dolibarr/dolibarr/htdocs/oscommerce_ws/produits/pre.inc.php,v $
  */
  
 /**
diff -Naur --exclude=CVS --exclude='.#*' --exclude='*~' --exclude=documents 
/home/jean/projets/dolidev/sources/dolibarr_devref/dolibarr/htdocs/oscommerce_ws/ws_server/ws_articles.php
 
/home/jean/projets/dolidev/sources/dolibarr/htdocs/oscommerce_ws/ws_server/ws_articles.php
--- 
/home/jean/projets/dolidev/sources/dolibarr_devref/dolibarr/htdocs/oscommerce_ws/ws_server/ws_articles.php
  2007-09-09 12:40:53.000000000 +0200
+++ 
/home/jean/projets/dolidev/sources/dolibarr/htdocs/oscommerce_ws/ws_server/ws_articles.php
  2007-09-19 22:03:26.000000000 +0200
@@ -16,7 +16,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
- * $Source: 
/sources/dolibarr/dolibarr/htdocs/oscommerce_ws/ws_server/ws_articles.php,v $
+ * $Source: 
/cvsroot/dolibarr/dolibarr/htdocs/oscommerce_ws/ws_server/ws_articles.php,v $
  *
  */
 
@@ -104,9 +104,11 @@
        if (!($db = mysql_select_db(DB_DATABASE, $connexion)))  return new 
soap_fault("Server", "MySQL 2", mysql_error());
 
 //on recherche
-               $sql = "SELECT p.products_id, p.products_model, 
p.products_quantity, p.products_status, 
concat('".OSC_IMG_URL."',p.products_image) as image, p.products_price, 
d.products_name, d.products_description, m.manufacturers_name, 
m.manufacturers_id";
+               $sql = "SELECT p.products_id, p.products_model, 
p.products_quantity, p.products_status, 
concat('".OSC_IMG_URL."',p.products_image) as image, p.products_price, 
d.products_name, d.products_description, m.manufacturers_name, 
m.manufacturers_id, pc.categories_id";
                $sql .= " FROM products as p ";
-               $sql .= " JOIN products_description as d ON p.products_id = 
d.products_id ";                    $sql .= " LEFT JOIN manufacturers as m ON 
p.manufacturers_id=m.manufacturers_id";
+               $sql .= " JOIN products_description as d ON p.products_id = 
d.products_id ";
+               $sql .= " JOIN products_to_categories pc ON p.products_id = 
pc.products_id ";
+               $sql .= " LEFT JOIN manufacturers as m ON 
p.manufacturers_id=m.manufacturers_id";
                $sql .= " WHERE d.language_id =" . OSC_LANGUAGE_ID;
       if ($id) $sql.= " AND p.products_id = ".$id;
       if ($ref) $sql.= " AND p.products_model = '".addslashes($ref)."'";
diff -Naur --exclude=CVS --exclude='.#*' --exclude='*~' --exclude=documents 
/home/jean/projets/dolidev/sources/dolibarr_devref/dolibarr/htdocs/oscommerce_ws/ws_server/ws_customers.php
 
/home/jean/projets/dolidev/sources/dolibarr/htdocs/oscommerce_ws/ws_server/ws_customers.php
--- 
/home/jean/projets/dolidev/sources/dolibarr_devref/dolibarr/htdocs/oscommerce_ws/ws_server/ws_customers.php
 2007-09-09 12:40:53.000000000 +0200
+++ 
/home/jean/projets/dolidev/sources/dolibarr/htdocs/oscommerce_ws/ws_server/ws_customers.php
 2007-09-10 05:00:19.000000000 +0200
@@ -16,7 +16,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
- * $Source: 
/sources/dolibarr/dolibarr/htdocs/oscommerce_ws/ws_server/ws_customers.php,v $
+ * $Source: 
/cvsroot/dolibarr/dolibarr/htdocs/oscommerce_ws/ws_server/ws_customers.php,v $
  *
  */
 
diff -Naur --exclude=CVS --exclude='.#*' --exclude='*~' --exclude=documents 
/home/jean/projets/dolidev/sources/dolibarr_devref/dolibarr/htdocs/oscommerce_ws/ws_server/ws_orders.php
 
/home/jean/projets/dolidev/sources/dolibarr/htdocs/oscommerce_ws/ws_server/ws_orders.php
--- 
/home/jean/projets/dolidev/sources/dolibarr_devref/dolibarr/htdocs/oscommerce_ws/ws_server/ws_orders.php
    2007-09-09 12:40:54.000000000 +0200
+++ 
/home/jean/projets/dolidev/sources/dolibarr/htdocs/oscommerce_ws/ws_server/ws_orders.php
    2007-09-10 05:00:19.000000000 +0200
@@ -16,7 +16,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
- * $Source: 
/sources/dolibarr/dolibarr/htdocs/oscommerce_ws/ws_server/ws_orders.php,v $
+ * $Source: 
/cvsroot/dolibarr/dolibarr/htdocs/oscommerce_ws/ws_server/ws_orders.php,v $
  *
  */
 set_magic_quotes_runtime(0);

[Prev in Thread]

Current Thread

[Next in Thread]

[Dolibarr-dev] corrections interface dolibarr OSC, jean, 2007/09/28
- [Dolibarr-dev] corrections interface dolibarr OSC, jean <=

Prev by Date: [Dolibarr-dev] Petit bug sur les remises de cheques
Next by Date: [Dolibarr-dev] correction product.class
Previous by thread: [Dolibarr-dev] corrections interface dolibarr OSC
Next by thread: [Dolibarr-dev] fichier lang/shop.lang
Index(es):
- Date
- Thread