? Makefile ? documents_tests ? httpd.conf.dist ? httpd.conf.dist.modauth ? httpd.public.conf.dist ? prepare-install.sh ? tar.exclude ? documents/adherent ? documents/commande ? documents/compta ? documents/facture ? documents/ficheinter ? documents/fournisseur ? documents/graph ? documents/logo ? documents/prelevement ? documents/produit ? documents/propale ? documents/rapport ? documents/rsscache ? documents/societe ? documents/users ? htdocs/boutique (copie) ? htdocs/dolibarr.css ? htdocs/facturefourn.class.php ? htdocs/fournisseur.commande.class.php ? htdocs/install_1 ? htdocs/install_old ? htdocs/adherents/XML-RPC.functions.php ? htdocs/admin/system/gen-commande.php ? htdocs/admin/system/gendata.php ? htdocs/admin/update/paiement.php ? htdocs/admin/update/pre.inc.php ? htdocs/boutique/index.php ? htdocs/boutique/produits ? htdocs/boutique/soaplib ? htdocs/comm/propal_model_pdf.class.php ? htdocs/compta/commande.php ? htdocs/compta/dons/formulaire/fsfe.fr.php ? htdocs/conf/tva.local.php ? htdocs/conf/tva.local.php.exemple ? htdocs/includes/fpdf/fpdf.php ? htdocs/includes/fpdf/font/courier.php ? htdocs/includes/fpdf/font/helvetica.php ? htdocs/includes/fpdf/font/helveticab.php ? htdocs/includes/fpdf/font/helveticabi.php ? htdocs/includes/fpdf/font/helveticai.php ? htdocs/includes/fpdf/font/times.php ? htdocs/includes/fpdf/font/timesb.php ? htdocs/includes/fpdf/font/timesbi.php ? htdocs/includes/fpdf/font/timesi.php ? htdocs/includes/fpdf/fpdf152/fpdf.php ? htdocs/includes/fpdf/fpdf152/font/courier.php ? htdocs/includes/fpdf/fpdf152/font/helvetica.php ? htdocs/includes/fpdf/fpdf152/font/helveticab.php ? htdocs/includes/fpdf/fpdf152/font/helveticabi.php ? htdocs/includes/fpdf/fpdf152/font/helveticai.php ? htdocs/includes/fpdf/fpdf152/font/times.php ? htdocs/includes/fpdf/fpdf152/font/timesb.php ? htdocs/includes/fpdf/fpdf152/font/timesbi.php ? htdocs/includes/fpdf/fpdf152/font/timesi.php ? htdocs/includes/menus/barre_left/eldy.php ? htdocs/includes/menus/barre_top/default (copie).php ? htdocs/includes/menus/barre_top/eldy.php ? htdocs/includes/modules/facture/pdf_adytek.modules.php ? htdocs/includes/modules/mailings/cerise.modules.php ? htdocs/includes/modules/propale/pdf_propale_adytek.modules.php ? htdocs/lib/grant.postgres.php ? htdocs/lib/login.css ? htdocs/projet/project.class.php ? htdocs/telephonie/client/ca.php ? htdocs/telephonie/facture/check.php ? htdocs/telephonie/facture/stats.php ? htdocs/telephonie/script/graph-statistiques-all.php ? htdocs/theme/dev/new.css ? htdocs/theme/dev/img/bookmark.png ? htdocs/theme/eldy/eldy.css ? htdocs/theme/eldy/img/bookmark.png ? htdocs/theme/freelug/img/bookmark.png ? htdocs/theme/yellow/img/bookmark.png ? misc/purgedemo.sh ? mysql/purge-boutique.sql ? mysql/migration/0.1.1-0.1.2.sql ? mysql/migration/0.1.3-0.1.4.sql ? mysql/migration/0.1.5-0.2.0.sql ? mysql/migration/0.2.1-0.2.2.sql ? mysql/migration/0.2.3-0.3.0.sql ? mysql/migration/0.3.0-0.4.0.sql ? mysql/migration/0.4.0-0.5.0.sql ? mysql/migration/0.5.1-0.5.2.sql ? mysql/migration/0.5.2-0.6.0.sql ? mysql/migration/0.6.0-0.7.0.sql ? mysql/migration/1.0.0_RC1-1.0.0_RC2.sql ? mysql/migration/1.1.0-1.2.0-RC1.sql ? mysql/tables/llx_c_accountingsystem.sql ? mysql/tables/llx_contact_facture.sql ? pgsql/purge-boutique.sql ? pgsql/tables/llx_c_accountingsystem.sql ? pgsql/tables/llx_contact_facture.sql ? pgsql/tables/mysql-function.sql Index: htdocs/product.class.php =================================================================== RCS file: /sources/dolibarr/dolibarr/htdocs/product.class.php,v retrieving revision 1.116 diff -U3 -r1.116 product.class.php --- htdocs/product.class.php 16 Jun 2006 23:55:20 -0000 1.116 +++ htdocs/product.class.php 22 Jun 2006 08:24:52 -0000 @@ -144,15 +144,14 @@ $sql.= " VALUES (now(), "; if ($this->ref) $sql.= "'".$this->ref."', "; $sql.= $user->id.", ".$this->type.", '" . $this->price . "')"; + $result = $this->db->query($sql); if ( $result ) { $id = $this->db->last_insert_id(MAIN_DB_PREFIX."product"); - if ($id > 0) { $this->id = $id; - $this->_log_price($user); if ( $this->update($id, $user) > 0) { if ($this->catid > 0) @@ -469,6 +468,7 @@ function _log_price($user) { // MultiPrix : si activé, on gère tout ici, même le prix standard +print '
productclass log_price
'; global $conf; if($conf->global->PRODUIT_MULTIPRICES == 1) { Index: htdocs/boutique/pre.inc.php =================================================================== RCS file: /sources/dolibarr/dolibarr/htdocs/boutique/pre.inc.php,v retrieving revision 1.5 diff -U3 -r1.5 pre.inc.php --- htdocs/boutique/pre.inc.php 22 Apr 2006 00:16:37 -0000 1.5 +++ htdocs/boutique/pre.inc.php 22 Jun 2006 08:24:52 -0000 @@ -20,14 +20,12 @@ * */ require("../main.inc.php"); -//require("./livre/livre.class.php"); -//require("./editeur/editeur.class.php"); -//require("./auteur/auteur.class.php"); require("../product/categorie/categorie.class.php"); //affichages dans la page d'accueil define("OSC_MAXNBCOM", 5); + function llxHeader($head = "", $urlp = "") { global $user, $conf; @@ -39,21 +37,6 @@ top_menu($head); $menu = new Menu(); -/* - $menu->add(DOL_URL_ROOT."/boutique/livre/", "Livres"); - - $menu->add_submenu(DOL_URL_ROOT."/boutique/livre/fiche.php?&action=create","Nouvel ouvrage"); - - $menu->add_submenu(DOL_URL_ROOT."/boutique/livre/vignettes.php","Vignettes manquantes"); - - $menu->add(DOL_URL_ROOT."/boutique/auteur/", "Auteurs"); - - $menu->add_submenu(DOL_URL_ROOT."/boutique/auteur/fiche.php?&action=create","Nouvel auteur"); - - $menu->add(DOL_URL_ROOT."/boutique/editeur/", "Editeurs"); - - $menu->add_submenu(DOL_URL_ROOT."/boutique/editeur/fiche.php?&action=create","Nouvel éditeur"); -*/ $menu->add(DOL_URL_ROOT."/boutique/produits/osc-liste.php", "Produits"); @@ -61,17 +44,9 @@ $menu->add(DOL_URL_ROOT."/boutique/commande/", "Commandes"); - -/* - $menu->add(DOL_URL_ROOT."/product/categorie/", "Catégories"); - - $menu->add(DOL_URL_ROOT."/product/promotion/", "Promotions"); - - if (defined("MAIN_MODULE_POSTNUKE") && MAIN_MODULE_POSTNUKE) - { - $menu->add(DOL_URL_ROOT."/postnuke/articles/", "Editorial"); - } -*/ + $menu->add(DOL_URL_ROOT."/boutique/client/", "Clients"); + + left_menu($menu->liste); } ?> Index: htdocs/includes/menus/barre_top/default.php =================================================================== RCS file: /sources/dolibarr/dolibarr/htdocs/includes/menus/barre_top/default.php,v retrieving revision 1.55 diff -U3 -r1.55 default.php --- htdocs/includes/menus/barre_top/default.php 20 May 2006 10:10:41 -0000 1.55 +++ htdocs/includes/menus/barre_top/default.php 22 Jun 2006 08:24:55 -0000 @@ -217,6 +217,28 @@ print 'atarget?" target=$this->atarget":"").'>'.$chaine.''; } +//JH debut + if ($conf->boutique->enabled) + { + $langs->load("boutique"); + + $class=""; + if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "boutique") + { + $class='class="tmenu" id="sel"'; + } + elseif (ereg("^".DOL_URL_ROOT."\/boutique\/",$_SERVER["PHP_SELF"])) + { + $class='class="tmenu" id="sel"'; + } + else + { + $class = 'class="tmenu"'; + } + + print 'atarget?" target=$this->atarget":"").'>'.$langs->trans("Boutique").''; + } +//JH fin // Entrée fournisseur if ($conf->fournisseur->enabled && $user->rights->fournisseur->commande->lire) Index: htdocs/product/pre.inc.php =================================================================== RCS file: /sources/dolibarr/dolibarr/htdocs/product/pre.inc.php,v retrieving revision 1.22 diff -U3 -r1.22 pre.inc.php --- htdocs/product/pre.inc.php 8 Jun 2006 20:25:44 -0000 1.22 +++ htdocs/product/pre.inc.php 22 Jun 2006 08:24:56 -0000 @@ -65,20 +65,6 @@ } } - if ($conf->boutique->enabled) - { - $menu->add(DOL_URL_ROOT."/product/osc-liste.php", "Osc"); - $menu->add_submenu(DOL_URL_ROOT."/product/osc-liste.php?reqstock=epuise", "Produits Epuisés"); - - $menu->add(DOL_URL_ROOT."/product/osc-reviews.php", $langs->trans("Criticals")); - - $menu->add_submenu(DOL_URL_ROOT."/product/osc-productsbyreviews.php", "Meilleurs produits"); - - $menu->add(DOL_URL_ROOT."/product/album/", "Albums"); - $menu->add(DOL_URL_ROOT."/product/groupart/", "Groupes/Artistes"); - - $menu->add(DOL_URL_ROOT."/product/categorie/", $langs->trans("Categories")); - } if ($conf->fournisseur->enabled) { $langs->load("suppliers");