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

Patch patrick

Browse Source
This commit is contained in:
Laurent Destailleur 2007-10-01 22:08:53 +00:00
parent f977238e66
commit 9e3ba924ba
10 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,3 +7,4 @@ TreatmentInProgress=Treatment in progress
LastCustomers=Last customers LastCustomers=Last customers
OSCommerceShop=OSCommerce shop OSCommerceShop=OSCommerce shop
OSCommerce=OSCommerce OSCommerce=OSCommerce
AddProd=Sell online

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

@ -7,3 +7,4 @@ TreatmentInProgress=Traitement en cours
LastCustomers=Dernier clients LastCustomers=Dernier clients
OSCommerceShop=Boutique OSCommerce OSCommerceShop=Boutique OSCommerce
OSCommerce=OSCommerce OSCommerce=OSCommerce
AddProd=Vendre en ligne

4
htdocs/oscommerce_ws/clients/fiche.php
View File

@ -17,12 +17,14 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* *
* $Source$ * $Source$
*
*/ */
require("./pre.inc.php"); require("./pre.inc.php");
require_once(DOL_DOCUMENT_ROOT."/societe.class.php"); require_once(DOL_DOCUMENT_ROOT."/societe.class.php");
require_once("../includes/configure.php"); require_once("../includes/configure.php");
llxHeader(); llxHeader();
if ($action == '' && !$cancel) { if ($action == '' && !$cancel) {

2
htdocs/oscommerce_ws/clients/osc_customer.class.php
View File

@ -21,7 +21,7 @@
/** /**
\file htdocs/oscommerce_ws/clients/osc_customer.class.php \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 \brief Fichier de la classe des clients issus de OsCommerce
\version $Revision$ \version $Revision$
*/ */

6
htdocs/oscommerce_ws/commandes/fiche.php
View File

@ -1,6 +1,5 @@
<?php <?php
/* Copyright (C) 2006 Jean Heimburger <jean@tiaris.info> /* Copyright (C) 2006 Jean Heimburger <jean@tiaris.info>
*
* *
* This program is free software; you can redistribute it and/or modify * 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 * 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 * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* *
* $Id$
* $Source$ * $Source$
*
*/ */
require("./pre.inc.php"); require("./pre.inc.php");
require_once(DOL_DOCUMENT_ROOT."/commande/commande.class.php"); require_once(DOL_DOCUMENT_ROOT."/commande/commande.class.php");
require_once("../includes/configure.php"); require_once("../includes/configure.php");
require_once("../clients/osc_customer.class.php"); require_once("../clients/osc_customer.class.php");
require_once("../produits/osc_product.class.php"); require_once("../produits/osc_product.class.php");
llxHeader(); llxHeader();
if ($action == '' && !$cancel) { if ($action == '' && !$cancel) {

2
htdocs/oscommerce_ws/commandes/osc_order.class.php
View File

@ -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 \ingroup oscommerce_ws/orders
\brief Fichier de la classe des commandes issus de OsCommerce \brief Fichier de la classe des commandes issus de OsCommerce
\version $Revision$ \version $Revision$

2
htdocs/oscommerce_ws/commandes/pre.inc.php
View File

@ -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 \brief Fichier gestionnaire du menu de gauche
\version $Revision$ \version $Revision$
*/ */

6
htdocs/oscommerce_ws/includes/configure.php
View File

@ -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(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(TX_CURRENCY, 1); // le taux de conversion monnaie site osc - monnaie dolibarr (1 euro = 119.33 XPF)
define(NB_DECIMALS, 0); define(NB_DECIMALS, 2);
define(NB_DECIMALSITE, 2); // nb de décimales sur le site 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 // fonctions

4
htdocs/oscommerce_ws/index.php
View File

@ -21,8 +21,8 @@
*/ */
/** /**
\file htdocs/boutique/index.php \file htdocs/oscommerce_ws/index.php
\ingroup boutique \ingroup oscommerce2
\brief Page accueil zone boutique \brief Page accueil zone boutique
\version $Revision$ \version $Revision$
*/ */

3
htdocs/product.class.php
View File

@ -225,8 +225,9 @@ class Product
{ {
if ($this->catid > 0) if ($this->catid > 0)
{ {
require_once(DOL_DOCUMENT_ROOT ."/categories/categorie.class.php");
$cat = new Categorie ($this->db, $this->catid); $cat = new Categorie ($this->db, $this->catid);
$cat->add_product($this); $cat->add_type($this,"product");
} }
} }
else else