From 9e3ba924bad49f86dacfa9c247cadbaeed86741c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 1 Oct 2007 22:08:53 +0000 Subject: [PATCH] Patch patrick --- htdocs/langs/en_US/shop.lang | 3 ++- htdocs/langs/fr_FR/shop.lang | 3 ++- htdocs/oscommerce_ws/clients/fiche.php | 4 +++- htdocs/oscommerce_ws/clients/osc_customer.class.php | 2 +- htdocs/oscommerce_ws/commandes/fiche.php | 6 ++++-- htdocs/oscommerce_ws/commandes/osc_order.class.php | 2 +- htdocs/oscommerce_ws/commandes/pre.inc.php | 2 +- htdocs/oscommerce_ws/includes/configure.php | 6 +++--- htdocs/oscommerce_ws/index.php | 4 ++-- htdocs/product.class.php | 3 ++- 10 files changed, 21 insertions(+), 14 deletions(-) diff --git a/htdocs/langs/en_US/shop.lang b/htdocs/langs/en_US/shop.lang index 392943b2a08..59f0aa0820a 100644 --- a/htdocs/langs/en_US/shop.lang +++ b/htdocs/langs/en_US/shop.lang @@ -6,4 +6,5 @@ OnStandBy=On standby TreatmentInProgress=Treatment in progress LastCustomers=Last customers OSCommerceShop=OSCommerce shop -OSCommerce=OSCommerce \ No newline at end of file +OSCommerce=OSCommerce +AddProd=Sell online \ No newline at end of file diff --git a/htdocs/langs/fr_FR/shop.lang b/htdocs/langs/fr_FR/shop.lang index 9e85fb744e8..4f17f758163 100644 --- a/htdocs/langs/fr_FR/shop.lang +++ b/htdocs/langs/fr_FR/shop.lang @@ -6,4 +6,5 @@ OnStandBy=En attente TreatmentInProgress=Traitement en cours LastCustomers=Dernier clients OSCommerceShop=Boutique OSCommerce -OSCommerce=OSCommerce \ No newline at end of file +OSCommerce=OSCommerce +AddProd=Vendre en ligne \ No newline at end of file diff --git a/htdocs/oscommerce_ws/clients/fiche.php b/htdocs/oscommerce_ws/clients/fiche.php index ffb9d165d99..0e069abd3fa 100644 --- a/htdocs/oscommerce_ws/clients/fiche.php +++ b/htdocs/oscommerce_ws/clients/fiche.php @@ -17,12 +17,14 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * $Source$ - * */ + require("./pre.inc.php"); require_once(DOL_DOCUMENT_ROOT."/societe.class.php"); require_once("../includes/configure.php"); + + llxHeader(); if ($action == '' && !$cancel) { diff --git a/htdocs/oscommerce_ws/clients/osc_customer.class.php b/htdocs/oscommerce_ws/clients/osc_customer.class.php index 0c8b4ab59ee..988abe1c5c5 100644 --- a/htdocs/oscommerce_ws/clients/osc_customer.class.php +++ b/htdocs/oscommerce_ws/clients/osc_customer.class.php @@ -21,7 +21,7 @@ /** \file htdocs/oscommerce_ws/clients/osc_customer.class.php - \ingroup oscommerce_ws/clients + \ingroup oscommerce2 \brief Fichier de la classe des clients issus de OsCommerce \version $Revision$ */ diff --git a/htdocs/oscommerce_ws/commandes/fiche.php b/htdocs/oscommerce_ws/commandes/fiche.php index 7ae06831d8d..8e371b6c017 100644 --- a/htdocs/oscommerce_ws/commandes/fiche.php +++ b/htdocs/oscommerce_ws/commandes/fiche.php @@ -1,6 +1,5 @@ - * * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,15 +15,18 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * $Id$ * $Source$ - * */ + require("./pre.inc.php"); require_once(DOL_DOCUMENT_ROOT."/commande/commande.class.php"); require_once("../includes/configure.php"); require_once("../clients/osc_customer.class.php"); require_once("../produits/osc_product.class.php"); + + llxHeader(); if ($action == '' && !$cancel) { diff --git a/htdocs/oscommerce_ws/commandes/osc_order.class.php b/htdocs/oscommerce_ws/commandes/osc_order.class.php index 213d384d3fd..71491c7634c 100644 --- a/htdocs/oscommerce_ws/commandes/osc_order.class.php +++ b/htdocs/oscommerce_ws/commandes/osc_order.class.php @@ -20,7 +20,7 @@ */ /** - \file htdocs/oscommerce_ws/orders/osc_order.class.php + \file htdocs/oscommerce_ws/commandes/osc_order.class.php \ingroup oscommerce_ws/orders \brief Fichier de la classe des commandes issus de OsCommerce \version $Revision$ diff --git a/htdocs/oscommerce_ws/commandes/pre.inc.php b/htdocs/oscommerce_ws/commandes/pre.inc.php index 8022b964674..433feb613b0 100644 --- a/htdocs/oscommerce_ws/commandes/pre.inc.php +++ b/htdocs/oscommerce_ws/commandes/pre.inc.php @@ -22,7 +22,7 @@ */ /** - \file htdocs/oscommerce_ws/clients/pre.inc.php + \file htdocs/oscommerce_ws/commandes/pre.inc.php \brief Fichier gestionnaire du menu de gauche \version $Revision$ */ diff --git a/htdocs/oscommerce_ws/includes/configure.php b/htdocs/oscommerce_ws/includes/configure.php index 44a8f4727ba..e5970f1a4b5 100644 --- a/htdocs/oscommerce_ws/includes/configure.php +++ b/htdocs/oscommerce_ws/includes/configure.php @@ -40,10 +40,10 @@ define(OSC_ORDPROCESS,'1'); // code du statut de commande en traitement // 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 --git a/htdocs/oscommerce_ws/index.php b/htdocs/oscommerce_ws/index.php index 9b33710d7a7..d3744d13a1a 100644 --- a/htdocs/oscommerce_ws/index.php +++ b/htdocs/oscommerce_ws/index.php @@ -21,8 +21,8 @@ */ /** - \file htdocs/boutique/index.php - \ingroup boutique + \file htdocs/oscommerce_ws/index.php + \ingroup oscommerce2 \brief Page accueil zone boutique \version $Revision$ */ diff --git a/htdocs/product.class.php b/htdocs/product.class.php index da589043c77..cb0450c66ff 100644 --- a/htdocs/product.class.php +++ b/htdocs/product.class.php @@ -225,8 +225,9 @@ class Product { if ($this->catid > 0) { + require_once(DOL_DOCUMENT_ROOT ."/categories/categorie.class.php"); $cat = new Categorie ($this->db, $this->catid); - $cat->add_product($this); + $cat->add_type($this,"product"); } } else