diff --git a/ChangeLog b/ChangeLog index c81e0fa6646..57673bac498 100644 --- a/ChangeLog +++ b/ChangeLog @@ -98,6 +98,7 @@ For users, new experimental module (need to set feature level of instance to exp Hydroflex 120 euros Asysteo 120 euros Fournisseur médical 120 euros +- Removed: unmaintained OScommerce module For translators: - Update language files. @@ -130,6 +131,7 @@ For developers: WARNING: Following changes may create regression for some external modules, but was necessary to make Dolibarr better: +- Deprecated module "oscommerce" were removed. - Changed the way parameters are provided to scripts sync_xxx_ldap2dolibarr.php - Some field into database were renamed from "libelle" to "label". - Table llx_c_pays were renamed into llx_c_country. diff --git a/build/rpm/dolibarr_fedora.spec b/build/rpm/dolibarr_fedora.spec index 439a09b8266..156f34bc066 100755 --- a/build/rpm/dolibarr_fedora.spec +++ b/build/rpm/dolibarr_fedora.spec @@ -162,7 +162,6 @@ done >>%{name}.lang %_datadir/dolibarr/htdocs/asterisk %_datadir/dolibarr/htdocs/barcode %_datadir/dolibarr/htdocs/bookmarks -%_datadir/dolibarr/htdocs/boutique %_datadir/dolibarr/htdocs/cashdesk %_datadir/dolibarr/htdocs/categories %_datadir/dolibarr/htdocs/comm diff --git a/build/rpm/dolibarr_generic.spec b/build/rpm/dolibarr_generic.spec index 945e8f4812c..176cb07975d 100755 --- a/build/rpm/dolibarr_generic.spec +++ b/build/rpm/dolibarr_generic.spec @@ -242,7 +242,6 @@ done >>%{name}.lang %_datadir/dolibarr/htdocs/asterisk %_datadir/dolibarr/htdocs/barcode %_datadir/dolibarr/htdocs/bookmarks -%_datadir/dolibarr/htdocs/boutique %_datadir/dolibarr/htdocs/cashdesk %_datadir/dolibarr/htdocs/categories %_datadir/dolibarr/htdocs/comm diff --git a/build/rpm/dolibarr_mandriva.spec b/build/rpm/dolibarr_mandriva.spec index 17b46c3c143..d75c9a84dca 100755 --- a/build/rpm/dolibarr_mandriva.spec +++ b/build/rpm/dolibarr_mandriva.spec @@ -159,7 +159,6 @@ done >>%{name}.lang %_datadir/dolibarr/htdocs/asterisk %_datadir/dolibarr/htdocs/barcode %_datadir/dolibarr/htdocs/bookmarks -%_datadir/dolibarr/htdocs/boutique %_datadir/dolibarr/htdocs/cashdesk %_datadir/dolibarr/htdocs/categories %_datadir/dolibarr/htdocs/comm diff --git a/build/rpm/dolibarr_opensuse.spec b/build/rpm/dolibarr_opensuse.spec index f6192c87c9b..41ea838f3fb 100755 --- a/build/rpm/dolibarr_opensuse.spec +++ b/build/rpm/dolibarr_opensuse.spec @@ -170,7 +170,6 @@ done >>%{name}.lang %_datadir/dolibarr/htdocs/asterisk %_datadir/dolibarr/htdocs/barcode %_datadir/dolibarr/htdocs/bookmarks -%_datadir/dolibarr/htdocs/boutique %_datadir/dolibarr/htdocs/cashdesk %_datadir/dolibarr/htdocs/categories %_datadir/dolibarr/htdocs/comm diff --git a/htdocs/admin/osc-languages.php b/htdocs/admin/osc-languages.php deleted file mode 100644 index 804c72f2850..00000000000 --- a/htdocs/admin/osc-languages.php +++ /dev/null @@ -1,90 +0,0 @@ - - * - * 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 - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -/** - * \file htdocs/admin/osc-languages.php - * \ingroup boutique - * \brief Page d'administration/configuration du module Boutique - */ - -require '../main.inc.php'; - -$langs->load("admin"); - -if (!$user->admin) -accessforbidden(); - - -llxHeader(); - - -if (! dol_strlen(OSC_DB_NAME)) -{ - print "Non dispo"; - llxFooter(); -} - -if ($sortfield == "") { - $sortfield="lower(p.label),p.price"; -} -if ($sortorder == "") { - $sortorder="ASC"; -} - -if ($page == -1) { $page = 0 ; } -$limit = $conf->liste_limit; -$offset = $limit * $page ; - - -print_barre_liste("Liste des langues oscommerce", $page, "osc-languages.php"); - -$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); - -print "

"; -print ""; -print ""; -print ""; -print ""; -print "\n"; - -$resql=$db->query($sql); -if ($resql) -{ - $num = $db->num_rows($resql); - $i = 0; - - $var=True; - while ($i < $num) { - $objp = $db->fetch_object($resql); - $var=!$var; - print ""; - print "\n"; - print "\n"; - print "\n"; - print "\n"; - $i++; - } - $db->free(); -} - -print "
idNameCode
$objp->languages_id$objp->name$objp->code
"; - - -$db->close(); - -llxFooter(); diff --git a/htdocs/boutique/admin/boutique.php b/htdocs/boutique/admin/boutique.php deleted file mode 100644 index b4430edcbe1..00000000000 --- a/htdocs/boutique/admin/boutique.php +++ /dev/null @@ -1,204 +0,0 @@ - - * Copyright (C) 2004 Sebastien Di Cintio - * Copyright (C) 2004 Benoit Mortier - * Copyright (C) 2006 Laurent Destailleur - * Copyright (C) 2012 Juanjo Menent - * - * 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 - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * - */ - -/** - * \file htdocs/boutique/admin/boutique.php - * \ingroup boutique - * \brief Page d'administration/configuration du module OsCommerce - */ - -require '../../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; - -$langs->load("admin"); -$langs->load("oscommerce"); - -if (!$user->admin) accessforbidden(); - - - -/* - * Actions - */ - -if (GETPOST('save','alpha')) -{ - $db->begin(); - - $i=0; - - $i+=dolibarr_set_const($db,'OSC_DB_HOST',trim(GETPOST('oscommerce_dbhost','alpha')),'chaine',0,'',$conf->entity); - $i+=dolibarr_set_const($db,'OSC_DB_NAME',trim(GETPOST('oscommerce_dbname','alpha')),'chaine',0,'',$conf->entity); - $i+=dolibarr_set_const($db,'OSC_DB_USER',trim(GETPOST('oscommerce_dbuser','alpha')),'chaine',0,'',$conf->entity); - $i+=dolibarr_set_const($db,'OSC_DB_PASS',trim(GETPOST('oscommerce_dbpass','alpha')),'chaine',0,'',$conf->entity); - $i+=dolibarr_set_const($db,'OSC_DB_TABLE_PREFIX',trim(GETPOST('oscommerce_db_table_prefix','alpha')),'chaine',0,'',$conf->entity); - $i+=dolibarr_set_const($db,'OSC_LANGUAGE_ID',1,'chaine',0,'',$conf->entity); - - if ($i >= 4) - { - $db->commit(); - setEventMessage($langs->trans("OSCommerceSetupSaved")); - } - else - { - $db->rollback(); - header("Location: ".$_SERVER["PHP_SELF"]); - exit; - } -} -elseif (GETPOST('test','alpha')) -{ - //$resql=$db->query("select count(*) from ".MAIN_DB_PREFIX."const"); - //print "< ".$db." - ".$db->db." - ".$resql." - ".$db->error().">
\n"; - - // Test de la connexion a la database webcalendar - $conf->oscommerce->db->type=$dolibarr_main_db_type; - $conf->oscommerce->db->host=GETPOST('oscommerce_dbhost','alpha'); - $conf->oscommerce->db->port=GETPOST('oscommerce_dbport','alpha'); - $conf->oscommerce->db->name=GETPOST('oscommerce_dbname','alpha'); - $conf->oscommerce->db->user=GETPOST('oscommerce_dbuser','alpha'); - $conf->oscommerce->db->pass=GETPOST('oscommerce_dbpass','alpha'); - - $oscommercedb=getDoliDBInstance($conf->oscommerce->db->type,$conf->oscommerce->db->host,$conf->oscommerce->db->user,$conf->oscommerce->db->pass,$conf->oscommerce->db->name,$conf->oscommerce->db->port); - - if ($oscommercedb->connected == 1 && $oscommercedb->database_selected == 1) - { - // Verifie si bonne base par requete sur une table OSCommerce - $sql ="SELECT configuration_value"; - $sql.=" FROM ".$_POST["oscommerce_db_table_prefix"]."configuration"; - $sql.=" WHERE configuration_key='STORE_NAME'"; - $resql=$oscommercedb->query($sql); - if ($resql) { - $mesg = $langs->trans("OSCommerceTestOk",GETPOST('oscommerce_dbhost','alpha'),GETPOST('oscommerce_dbname','alpha'),GETPOST('oscommerce_dbuser','alpha')); - setEventMessage($mesg); - } - else { - $mesg = $langs->trans("OSCommerceErrorConnectOkButWrongDatabase",'STORE_NAME',GETPOST('oscommerce_db_table_prefix','alpha')."configuration"); - setEventMessage($mesg, 'errors'); - } - - //$oscommercedb->close(); Ne pas fermer car la conn de webcal est la meme que dolibarr si parametre host/user/pass identique - } - elseif ($oscommercedb->connected == 1 && $oscommercedb->database_selected != 1) - { - $mesg = $langs->trans("OSCommerceTestKo1",GETPOST('oscommerce_dbhost','alpha'),GETPOST('oscommerce_dbname','alpha')); - $mesg.="
".$oscommercedb->error(); - - setEventMessage($mesg, 'errors'); - //$oscommercedb->close(); Ne pas fermer car la conn de webcal est la meme que dolibarr si parametre host/user/pass identique - } - else - { - $mesg = $langs->trans("OSCommerceTestKo2",GETPOST('oscommerce_dbhost','alpha'),GETPOST('oscommerce_dbuser','alpha')); - $mesg.="
".$oscommercedb->error(); - setEventMessage($mesg, 'errors'); - } - - //$resql=$db->query("select count(*) from ".MAIN_DB_PREFIX."const"); - //print "< ".$db." - ".$db->db." - ".$resql." - ".$db->error().">
\n"; -} - - - -/* - * Affichage page - */ - -llxHeader(); - -$linkback=''.$langs->trans("BackToModuleList").''; -print_fiche_titre($langs->trans("OSCommerceSetup"),$linkback,'setup'); - - - -print '
'; - -$var=true; -print '

'; -print ''; -print ""; -print ""; -print ""; -print ""; -print ""; -print ""; -$var=!$var; -print ""; -print ""; -print ""; -print ""; -print ""; -$var=!$var; -print ""; -print ""; -print ""; -print ""; -print ""; -$var=!$var; -print ""; -print ""; -print ""; -print ""; -print ""; -$var=!$var; -print ""; -print ""; -print ""; -print ""; -print ""; -$var=!$var; -print ""; -print ""; -print ""; -print ''; -print ""; -$var=!$var; -print ""; -print ""; -print ""; -print ''; -print ""; -print "
".$langs->trans("Parameter")."".$langs->trans("Value")."".$langs->trans("Examples")."
".$langs->trans("OSCommerceServer")."global->OSC_DB_HOST) . "\" size=\"30\">localhost"; -//print "
__dolibarr_main_db_host__ (".$dolibarr_main_db_host.")" -print "
".$langs->trans("OSCommerceDatabaseName")."global->OSC_DB_NAME) . "\" size=\"30\">oscommerce"; -//print "
__dolibarr_main_db_name__ (".$dolibarr_main_db_name.")"; -print "
".$langs->trans("OSCommercePrefix")."global->DB_TABLE_PREFIX) . "\" size=\"30\">osc_"; -print "
".$langs->trans("OSCommerceUser")."global->OSC_DB_USER) . "\" size=\"30\">oscommerceuser"; -//print "
__dolibarr_main_db_user__ (".$dolibarr_main_db_user.")"; -print "
".$langs->trans("Password")."global->OSC_DB_PASS) . "\" size=\"30\">'; -//if ($dolibarr_main_db_pass) print '__dolibarr_main_db_pass__ ('.preg_replace('/./i','*',$dolibarr_main_db_pass).')'; -print ' 
".$langs->trans("PasswordRetype")."global->OSC_DB_PASS) ."\" size=\"30\">'; -//if ($dolibarr_main_db_pass) print '__dolibarr_main_db_pass__ ('.preg_replace('/./i','*',$dolibarr_main_db_pass).')'; -print ' 
"; - - -print '
'; -print "trans("TestConnection")."\">"; -print "   "; -print "trans("Save")."\">"; -print "
"; - -print "
\n"; - -$db->close(); - -llxFooter(); diff --git a/htdocs/boutique/admin/index.html b/htdocs/boutique/admin/index.html deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/htdocs/boutique/client/card.php b/htdocs/boutique/client/card.php deleted file mode 100644 index 4944911f408..00000000000 --- a/htdocs/boutique/client/card.php +++ /dev/null @@ -1,126 +0,0 @@ - - * Copyright (C) 2003-2005 Eric Seigne - * Copyright (C) 2006-2010 Laurent Destailleur - * - * 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 - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * - */ - -/** - * \file htdocs/boutique/client/card.php - * \ingroup boutique - * \brief Page fiche client OSCommerce - */ - -require '../../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/boutique/osc_master.inc.php'; -include_once DOL_DOCUMENT_ROOT.'/boutique/client/class/boutiqueclient.class.php'; - -$id=GETPOST('id', 'int'); - - -/* - * Actions - */ - -// None - - - -/* - * View - */ - -llxHeader(); - -if ($id > 0) -{ - $client = new BoutiqueClient($dbosc); - $result = $client->fetch($id); - if ( $result ) - { - print '
'.$langs->trans("CustomerCard").': '.$client->name.'

'; - - print ''; - print ""; - print ''; - print "
Nom'.$client->name.'
"; - - - /* - * Commandes - */ - $sql = "SELECT o.orders_id, o.customers_id, date_purchased, t.value as total"; - $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 .= " AND o.orders_id = t.orders_id AND t.class = 'ot_total'"; - //echo $sql; - $resql=$dbosc->query($sql); - if ($resql) - { - $num = $dbosc->num_rows($resql); - $i = 0; - print ''; - print ""; - print "\n"; - $var=True; - while ($i < $num) - { - $objp = $dbosc->fetch_object($resql); - $var=!$var; - print ""; - - print '\n"; - print "\n"; - $i++; - } - print "
Commandes
Fiche '; - - print dol_print_date($dbosc->jdate($objp->date_purchased),'dayhour')."\n"; - print $objp->total . "
"; - $dbosc->free($resql); - } - else - { - print "

ERROR 1

\n"; - dol_print_error($dbosc); - } - - } - else - { - print "

ERROR 1

\n"; - dol_print_error($dbosc); - } -} -else -{ - print "

ERROR 1

\n"; - print "Error"; -} - - -/* ************************************************************************** */ -/* */ -/* Barre d'action */ -/* */ -/* ************************************************************************** */ - -// Pas d'action - - -$dbosc->close(); - -llxFooter(); diff --git a/htdocs/boutique/client/class/boutiqueclient.class.php b/htdocs/boutique/client/class/boutiqueclient.class.php deleted file mode 100644 index fdf393043b0..00000000000 --- a/htdocs/boutique/client/class/boutiqueclient.class.php +++ /dev/null @@ -1,77 +0,0 @@ - - * - * 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 - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * - */ - -/** - * \file htdocs/boutique/client/class/boutiqueclient.class.php - * \brief Classe permettant de gerer des clients de la boutique online - * \author Rodolphe Quiedeville - */ - -/** - * \class BoutiqueClient - * \brief Classe permettant de gerer des clients de la boutique online - */ -class BoutiqueClient -{ - var $db ; - - var $id ; - var $nom; - - - /** - * Constructor - * - * @param DoliDB $db Database handler - */ - function __construct($db) - { - $this->db = $db; - } - - /** - * Fonction permettant de recuperer les informations d'un clients de la boutique - * - * @param int $id Id du client - * @return int <0 if KO, >0 if OK - */ - function fetch($id) - { - global $conf; - - $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; - - $resql = $this->db->query($sql); - if ( $resql ) - { - $result = $this->db->fetch_array($resql); - - $this->id = $result["customers_id"]; - $this->name = $result["customers_firstname"] . " " . $result["customers_lastname"]; - - $this->db->free($resql); - return 1; - } - else - { - print $this->db->error(); - return -1; - } - } - -} diff --git a/htdocs/boutique/client/class/index.html b/htdocs/boutique/client/class/index.html deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/htdocs/boutique/client/index.php b/htdocs/boutique/client/index.php deleted file mode 100644 index dae59eb50cb..00000000000 --- a/htdocs/boutique/client/index.php +++ /dev/null @@ -1,91 +0,0 @@ - - * Copyright (C) 2004-2006 Laurent Destailleur - * - * 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 - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * - */ - -/** - * \file htdocs/boutique/client/index.php - * \ingroup boutique - * \brief Page gestion client OSCommerce - */ - -require '../../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/boutique/osc_master.inc.php'; - -$langs->load("companies"); - - -/* - * View - */ - -llxHeader(); - -if ($sortfield == "") { - $sortfield="lower(c.customers_lastname)"; -} -if ($sortorder == "") { - $sortorder="ASC"; -} - - -if ($page == -1) { $page = 0 ; } -$limit = $conf->liste_limit; -$offset = $limit * $page ; - -print_barre_liste("Liste des clients", $page, $_SERVER["PHP_SELF"]); - -$sql = "SELECT c.customers_id, c.customers_lastname, c.customers_firstname, c.customers_email_address, c.customers_newsletter"; -$sql .= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."customers as c"; -$sql .= " ORDER BY $sortfield $sortorder "; -$sql .= $dbosc->plimit($limit,$offset); - -$resql=$dbosc->query($sql); -if ($resql) -{ - $num = $dbosc->num_rows($resql); - $i = 0; - print ""; - print ""; - print_liste_field_titre($langs->trans("Firstname"),$_SERVER["PHP_SELF"], "c.customers_firstname"); - print_liste_field_titre($langs->trans("Lastname"),$_SERVER["PHP_SELF"], "c.customers_lastname"); - print ''; - print "\n"; - $var=True; - while ($i < $num) - { - $objp = $dbosc->fetch_object($resql); - $var=!$var; - print ""; - print '\n"; - print '\n"; - print "\n"; - print "\n"; - print "\n"; - $i++; - } - print "
'.$langs->trans("EMail").''.$langs->trans("Newsletter").'
'.$objp->customers_firstname."'.$objp->customers_lastname."$objp->customers_email_address$objp->customers_newsletter
"; - $dbosc->free(); -} -else -{ - dol_print_error($dbosc); -} - -$dbosc->close(); - -llxFooter(); diff --git a/htdocs/boutique/commande/ca.php b/htdocs/boutique/commande/ca.php deleted file mode 100644 index 5030e5ac559..00000000000 --- a/htdocs/boutique/commande/ca.php +++ /dev/null @@ -1,115 +0,0 @@ - - * Copyright (C) 2004-2006 Laurent Destailleur - * - * 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 - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * - */ - -/** - * \file htdocs/boutique/commande/ca.php - * \ingroup boutique - * \brief Page ca commandes du module OsCommerce - */ - -require '../../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/boutique/osc_master.inc.php'; - - -/* - * View - */ - -llxHeader(); - -if ($sortfield == "") -{ - $sortfield="date_purchased"; -} -if ($sortorder == "") -{ - $sortorder="DESC"; -} - -if ($page == -1) { $page = 0 ; } -$limit = $conf->liste_limit; -$offset = $limit * $page ; - -print_barre_liste("Liste des commandes", $page, "ca.php"); - -print ''; -print ''; -print ''; - -$sql = "SELECT sum(t.value) as value"; -$sql .= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders_total as t"; -$sql .= " WHERE t.class = 'ot_subtotal'"; - -$resql=$dbosc->query($sql); -if ($resql) -{ - $num = $dbosc->num_rows($resql); - - $var=True; - if ($num > 0) - { - $objp = $dbosc->fetch_object($resql); - $var=!$var; - print ""; - print ''; - print ''; - - print "\n"; - $i++; - } - - $dbosc->free(); -} -else -{ - dol_print_error($dbosc); -} - -$sql = "SELECT sum(t.value) as value"; -$sql .= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders_total as t"; -$sql .= " WHERE t.class = 'ot_shipping'"; -$resql=$dbosc->query($sql); -if ($resql) -{ - $num = $dbosc->num_rows($resql); - - $var=True; - if ($num > 0) - { - $objp = $dbosc->fetch_object($resql); - $var=!$var; - print ""; - print ''; - print ''; - $i++; - } - - $dbosc->free(); -} -else -{ - dol_print_error($dbosc); -} - - -print "
'.$langs->trans("Description").''.$langs->trans("Lastname").'
Somme des commandes'.price($objp->value).'
Somme des frais de port'.price($objp->value).'
"; - -$dbosc->close(); - -llxFooter(); diff --git a/htdocs/boutique/commande/card.php b/htdocs/boutique/commande/card.php deleted file mode 100644 index f6719bb40bb..00000000000 --- a/htdocs/boutique/commande/card.php +++ /dev/null @@ -1,155 +0,0 @@ - - * Copyright (C) 2003-2005 Eric Seigne - * Copyright (C) 2004-2006 Laurent Destailleur - * - * 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 - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * - */ - -/** - * \file htdocs/boutique/commande/card.php - * \ingroup boutique - * \brief Page fiche commande OSCommerce - */ - -require '../../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/boutique/osc_master.inc.php'; -include_once DOL_DOCUMENT_ROOT.'/boutique/commande/class/boutiquecommande.class.php'; - -$langs->load("products"); - -$id=GETPOST('id', 'int'); - -/* - * View - */ - -llxHeader(); - - -if ($id > 0) -{ - $commande = new BoutiqueCommande($db); - $result = $commande->fetch($id); - if ($result) - { - print '
'.$langs->trans("OrderCard").': '.$commande->id.'

'; - - print ''; - print ''; - print ''; - - print ''; - - print ""; - - print ""; - print ""; - print ""; - - print "
Date'.$commande->date.'
Client'.$commande->client_name.'
Paiement'.$commande->payment_method.'
".$langs->trans("Address")."".$langs->trans("Delivery")."".$langs->trans("Invoice")."
 ".$commande->delivery_adr->name."
".$commande->delivery_adr->street."
".$commande->delivery_adr->zip."
".$commande->delivery_adr->city."
".$commande->delivery_adr->country."		".$commande->billing_adr->name."
".$commande->billing_adr->street."
".$commande->billing_adr->zip."
".$commande->billing_adr->city."
".$commande->billing_adr->country."
"; - - print "
"; - - /* - * Produits - * - */ - $sql = "SELECT orders_id, products_id, products_model, products_name, products_price, final_price, products_quantity"; - $sql .= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders_products"; - $sql .= " WHERE orders_id = " . $commande->id; - //$commande->id; - // echo $sql; - $resql=$dbosc->query($sql); - if ($resql) - { - $num = $dbosc->num_rows($resql); - $i = 0; - print ''; - print ''; - print ''; - print "\n"; - $var=True; - while ($i < $num) - { - $objp = $dbosc->fetch_object($resql); - $var=!$var; - print ""; - print '"; - - print '\n"; - print "\n"; - print "\n"; - - print "\n"; - $i++; - } - print "
'.$langs->trans("Products").''.$langs->trans("Number").''.$langs->trans("Price").'Prix final
'; - print 'Fiche livre'; - - print ''.$objp->products_name.''; - print "$objp->products_quantityrowid\">".price($objp->products_price)."rowid\">".price($objp->final_price)."
"; - $dbosc->free(); - } - else - { - print $dbosc->error(); - } - - /* - * - * - */ - print "
"; - - print ''; - print ""; - print ''; - print ''; - print "
Frais d\'expeditions'.price($commande->total_ot_shipping).' EUR
'.$langs->trans("Lastname").''.price($commande->total_ot_total).' EUR
"; - - - - } - else - { - print "Fetch failed"; - } -} -else -{ - print "Error"; -} - - -/* ************************************************************************** */ -/* */ -/* Barre d'action */ -/* */ -/* ************************************************************************** */ - -print '
'; -print ''; -print ''; -print ''; -print ''; -print ''; -print '
-----

'; - - - -$dbosc->close(); - -llxFooter(); diff --git a/htdocs/boutique/commande/class/boutiquecommande.class.php b/htdocs/boutique/commande/class/boutiquecommande.class.php deleted file mode 100644 index 0a3383a33a3..00000000000 --- a/htdocs/boutique/commande/class/boutiquecommande.class.php +++ /dev/null @@ -1,138 +0,0 @@ - - * Copyright (C) 2008 Laurent Destailleur - * - * 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 - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -/** - * \file htdocs/boutique/commande/class/boutiquecommande.class.php - * \ingroup osc - * \brief Fichier de la classe des commandes de la boutique online - */ - -require_once DOL_DOCUMENT_ROOT .'/societe/class/address.class.php'; -include_once DOL_DOCUMENT_ROOT.'/boutique/commande/class/boutiquecommande.class.php'; - - -/** - * Class to manage orders OSC - */ -class BoutiqueCommande -{ - var $db; - - var $id; - var $nom; - - - /** - * Constructor - * - * @param DoliDB $db Database handler - */ - function __construct($db) - { - $this->db = $db; - - $this->billing_adr = new Address(); - $this->delivry_adr = new Address(); - - $this->total_ot_subtotal = 0; - $this->total_ot_shipping = 0; - } - - /** - * Get object and lines from database - * - * @param int $id id of object to load - * @param string $ref Ref of order - * @return int >0 if OK, <0 if KO - */ - 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_zipcode, delivery_state, delivery_country, delivery_address_format_id, billing_name, billing_company, billing_street_address, billing_suburb, billing_city, billing_zipcode, billing_state, billing_country, billing_address_format_id, payment_method, cc_type, cc_owner, cc_number, cc_expires, last_modified, date_purchased, orders_status, orders_date_finished, currency, currency_value"; - $sql.= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders"; - $sql.= " WHERE orders_id = ".$id; - - $result = $this->db->query($sql); - if ( $result ) - { - $array = $this->db->fetch_array($result); - - $this->id = $array["orders_id"]; - $this->client_id = $array["customers_id"]; - $this->client_name = $array["customers_name"]; - - $this->payment_method = $array["payment_method"]; - - $this->date = $this->db->jdate($array["date_purchased"]); - - $this->delivery_adr->name = $array["delivery_name"]; - $this->delivery_adr->street = $array["delivery_street_address"]; - $this->delivery_adr->zip = $array["delivery_zipcode"]; - $this->delivery_adr->city = $array["delivery_city"]; - $this->delivery_adr->country = $array["delivery_country"]; - - $this->billing_adr->name = $array["billing_name"]; - $this->billing_adr->street = $array["billing_street_address"]; - $this->billing_adr->zip = $array["billing_zipcode"]; - $this->billing_adr->city = $array["billing_city"]; - $this->billing_adr->country = $array["billing_country"]; - - $this->db->free(); - - /* - * Totaux - */ - $sql = "SELECT value, class "; - $sql .= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders_total WHERE orders_id = $id"; - - $result = $this->db->query($sql); - if ( $result ) - { - $num = $this->db->num_rows($result); - - $i=0; - while ($i < $num) - { - $array = $this->db->fetch_array($result); - if ($array["class"] == 'ot_total') - { - $this->total_ot_total = $array["value"]; - } - if ($array["class"] == 'ot_shipping') - { - $this->total_ot_shipping = $array["value"]; - } - $i++; - } - } - else - { - print $this->db->error(); - } - - } - else - { - print $this->db->error(); - } - - return $result; - } - -} diff --git a/htdocs/boutique/commande/class/index.html b/htdocs/boutique/commande/class/index.html deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/htdocs/boutique/commande/index.php b/htdocs/boutique/commande/index.php deleted file mode 100644 index 0ce6b7b3655..00000000000 --- a/htdocs/boutique/commande/index.php +++ /dev/null @@ -1,92 +0,0 @@ - - * Copyright (C) 2006 Laurent Destailleur - * - * 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 - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * - */ - -/** - * \file htdocs/boutique/commande/index.php - * \ingroup boutique - * \brief Page gestion commandes OSCommerce - */ - -require '../../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/boutique/osc_master.inc.php'; - - - -llxHeader(); - -if ($sortfield == "") -{ - $sortfield="date_purchased"; -} -if ($sortorder == "") -{ - $sortorder="DESC"; -} - -if ($page == -1) { $page = 0 ; } -$limit = $conf->liste_limit; -$offset = $limit * $page ; - -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, date_purchased, orders_status, orders_date_finished, currency, currency_value, t.value"; - -$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 .= " ORDER BY $sortfield $sortorder "; -$sql .= $dbosc->plimit($limit,$offset); - -$resql=$dbosc->query($sql); -if ($resql) -{ - $num = $dbosc->num_rows($resql); - $i = 0; - print ""; - print ""; - print ""; - print ""; - print_liste_field_titre("Client","commande.php", "customers_name"); - print ''; - print "\n"; - $var=True; - while ($i < $num) - { - $objp = $dbosc->fetch_object($resql); - $var=!$var; - print ""; - - print ''; - print '\n"; - print ''; - print "\n"; - $i++; - } - print "
".$langs->trans("Ref")."".$langs->trans("Date")."'.$langs->trans("Total").'
Fiche '; - print $objp->orders_id .""; - print dol_print_date($dbosc->jdate($objp->date_purchased),'dayhour').''.$objp->customers_name."'.price($objp->value).'
"; - $dbosc->free(); -} -else -{ - dol_print_error($dbosc); -} - -$dbosc->close(); - -llxFooter(); diff --git a/htdocs/boutique/critiques/bestproduct.php b/htdocs/boutique/critiques/bestproduct.php deleted file mode 100644 index dd3cda24d96..00000000000 --- a/htdocs/boutique/critiques/bestproduct.php +++ /dev/null @@ -1,97 +0,0 @@ - - * Copyright (C) 2003 Eric Seigne - * Copyright (C) 2006 Laurent Destailleur - * - * 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 - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * - */ - -/** - * \file htdocs/boutique/critiques/bestproduct.php - * \ingroup boutique - * \brief Page affichage meilleures critiques OS Commerce - */ - -require '../../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/boutique/osc_master.inc.php'; - - -/* - * View - */ - -llxHeader(); - -if ($sortfield == "") { - $sortfield="rat"; -} -if ($sortorder == "") { - $sortorder="DESC"; -} - - -if ($page == -1) { $page = 0 ; } -$limit = $conf->liste_limit; -$offset = $limit * $page ; - - -print_barre_liste("Liste des produits classes par 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 .= " 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 .= " GROUP BY r.products_id, p.products_model, p.products_quantity, p.products_status"; -$sql .= " ORDER BY $sortfield $sortorder "; -$sql .= $dbosc->plimit($limit,$offset); - -print "

"; -print "'; -print ''; -print "\n"; - - -$resql=$dbosc->query($sql); -if ($resql) -{ - $num = $dbosc->num_rows($resql); - $i = 0; - - $var=True; - while ($i < $num) { - $objp = $dbosc->fetch_object($resql); - $var=!$var; - print ""; - print ''; - print '\n"; - print '\n"; - print '\n"; - print "\n"; - $i++; - } - $dbosc->free(); -} -else -{ - dol_print_error($dbosc); -} - -print "
".$langs->trans("Ref"); -print 'Indice critiquesQuantite'; -print 'Status
'.$objp->products_model.''.$objp->rat."'.$objp->products_quantity."'.$objp->products_status."
"; - - -$dbosc->close(); - -llxFooter(); diff --git a/htdocs/boutique/critiques/card.php b/htdocs/boutique/critiques/card.php deleted file mode 100644 index 1c75faebbee..00000000000 --- a/htdocs/boutique/critiques/card.php +++ /dev/null @@ -1,82 +0,0 @@ - - * Copyright (C) 2006 Laurent Destailleur - * - * 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 - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * - */ - -/** - * \file htdocs/boutique/critiques/card.php - * \ingroup boutique - * \brief Page fiche critique OS Commerce - */ - -require '../../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/boutique/osc_master.inc.php'; - -$id=$_GET["id"]; - - - -llxHeader(); - -if ($id) -{ - - $critique = new Critique($dbosc); - $result = $critique->fetch($id); - - if ( $result ) - { - - print '

Fiche Critique

'; - - print ''; - print ""; - print ''; - - print ''; - print "
Produit'.$critique->product_name.'
Texte'.nl2br($critique->text).'
"; - - - - } - else - { - print "Fetch failed"; - } - -} - -/* ************************************************************************** */ -/* */ -/* Barre d'action */ -/* */ -/* ************************************************************************** */ - -print '
'; -print ''; -print ''; -print ''; -print ''; -print ''; -print '
-----

'; - - - -$dbosc->close(); - -llxFooter(); - diff --git a/htdocs/boutique/critiques/class/critique.class.php b/htdocs/boutique/critiques/class/critique.class.php deleted file mode 100644 index cd3a72088ad..00000000000 --- a/htdocs/boutique/critiques/class/critique.class.php +++ /dev/null @@ -1,84 +0,0 @@ - - * - * 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 - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -/** - * \file htdocs/boutique/critiques/class/critique.class.php - * \ingroup osc - * \brief Fichier de la classe des critiques OSCommerce - */ - - -/** - * Classe permettant la gestion des critiques OSCommerce - */ -class Critique -{ - var $db; - - var $id; - var $nom; - - /** - * Constructor - * - * @param DoliDB $db Database handler - */ - function __construct($db) - { - $this->db = $db; - } - - /** - * Load instance - * - * @param int $id Id to load - * @return int <0 if KO, >0 if OK - */ - function fetch ($id) - { - global $conf; - - $sql = "SELECT r.reviews_id, r.reviews_rating, d.reviews_text, p.products_name"; - - $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 .= " ,".$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 .= " AND p.language_id = ".$conf->global->OSC_LANGUAGE_ID. " AND d.languages_id=".$conf->global->OSC_LANGUAGE_ID; - $sql .= " AND r.reviews_id=$id"; - - $result = $this->db->query($sql); - - if ( $result ) - { - $result = $this->db->fetch_array($result); - - $this->id = $result["reviews_id"]; - $this->product_name = stripslashes($result["products_name"]); - $this->text = stripslashes($result["reviews_text"]); - - $this->db->free($result); - } - else - { - print $this->db->lasterror(); - } - - return $result; - } - -} diff --git a/htdocs/boutique/critiques/class/index.html b/htdocs/boutique/critiques/class/index.html deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/htdocs/boutique/critiques/index.php b/htdocs/boutique/critiques/index.php deleted file mode 100644 index 35e536ed66e..00000000000 --- a/htdocs/boutique/critiques/index.php +++ /dev/null @@ -1,92 +0,0 @@ - - * Copyright (C) 2006 Laurent Destailleur - * - * 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 - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * - */ - -/** - * \file htdocs/boutique/critiques/index.php - * \ingroup boutique - * \brief Page gestion critiques OSCommerce - */ - -require '../../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/boutique/osc_master.inc.php'; - - -/* - * View - */ - -llxHeader(); - -if ($sortfield == "") { - $sortfield="date_added"; -} -if ($sortorder == "") { - $sortorder="DESC"; -} - - -if ($page == -1) { $page = 0 ; } -$limit = $conf->liste_limit; -$offset = $limit * $page ; - -print_barre_liste("Critiques", $page, "index.php"); - -$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 .= " AND p.language_id = ".$conf->global->OSC_LANGUAGE_ID. " AND d.languages_id=".$conf->global->OSC_LANGUAGE_ID; -$sql .= " ORDER BY $sortfield $sortorder "; -$sql .= $dbosc->plimit($limit,$offset); - -print "

"; -print ''; -print ""; -print ""; -print ""; -print ""; -print "\n"; - -$resql=$dbosc->query($sql); -if ($resql) { - $num = $dbosc->num_rows($resql); - $i = 0; - - $var=True; - while ($i < $num) { - $objp = $dbosc->fetch_object($resql); - $var=!$var; - print ""; - print "\n"; - print '\n"; - print "\n"; - print "\n"; - $i++; - } - $dbosc->free(); -} -else -{ - dol_print_error($dbosc); -} - -print "
ProduitCritiqueNote
".substr($objp->products_name, 0, 30)."'.substr($objp->reviews_text, 0, 40)." ...$objp->reviews_rating
"; - - -$dbosc->close(); - -llxFooter(); diff --git a/htdocs/boutique/index.php b/htdocs/boutique/index.php deleted file mode 100644 index 28cd6ec397a..00000000000 --- a/htdocs/boutique/index.php +++ /dev/null @@ -1,245 +0,0 @@ - - * Copyright (C) 2004-2007 Laurent Destailleur - * - * 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 - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -/** - * \file htdocs/boutique/index.php - * \ingroup boutique - * \brief Main page of shop zone - */ - -require '../main.inc.php'; - -$langs->load("shop"); -$langs->load("orders"); - -require_once DOL_DOCUMENT_ROOT.'/boutique/osc_master.inc.php'; - -llxHeader("",$langs->trans("OSCommerceShop"),""); - -print_fiche_titre($langs->trans("OSCommerceShop")); - -print ''; - -print ''; -/* - * Last customers who ordered - */ -$sql = "SELECT o.orders_id, o.customers_name, o.delivery_country, o.date_purchased, t.value, s.orders_status_name as statut"; -$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 ".$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"; - -$resql=$dbosc->query($sql); -if ($resql) -{ - $langs->load("orders"); - $num = $dbosc->num_rows($resql); - if ($num > 0) - { - $i = 0; - print '
'; - - -/* - * Turnover - */ - -print_titre($langs->trans('SalesTurnover')); - -print ''; -print ''; -print ''; - -$now=dol_now(); - -$sql = "SELECT SUM(t.value) as value, MONTH(o.date_purchased) as month"; -$sql.= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders_total as t"; -$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($now).")"; -$sql.= " WHERE t.class = 'ot_subtotal' AND YEAR(o.date_purchased) = YEAR('".$db->idate($now)."')"; -$sql.= " GROUP BY month"; -$sql.= " ORDER BY month"; -//print $sql;exit; - -$result=$dbosc->query($sql); -if ($result) -{ - $num = $dbosc->num_rows($result); - - $var=True; - $i=0; - if ($num > 0) - { - while ($i < $num) - { - $objp = $dbosc->fetch_object($result); - $var=!$var; - print ""; - print ''; - print ''; - - print "\n"; - $i++; - } - } - - $dbosc->free(); -} -else -{ - dol_print_error($dbosc); -} - - -print "
'.$langs->trans("Month").''.$langs->trans("Total").'
'.$objp->mois.''.price($objp->value).'
"; -print '		'; -print_titre($langs->trans("Orders")); - -/* - * Last 5 successful commands - select o.orders_id, o.customers_id, o.customers_name, o.date_purchased, o.payement_method, o.status, t.value - 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 - */ -$sql = "SELECT o.orders_id, o.customers_name, o.date_purchased, t.value, o.payment_method"; -$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"; - -$resql=$dbosc->query($sql); -if ($resql) -{ - $langs->load("orders"); - $num = $dbosc->num_rows($resql); - if ($num > 0) - { - $i = 0; - print ''; - print ''; - print ''; - - $num = min($num,OSC_MAXNBCOM); - while ($i < $num) - { - - $obj = $dbosc->fetch_object($resql); - print ""; - $i++; - } - print "
'.$langs->trans("LastOrders").'
".$obj->orders_id."".$obj->customers_name."".price($obj->value)."".$obj->payment_method."

"; - } -} -else -{ - dol_print_error($dbosc); -} - -/* - * Last 5 orders on hold - */ -$sql = "SELECT o.orders_id, o.customers_name, o.date_purchased, t.value, o.payment_method"; -$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"; - -$resql=$dbosc->query($sql); -if ($resql) -{ - $langs->load("orders"); - $num = $dbosc->num_rows($resql); - if ($num > 0) - { - $i = 0; - print ''; - print ''; - print ''; - - $num = min($num,OSC_MAXNBCOM); - while ($i < $num) - { - - $obj = $dbosc->fetch_object($resql); - print ""; - $i++; - } - print "
'.$langs->trans("En Attente").'
$obj->orders_id$obj->customers_name".price($obj->value)."$obj->payment_method

"; - } -} -else -{ - dol_print_error($dbosc); -} - -/* - * Commands to treat - */ -$sql = "SELECT o.orders_id, o.customers_name, o.date_purchased, t.value, o.payment_method"; -$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"; - -$resql=$dbosc->query($sql); -if ($resql) -{ - $langs->load("orders"); - $num = $dbosc->num_rows($resql); - if ($num > 0) - { - $i = 0; - print ''; - print ''; - print ''; - - $num = min($num,OSC_MAXNBCOM); - while ($i < $num) - { - - $obj = $dbosc->fetch_object($resql); - print ""; - $i++; - } - print "
'.$langs->trans("TreatmentInProgress").'
$obj->orders_id$obj->customers_name".price($obj->value)."$obj->payment_method

"; - } -} -else -{ - dol_print_error($dbosc); -} - - -print '
'; - print ''; - print ''; - - $num = min($num,OSC_MAXNBCOM); - while ($i < $num) - { - $obj = $dbosc->fetch_object($resql); - print ""; - $i++; - } - print "
'.$langs->trans("Derniers clients").'
$obj->date_purchased$obj->customers_name$obj->delivery_country".price($obj->value)."$obj->payment_method$obj->orders_id$obj->statut

"; - } -} -else -{ - dol_print_error($dbosc); -} -print ''; - - -llxFooter(); - -$dbosc->close(); diff --git a/htdocs/boutique/notification/index.php b/htdocs/boutique/notification/index.php deleted file mode 100644 index 6799af10708..00000000000 --- a/htdocs/boutique/notification/index.php +++ /dev/null @@ -1,89 +0,0 @@ - - * Copyright (C) 2003 Eric Seigne - * Copyright (C) 2004-2006 Laurent Destailleur - * - * 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 - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * - */ - -/** - * \file htdocs/boutique/notification/index.php - * \ingroup boutique - * \brief Page gestion notification OS Commerce - */ - -require '../../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/boutique/osc_master.inc.php'; - -$langs->load("products"); - - - -llxHeader(); - -if ($sortfield == "") { - $sortfield="lower(c.customers_lastname)"; -} -if ($sortorder == "") { - $sortorder="ASC"; -} - - -if ($page == -1) { $page = 0 ; } -$limit = $conf->liste_limit; -$offset = $limit * $page ; - -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 .= " 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 .= ",".$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 .= " AND p.language_id = ".$conf->global->OSC_LANGUAGE_ID; -$sql .= " ORDER BY $sortfield $sortorder "; -$sql .= $dbosc->plimit($limit,$offset); - -$resql=$dbosc->query($sql); -if ($resql) -{ - $num = $dbosc->num_rows($resql); - $i = 0; - print ""; - print ""; - print_liste_field_titre("Client",$_SERVER["PHP_SELF"], "c.customers_lastname"); - print ''; - print "\n"; - $var=True; - while ($i < $num) - { - $objp = $dbosc->fetch_object($resql); - $var=!$var; - print ""; - print "\n"; - print '"; - print "\n"; - $i++; - } - print "
'.$langs->trans("Product").'
rowid\">$objp->customers_firstname $objp->customers_lastname'.$objp->products_name."
"; - $dbosc->free($resql); -} -else -{ - dol_print_error($dbosc); -} - -$dbosc->close(); - -llxFooter(); diff --git a/htdocs/boutique/notification/produits.php b/htdocs/boutique/notification/produits.php deleted file mode 100644 index ad04d7d61b0..00000000000 --- a/htdocs/boutique/notification/produits.php +++ /dev/null @@ -1,95 +0,0 @@ - - * Copyright (C) 2003 Eric Seigne - * Copyright (C) 2006 Laurent Destailleur - * - * 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 - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * - */ - -/** - * \file htdocs/boutique/notification/produits.php - * \ingroup boutique - * \brief Page fiche notification produits OS Commerce - */ - -require '../../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/boutique/osc_master.inc.php'; - - -/* - * View - */ - -llxHeader(); - -if ($sortfield == "") { - $sortfield="lower(p.products_name)"; -} -if ($sortorder == "") { - $sortorder="ASC"; -} - - -if ($page == -1) { $page = 0 ; } -$limit = $conf->liste_limit; -$offset = $limit * $page ; - -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 .= " 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 .= " AND p.language_id = ".$conf->global->OSC_LANGUAGE_ID; -$sql .= " GROUP BY p.products_name, p.products_id"; -$sql .= $dbosc->plimit($limit,$offset); - -$resql=$dbosc->query($sql); -if ($resql) -{ - $num = $dbosc->num_rows($resql); - $i = 0; - print "

"; - print ""; - print ''; - print ""; - print ""; - print "\n"; - $var=True; - while ($i < $num) - { - $objp = $dbosc->fetch_object($resql); - $var=!$var; - print ""; - - print '"; - print ''; - - print ''; - print ''; - - print "\n"; - $i++; - } - print "
ProduitNb.
'.$objp->products_name."'.$objp->nb.'Voir les clientsEnvoyer une news
"; - $dbosc->free(); -} -else -{ - dol_print_error($dbosc); -} - -$dbosc->close(); - -llxFooter(); diff --git a/htdocs/boutique/osc_master.inc.php b/htdocs/boutique/osc_master.inc.php deleted file mode 100644 index 057c15f30e1..00000000000 --- a/htdocs/boutique/osc_master.inc.php +++ /dev/null @@ -1,38 +0,0 @@ - - * - * 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 - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -/** - * \file htdocs/boutique/osc_master.inc.php - * \brief File of preparation of the environment Dolibarr for OSCommerce - */ - - -/* - * Creation objet $dbosc - */ -$dbosc=getDoliDBInstance($conf->db->type,$conf->global->OSC_DB_HOST,$conf->global->OSC_DB_USER,$conf->global->OSC_DB_PASS,$conf->global->OSC_DB_NAME,$conf->global->OSC_DB_PORT); - -if (! $dbosc->connected) -{ - dol_syslog($dbosc,"host=".$conf->global->OSC_DB_HOST.", user=".$conf->global->OSC_DB_USER.", databasename=".$conf->global->OSC_DB_NAME.", ".$db->error,LOG_ERR); - - llxHeader("",$langs->trans("OSCommerceShop"),""); - print '

'.$langs->trans('FailedConnectDBCheckModuleSetup').'
'; - llxFooter(); - exit; -} - diff --git a/htdocs/boutique/produits/index.php b/htdocs/boutique/produits/index.php deleted file mode 100644 index 2574b7cb7f4..00000000000 --- a/htdocs/boutique/produits/index.php +++ /dev/null @@ -1,88 +0,0 @@ - - * Copyright (C) 2004-2006 Laurent Destailleur - * - * 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 - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * - */ - -/** - * \file htdocs/boutique/produits/index.php - * \ingroup boutique - * \brief Page gestion produits du module OsCommerce - */ - -require '../../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/boutique/osc_master.inc.php'; - -$langs->load("companies"); - - - -llxHeader(); - -if ($sortfield == "") { - $sortfield="lower(c.customers_lastname)"; -} -if ($sortorder == "") { - $sortorder="ASC"; -} - - -if ($page == -1) { $page = 0 ; } -$limit = $conf->liste_limit; -$offset = $limit * $page ; - -print_barre_liste("Liste des clients", $page, $_SERVER["PHP_SELF"]); - -$sql = "SELECT c.customers_id, c.customers_lastname, c.customers_firstname, c.customers_email_address, c.customers_newsletter"; -$sql .= " FROM ".DB_NAME_OSC.".customers as c"; -$sql .= " ORDER BY $sortfield $sortorder "; -$sql .= $dbosc->plimit($limit,$offset); - -$resql=$dbosc->query($sql); -if ($resql) -{ - $num = $dbosc->num_rows($resql); - $i = 0; - print ""; - print ""; - print_liste_field_titre($langs->trans("Firstname"),$_SERVER["PHP_SELF"], "c.customers_firstname"); - print_liste_field_titre($langs->trans("Lastname"),$_SERVER["PHP_SELF"], "c.customers_lastname"); - print ''; - print "\n"; - $var=True; - while ($i < $num) - { - $objp = $dbosc->fetch_object($resql); - $var=!$var; - print ""; - print '\n"; - print '\n"; - print "\n"; - print "\n"; - print "\n"; - $i++; - } - print "
'.$langs->trans("EMail").''.$langs->trans("Newsletter").'
'.$objp->customers_firstname."'.$objp->customers_lastname."$objp->customers_email_address$objp->customers_newsletter
"; - $dbosc->free($resql); -} -else -{ - dol_print_error($dbosc); -} - -$dbosc->close(); - -llxFooter(); diff --git a/htdocs/boutique/produits/osc-list.php b/htdocs/boutique/produits/osc-list.php deleted file mode 100644 index 4edf156dd05..00000000000 --- a/htdocs/boutique/produits/osc-list.php +++ /dev/null @@ -1,106 +0,0 @@ - - * Copyright (C) 2006 Laurent Destailleur - * - * 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 - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * - */ - -/** - * \file htdocs/boutique/produits/osc-list.php - * \ingroup boutique - * \brief Page gestion produits du module OsCommerce - */ - -require '../../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/boutique/osc_master.inc.php'; - - -/* - * View - */ - -llxHeader(); - -if ($sortfield == "") { - $sortfield="p.label,p.price"; -} -if ($sortorder == "") { - $sortorder="ASC"; -} - - -if ($page == -1) { $page = 0 ; } -$limit = $conf->liste_limit; -$offset = $limit * $page ; - - -print_barre_liste("Liste des produits oscommerce", $page, "osc-list.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 .= " 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 =" . $conf->global->OSC_LANGUAGE_ID; -$sql .= " AND p.manufacturers_id=m.manufacturers_id"; -if ($reqstock=='epuise') -{ - $sql .= " AND p.products_quantity <= 0"; -} - -//$sql .= " ORDER BY $sortfield $sortorder "; -$sql .= $dbosc->plimit($limit,$offset); - -print "

"; -print ''; -print ""; -print ""; -print ""; -print ""; -print ''; -print ''; -print ''."\n"; - -$resql=$dbosc->query($sql); -if ($resql) -{ - $num = $dbosc->num_rows($resql); - $i = 0; - - $var=True; - while ($i < $num) - { - $objp = $dbosc->fetch_object($resql); - $var=!$var; - print ""; - print "\n"; - print "\n"; - print "\n"; - print "\n"; - print '\n"; - print '\n"; - print "\n"; - $i++; - } - $dbosc->free(); -} -else -{ - dol_print_error($dbosc); -} - -print "
idRefTitreGroupeStockStatus
$objp->products_id$objp->products_model$objp->products_name$objp->manufacturers_name'.$objp->products_quantity."'.$objp->products_status."
"; - - -$dbosc->close(); - -llxFooter(); diff --git a/htdocs/boutique/promotion/class/index.html b/htdocs/boutique/promotion/class/index.html deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/htdocs/boutique/promotion/class/promotion.class.php b/htdocs/boutique/promotion/class/promotion.class.php deleted file mode 100644 index 6e965ad76d1..00000000000 --- a/htdocs/boutique/promotion/class/promotion.class.php +++ /dev/null @@ -1,213 +0,0 @@ - - * - * 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 - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * - */ - -/** - * \file htdocs/boutique/promotion/class/promotion.class.php - * \brief File of class to manage discounts on online shop - */ - -/** - * \class Promotion - * \brief Class to manage discounts on online shop - */ -class Promotion -{ - var $db; - - var $id; - var $parent_id; - var $oscid; - var $ref; - var $titre; - var $description; - var $price; - var $status; - - /** - * Constructor - * - * @param DoliDB $db Database handler - */ - function __construct($db) - { - $this->db = $db; - } - - /** - * Create promotion - * - * @param User $user Object user - * @param int $pid Pid - * @param int $percent Percent - * @return int <0 if KO, >0 if OK - */ - function create($user, $pid, $percent) - { - global $conf; - - $sql = "SELECT products_price "; - $sql .= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."products as p"; - $sql .= " WHERE p.products_id = ".$pid; - - $result = $this->db->query($sql); - if ( $result ) - { - $result = $this->db->fetch_array($result); - $this->price_init = $result["products_price"]; - } - - $newprice = $percent * $this->price_init; - - $date_exp = "2003-05-01"; // TODO ???? - - $now=dol_now(); - - $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 .= " VALUES ($pid, $newprice, '".$this->db->idate($now)."', NULL, '".$this->db->idate($now+3600*24*365)."', NULL, 1)"; - - if ($this->db->query($sql) ) - { - $id = $this->db->last_insert_id(OSC_DB_NAME.".specials"); - - return $id; - } - else - { - print $this->db->error() . ' in ' . $sql; - } - } - - /** - * Update - * - * @param int $id id - * @param User $user Object user - * @return int <0 if KO, >0 if OK - */ - function update($id, $user) - { - $sql = "UPDATE ".MAIN_DB_PREFIX."album "; - $sql .= " SET title = '" . trim($this->titre) ."'"; - $sql .= ",description = '" . trim($this->description) ."'"; - - $sql .= " WHERE rowid = " . $id; - - if ( $this->db->query($sql) ) { - return 1; - } else { - print $this->db->error() . ' in ' . $sql; - } - } - - /** - * Set active - * - * @param int $id id - * @return int <0 if KO, >0 if OK - */ - function set_active($id) - { - global $conf; - - $sql = "UPDATE ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."specials"; - $sql .= " SET status = 1"; - - $sql .= " WHERE products_id = " . $id; - - if ( $this->db->query($sql) ) { - return 1; - } else { - print $this->db->error() . ' in ' . $sql; - } - } - - /** - * Set inactive - * - * @param int $id id - * @return int <0 if KO, >0 if OK - */ - function set_inactive($id) - { - global $conf; - - $sql = "UPDATE ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."specials"; - $sql .= " SET status = 0"; - - $sql .= " WHERE products_id = " . $id; - - if ( $this->db->query($sql) ) { - return 1; - } else { - print $this->db->error() . ' in ' . $sql; - } - } - - /** - * Fetch datas - * - * @param int $id id - * @return int <0 if KO, >0 if OK - */ - function fetch($id) - { - global $conf; - - $sql = "SELECT c.categories_id, cd.categories_name, c.parent_id"; - $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 = ".$conf->global->OSC_LANGUAGE_ID; - $sql .= " AND c.categories_id = ".$id; - $result = $this->db->query($sql); - - if ( $result ) { - $result = $this->db->fetch_array($result); - - $this->id = $result["categories_id"]; - $this->parent_id = $result["parent_id"]; - $this->name = $result["categories_name"]; - $this->titre = $result["title"]; - $this->description = $result["description"]; - $this->oscid = $result["osc_id"]; - } - $this->db->free($result); - - return $result; - } - - - /** - * Delete object - * - * @param User $user Object user - * @return int <0 if KO, >0 if OK - */ - function delete($user) - { - global $conf; - - $sql = "DELETE FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."products 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"; - - } - - -} diff --git a/htdocs/boutique/promotion/index.php b/htdocs/boutique/promotion/index.php deleted file mode 100644 index 10dfa09a8c1..00000000000 --- a/htdocs/boutique/promotion/index.php +++ /dev/null @@ -1,119 +0,0 @@ - - * Copyright (C) 2004-2006 Laurent Destailleur - * - * 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 - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -/** - * \file htdocs/boutique/promotion/index.php - * \ingroup boutique - * \brief Page gestion promotions OSCommerce - */ - -require '../../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/boutique/osc_master.inc.php'; - - -llxHeader(); - -if ($action == "inactive") -{ - $promotion = new Promotion($dbosc); - $promotion->set_inactive($id); -} -if ($action == "active") -{ - $promotion = new Promotion($dbosc); - $promotion->set_active($id); -} - -if ($sortfield == "") -{ - $sortfield="pd.products_name"; -} -if ($sortorder == "") -{ - $sortorder="ASC"; -} - -if ($page == -1) { $page = 0 ; } -$limit = $conf->liste_limit; -$offset = $limit * $page ; - -print_barre_liste("Liste des promotions", $page, "index.php", "",$sortfield, $sortorder); - -$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.= " expires_date as fin"; -$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 = ".$conf->global->OSC_LANGUAGE_ID; -$sql.= " ORDER BY $sortfield $sortorder "; -$sql.= $dbosc->plimit($limit,$offset); - -$resql=$dbosc->query($sql); -if ($resql) -{ - $num = $dbosc->num_rows($resql); - $i = 0; - print ''; - print ""; - print_liste_field_titre($langs->trans("Ref"),"index.php", "p.products_model"); - print_liste_field_titre("Titre","index.php", "pd.products_name"); - print ""; - print ''; - print ''; - print "\n"; - $var=True; - while ($i < $num) - { - $objp = $dbosc->fetch_object($i); - $var=!$var; - - print ""; - print '"; - print '"; - - if ($objp->status == 1) - { - print ''; - print ''; - } - else - { - print ''; - print ''; - } - print ""; - print '"; - print '"; - print ""; - $i++; - } - print "
  FinPrix initialPrix remise
'.$objp->products_model."'.$objp->products_name."actif'; - print ''; - print ''; - print ''; - print 'inactif".dol_print_date($dbosc->jdate($objp->fin),'day')."'.price($objp->products_price)."'.price($objp->specials_new_products_price)."
"; - $dbosc->free(); -} -else -{ - dol_print_error($dbosc); -} -$dbosc->close(); - -llxFooter(); - diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php index 63ea8fd6e04..960cddfac27 100644 --- a/htdocs/comm/action/card.php +++ b/htdocs/comm/action/card.php @@ -218,7 +218,7 @@ if ($action == 'add') { if ($i == 0) // First entry { - if ($value['id'] > 0) $usertodo->fetch($value['id']); + if ($value['id'] > 0) $object->userownerid=$value['id']; $object->transparency = (GETPOST("transparency")=='on'?1:0); } diff --git a/htdocs/core/boxes/box_osc_client.php b/htdocs/core/boxes/box_osc_client.php deleted file mode 100644 index 956811ea4e3..00000000000 --- a/htdocs/core/boxes/box_osc_client.php +++ /dev/null @@ -1,112 +0,0 @@ - - * Copyright (C) 2005-2008 Laurent Destailleur - * - * 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 - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -/** - * \file htdocs/core/boxes/box_osc_client.php - * \ingroup osc - * \brief Module to generate box of shop customers - */ - -include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php'; - - -/** - * Class to manage the box to show last customers of shop - */ -class box_osc_clients extends ModeleBoxes -{ - var $boxcode="nbofcustomers"; - var $boximg="object_company"; - var $boxlabel="BoxNbOfCustomers"; - var $depends = array("boutique"); - - var $db; - var $param; - - var $info_box_head = array(); - var $info_box_contents = array(); - - - /** - * Load data into info_box_contents array to show array later. - * - * @param int $max Maximum number of records to load - * @return void - */ - function loadBox($max=5) - { - global $conf, $user, $langs, $db; - $langs->load("boxes"); - - $this->max=$max; - - $this->info_box_head = array('text' => $langs->trans("BoxTitleNbOfCustomers",$max)); - - if ($user->rights->boutique->lire) - { - $sql = "SELECT count(*) as cus FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."customers"; - - $resql = $db->query($sql); - if ($resql) - { - $num = $db->num_rows($resql); - - $i = 0; - - while ($i < $num) - { - $objp = $db->fetch_object($resql); - - $this->info_box_contents[$i][0] = array('td' => 'align="center" width="16"', - 'logo' => $this->boximg, - 'url' => DOL_URL_ROOT."/boutique/client/index.php"); - $this->info_box_contents[$i][1] = array('td' => 'align="center"', - 'text' => $objp->cus, - 'url' => DOL_URL_ROOT."/boutique/client/index.php"); - $i++; - } - - $db->free($resql); - } - else { - $this->info_box_contents[0][0] = array( 'td' => 'align="left"', - 'maxlength'=>500, - 'text' => ($db->error().' sql='.$sql)); - } - } - else { - $this->info_box_contents[0][0] = array('td' => 'align="left"', - 'text' => $langs->trans("ReadPermissionNotAllowed")); - } - - } - - /** - * Method to show box - * - * @param array $head Array with properties of box title - * @param array $contents Array with properties of box lines - * @return void - */ - function showBox($head = null, $contents = null) - { - parent::showBox($this->info_box_head, $this->info_box_contents); - } - -} - diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql index 36a59d33109..d640519594e 100644 --- a/htdocs/core/menus/init_menu_auguria.sql +++ b/htdocs/core/menus/init_menu_auguria.sql @@ -16,7 +16,6 @@ insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, left insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('banque|prelevement', '$conf->banque->enabled || $conf->prelevement->enabled', 14__+MAX_llx_menu__, __HANDLER__, 'top', 'bank', '', 0, '/compta/bank/index.php?mainmenu=bank&leftmenu=bank', 'MenuBankCash', -1, 'banks', '$user->rights->banque->lire || $user->rights->prelevement->bons->lire', '', 0, 60, __ENTITY__); insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('projet', '$conf->projet->enabled', 7__+MAX_llx_menu__, __HANDLER__, 'top', 'project', '', 0, '/projet/index.php?mainmenu=project&leftmenu=', 'Projects', -1, 'projects', '$user->rights->projet->lire', '', 2, 70, __ENTITY__); insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('mailing|export|import|opensurvey', '$conf->mailing->enabled || $conf->export->enabled || $conf->import->enabled || $conf->opensurvey->enabled', 8__+MAX_llx_menu__, __HANDLER__, 'top', 'tools', '', 0, '/core/tools.php?mainmenu=tools&leftmenu=', 'Tools', -1, 'other', '$user->rights->mailing->lire || $user->rights->export->lire || $user->rights->import->run || $user->rights->opensurvey->read', '', 2, 90, __ENTITY__); -insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('boutique', '! empty($conf->boutique->enabled)', 11__+MAX_llx_menu__, __HANDLER__, 'top', 'shop', '', 0, '/boutique/index.php?mainmenu=shop&leftmenu=', 'OSCommerce', -1, 'shop', '', '', 0, 100, __ENTITY__); insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('adherent', '$conf->adherent->enabled', 13__+MAX_llx_menu__, __HANDLER__, 'top', 'members', '', 0, '/adherents/index.php?mainmenu=members&leftmenu=', 'Members', -1, 'members', '$user->rights->adherent->lire', '', 2, 110, __ENTITY__); insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('hrm', '$conf->holiday->enabled || $conf->deplacement->enabled', 15__+MAX_llx_menu__, __HANDLER__, 'top', 'hrm', '', 0, '/compta/hrm.php?mainmenu=hrm&leftmenu=', 'HRM', -1, 'holiday', '$user->rights->holiday->write || $user->rights->deplacement->lire', '', 0, 80, __ENTITY__); diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php index 91f10cae4a3..1d6e12b1357 100644 --- a/htdocs/core/menus/standard/eldy.lib.php +++ b/htdocs/core/menus/standard/eldy.lib.php @@ -236,26 +236,6 @@ function print_eldy_menu($db,$atarget,$type_user,&$tabMenu,&$menu,$noout=0) $menu->add('/core/tools.php?mainmenu=tools&leftmenu=', $langs->trans("Tools"), 0, $showmode, $atarget, "tools", ''); } - // OSCommerce 1 - $tmpentry=array('enabled'=>(! empty($conf->boutique->enabled)), - 'perms'=>1, - 'module'=>'boutique'); - $showmode=dol_eldy_showmenu($type_user, $tmpentry, $listofmodulesforexternal); - if ($showmode) - { - $langs->load("shop"); - - $classname=""; - if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "shop") { $classname='class="tmenusel"'; $_SESSION['idmenu']=''; } - else $classname = 'class="tmenu"'; - $idsel='shop'; - - if (empty($noout)) print_start_menu_entry($idsel,$classname,$showmode); - if (empty($noout)) print_text_menu_entry($langs->trans("OSCommerce"), $showmode, DOL_URL_ROOT.'/boutique/index.php?mainmenu=shop&leftmenu=', $id, $idsel, $classname, $atarget); - if (empty($noout)) print_end_menu_entry($showmode); - $menu->add('/boutique/index.php?mainmenu=shop&leftmenu=', $langs->trans("OSCommerce"), 0, $showmode, $atarget, "shop", ''); - } - // Members $tmpentry=array('enabled'=>(! empty($conf->adherent->enabled)), 'perms'=>(! empty($user->rights->adherent->lire)), diff --git a/htdocs/core/modules/modBoutique.class.php b/htdocs/core/modules/modBoutique.class.php deleted file mode 100644 index 837dd8c6c24..00000000000 --- a/htdocs/core/modules/modBoutique.class.php +++ /dev/null @@ -1,118 +0,0 @@ - - * Copyright (C) 2004-2008 Laurent Destailleur - * Copyright (C) 2004 Sebastien Di Cintio - * Copyright (C) 2004 Benoit Mortier - * - * 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 - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -/** - * \defgroup oscommerce Module oscommerce - * \brief Module pour gerer une boutique et interface avec OSCommerce - * \file htdocs/core/modules/modBoutique.class.php - * \ingroup oscommerce - * \brief Fichier de description et activation du module OSCommerce - */ - -include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php'; - - -/** - * Classe de description et activation du module OSCommerce - */ -class modBoutique extends DolibarrModules -{ - - /** - * Constructor. Define names, constants, directories, boxes, permissions - * - * @param DoliDB $db Database handler - */ - function __construct($db) - { - $this->db = $db; - $this->numero = 800; - - $this->family = "products"; - // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module) - $this->name = preg_replace('/^mod/i','',get_class($this)); - $this->description = "Interface de visualisation d'une boutique OSCommerce ou OSCSS"; - $this->version = 'dolibarr'; // 'experimental' or 'dolibarr' or version - $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name); - $this->special = 1; - - // Data directories to create when module is enabled - $this->dirs = array(); - - // Config pages -// $this->config_page_url = array("boutique.php","osc-languages.php"); - $this->config_page_url = array("boutique.php@boutique"); - - // Dependancies - $this->depends = array(); - $this->requiredby = array(); - $this->conflictwith = array("modOSCommerceWS"); - $this->langfiles = array("shop"); - - // Constants - $this->const = array(); - $r=0; - - $this->const[$r][0] = "OSC_DB_HOST"; - $this->const[$r][1] = "chaine"; - $this->const[$r][2] = "localhost"; - $this->const[$r][3] = "Host for OSC database for OSCommerce module 1"; - $this->const[$r][4] = 0; - $r++; - - // Boites - $this->boxes = array(); - - // Permissions - $this->rights = array(); - $this->rights_class = 'boutique'; - } - - /** - * Function called when module is enabled. - * The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database. - * It also creates data directories. - * - * @param string $options Options when enabling module ('', 'noboxes') - * @return int 1 if OK, 0 if KO - */ - function init($options='') - { - $sql = array(); - - return $this->_init($sql,$options); - } - - /** - * Function called when module is disabled. - * Remove from database constants, boxes and permissions from Dolibarr database. - * Data directories are not deleted - * - * @param string $options Options when enabling module ('', 'noboxes') - * @return int 1 if OK, 0 if KO - */ - function remove($options='') - { - $sql = array(); - - return $this->_remove($sql,$options); - } - -} diff --git a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql index 8ba2fa4ec1b..19a8d888f43 100644 --- a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql +++ b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql @@ -1090,3 +1090,9 @@ ALTER TABLE llx_contrat ADD COLUMN model_pdf varchar(255) DEFAULT NULL AFTER not ALTER TABLE llx_c_email_template ADD UNIQUE INDEX uk_c_email_template(label, lang); ALTER TABLE llx_c_email_template ADD INDEX idx_type(type_template); + +-- Remove OSC module +DELETE FROM llx_const WHERE name = 'MAIN_MODULE_BOUTIQUE'; +DELETE FROM llx_const WHERE name = 'OSC_DB_HOST'; +DELETE FROM llx_menu WHERE module = 'boutique'; + diff --git a/htdocs/langs/ar_SA/admin.lang b/htdocs/langs/ar_SA/admin.lang index c09d69c2da4..76d3acd579b 100644 --- a/htdocs/langs/ar_SA/admin.lang +++ b/htdocs/langs/ar_SA/admin.lang @@ -487,10 +487,6 @@ Module600Name=الإخطارات Module600Desc=إرسال الإشعارات عن طريق البريد الإلكتروني على بعض الفعاليات التجارية Dolibarr لطرف ثالث اتصالات Module700Name=التبرعات Module700Desc=التبرعات إدارة -Module800Name=OSCommerce المباشر -Module800Desc=وتظهر على واجهة OSCommerce أو متجر OSCSS مباشرة عن طريق الوصول إلى قواعد البيانات -Module900Name=وكان من قبل OSCommerce -Module900Desc=وتظهر على واجهة المحل OSCommerce الخدمات عبر الإنترنت. \\ nThis حدة requiere لك لتثبيت عناصر من / oscommerce_ws / ws_server الى OSCommerce الخادم الخاص بك. انظر في الملف التمهيدي / oscommerce_ws / ws_server. Module1200Name=فرس النبي Module1200Desc=فرس النبي التكامل Module1400Name=المحاسبة diff --git a/htdocs/langs/ar_SA/shop.lang b/htdocs/langs/ar_SA/shop.lang deleted file mode 100644 index 4127cac2321..00000000000 --- a/htdocs/langs/ar_SA/shop.lang +++ /dev/null @@ -1,11 +0,0 @@ -# Dolibarr language file - Source file is en_US - shop -FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup -Shop=متجر -ShopWeb=تسوق على الإنترنت -LastOrders=أوامر الماضي -OnStandBy=على اهبة الاستعداد -TreatmentInProgress=التقدم في العلاج -LastCustomers=آخر الزبائن -OSCommerceShop=OSCommerce متجر -OSCommerce=OSCommerce -AddProd=بيع على الانترنت diff --git a/htdocs/langs/bg_BG/admin.lang b/htdocs/langs/bg_BG/admin.lang index 9c3879b02f8..7141ecac2a9 100644 --- a/htdocs/langs/bg_BG/admin.lang +++ b/htdocs/langs/bg_BG/admin.lang @@ -487,10 +487,6 @@ Module600Name=Известия Module600Desc=Изпращане известия по имейл за някои бизнес събития в Dolibarr към трети лица Module700Name=Дарения Module700Desc=Управление на дарения -Module800Name=OSCommerce чрез директен достъп до базата данни -Module800Desc=Интерфейс, за да покаже OSCommerce или OSCSS магазин чрез пряк достъп до базата данни -Module900Name=OSCommerce от WS -Module900Desc=Интерфейс, за да покаже OSCommerce магазин чрез уеб услуги. Този модул ви requiere да инсталирате компоненти от / oscommerce_ws / ws_server във вашия OSCommerce сървър. Вижте README файл в / oscommerce_ws / ws_server. Module1200Name=Богомолка Module1200Desc=Mantis интеграция Module1400Name=Счетоводство diff --git a/htdocs/langs/bg_BG/shop.lang b/htdocs/langs/bg_BG/shop.lang deleted file mode 100644 index 6f793aeca45..00000000000 --- a/htdocs/langs/bg_BG/shop.lang +++ /dev/null @@ -1,11 +0,0 @@ -# Dolibarr language file - Source file is en_US - shop -FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup -Shop=Магазин -ShopWeb=Web Shop -LastOrders=Последни поръчки -OnStandBy=В режим на готовност -TreatmentInProgress=Лечението е в ход -LastCustomers=Последни клиенти -OSCommerceShop=OSCommerce магазин -OSCommerce=OSCommerce -AddProd=Продавайте онлайн diff --git a/htdocs/langs/bs_BA/admin.lang b/htdocs/langs/bs_BA/admin.lang index 52b182414b1..baf85be7ab3 100644 --- a/htdocs/langs/bs_BA/admin.lang +++ b/htdocs/langs/bs_BA/admin.lang @@ -487,10 +487,6 @@ Module600Name=Notifications Module600Desc=Send notifications by email on some Dolibarr business events to third party contacts Module700Name=Donations Module700Desc=Donation management -Module800Name=OSCommerce by direct database access -Module800Desc=Interface to show an OSCommerce or OSCSS shop via direct database access -Module900Name=OSCommerce by WS -Module900Desc=Interface to show an OSCommerce shop via Web services. This module requiere you to install components from /oscommerce_ws/ws_server into your OSCommerce server. See README file in /oscommerce_ws/ws_server. Module1200Name=Mantis Module1200Desc=Mantis integration Module1400Name=Accounting diff --git a/htdocs/langs/bs_BA/shop.lang b/htdocs/langs/bs_BA/shop.lang deleted file mode 100644 index a52f4da4322..00000000000 --- a/htdocs/langs/bs_BA/shop.lang +++ /dev/null @@ -1,11 +0,0 @@ -# Dolibarr language file - Source file is en_US - shop -FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup -Shop=Prodavnica -ShopWeb=Web Shop -LastOrders=Zadnje narudžbe -OnStandBy=Na stanju pripravnosti -TreatmentInProgress=Postupak u toku -LastCustomers=Zadnji kupci -OSCommerceShop=OSCommerce shop -OSCommerce=OSCommerce -AddProd=Prodaj online diff --git a/htdocs/langs/ca_ES/admin.lang b/htdocs/langs/ca_ES/admin.lang index 42563c409f8..e7a3ca54464 100644 --- a/htdocs/langs/ca_ES/admin.lang +++ b/htdocs/langs/ca_ES/admin.lang @@ -487,10 +487,6 @@ Module600Name=Notificacions Module600Desc=Enviament de notificacions (per correu electrònic) sobre els esdeveniments de treball Dolibarr Module700Name=Donacions Module700Desc=Gestió de donacions -Module800Name=OSCommerce 1 -Module800Desc=Interface de visualització d'una botiga OSCommerce mitjançant accés directe a la seva base de dades -Module900Name=OSCommerce 2 -Module900Desc=Interface de visualització d'una botiga OSCommerce mitjançant web services. Aquest mòdul requereix instal lar els fitxers de /oscommerce_ws/ws_server a OSCommerce. Consulteu el fitxer README de la carpeta /oscommerce_ws/ws_server. Module1200Name=Mantis Module1200Desc=Interface amb el sistema de seguiment d'incidències Mantis Module1400Name=Comptabilitat experta diff --git a/htdocs/langs/ca_ES/shop.lang b/htdocs/langs/ca_ES/shop.lang deleted file mode 100644 index 31969b6b2ce..00000000000 --- a/htdocs/langs/ca_ES/shop.lang +++ /dev/null @@ -1,11 +0,0 @@ -# Dolibarr language file - Source file is en_US - shop -FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup -Shop=Tenda -ShopWeb=Tenda web -LastOrders=Ultimes comandes -OnStandBy=En espera -TreatmentInProgress=En procés -LastCustomers=Ultims clients -OSCommerceShop=Tenda OS Commerce -OSCommerce=OSCommerce -AddProd=Venda en línia diff --git a/htdocs/langs/cs_CZ/admin.lang b/htdocs/langs/cs_CZ/admin.lang index 01023c4e186..74903e0caeb 100644 --- a/htdocs/langs/cs_CZ/admin.lang +++ b/htdocs/langs/cs_CZ/admin.lang @@ -487,10 +487,6 @@ Module600Name=Upozornění Module600Desc=Zasílat upozornění e-mailem na některých firemních akcí Dolibarr třetích stran kontakty Module700Name=Dary Module700Desc=Darování řízení -Module800Name=OsCommerce přímým přístup k databázi -Module800Desc=Rozhraní ukazovat osCommerce nebo OSCSS obchod prostřednictvím přímého přístupu do databáze -Module900Name=OsCommerce podle WS -Module900Desc=Rozhraní ukazovat osCommerce obchod prostřednictvím webových služeb. Tento modul requiere k instalaci komponenty / oscommerce_ws / ws_server do osCommerce serveru. Viz soubor README v / oscommerce_ws / ws_server. Module1200Name=Mantis Module1200Desc=Mantis integrace Module1400Name=Účetnictví diff --git a/htdocs/langs/cs_CZ/shop.lang b/htdocs/langs/cs_CZ/shop.lang deleted file mode 100644 index 2c7084b4645..00000000000 --- a/htdocs/langs/cs_CZ/shop.lang +++ /dev/null @@ -1,11 +0,0 @@ -# Dolibarr language file - Source file is en_US - shop -FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup -Shop=Obchod -ShopWeb=Web Shop -LastOrders=Poslední objednávky -OnStandBy=Na pohotovosti -TreatmentInProgress=Léčba probíhá -LastCustomers=Poslední zákazníky -OSCommerceShop=OsCommerce obchod -OSCommerce=OsCommerce -AddProd=Prodej on-line diff --git a/htdocs/langs/da_DK/admin.lang b/htdocs/langs/da_DK/admin.lang index be8cb25b8bc..e5fac958742 100644 --- a/htdocs/langs/da_DK/admin.lang +++ b/htdocs/langs/da_DK/admin.lang @@ -487,10 +487,6 @@ Module600Name=Adviséringer Module600Desc=Send meddelelser (via email) på Dolibarr business-arrangementer Module700Name=Donationer Module700Desc=Gaver 'ledelse -Module800Name=OsCommerce direkte -Module800Desc=Interface til at vise en osCommerce eller OSCSS shop via direkte database adgang -Module900Name=OsCommerce fra WAS -Module900Desc=Interface til at vise en osCommerce shop via Web services. \\ NDette modul requiere dig om at installere komponenter fra / oscommerce_ws / ws_server ind på din osCommerce server. Se README-fil i / oscommerce_ws / ws_server. Module1200Name=Mantis Module1200Desc=Mantis integration Module1400Name=Regnskabsmæssig ekspert diff --git a/htdocs/langs/da_DK/shop.lang b/htdocs/langs/da_DK/shop.lang deleted file mode 100644 index 3d8769d31e3..00000000000 --- a/htdocs/langs/da_DK/shop.lang +++ /dev/null @@ -1,11 +0,0 @@ -# Dolibarr language file - Source file is en_US - shop -FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup -Shop=Shop -ShopWeb=Web Shop -LastOrders=Seneste kendelser -OnStandBy=På standby -TreatmentInProgress=Behandling i gang -LastCustomers=Seneste kunder -OSCommerceShop=OsCommerce shop -OSCommerce=OsCommerce -AddProd=Sælge online diff --git a/htdocs/langs/de_AT/shop.lang b/htdocs/langs/de_AT/shop.lang deleted file mode 100644 index 5e7756c5b2b..00000000000 --- a/htdocs/langs/de_AT/shop.lang +++ /dev/null @@ -1,5 +0,0 @@ -# Dolibarr language file - Source file is en_US - shop -ShopWeb=Webshop -OnStandBy=Im Standby-Modus -TreatmentInProgress=Abwicklung in Arbeit -AddProd=Produkt hinzuf� diff --git a/htdocs/langs/de_DE/admin.lang b/htdocs/langs/de_DE/admin.lang index d911c266502..186ef2ef1eb 100644 --- a/htdocs/langs/de_DE/admin.lang +++ b/htdocs/langs/de_DE/admin.lang @@ -487,10 +487,6 @@ Module600Name=Benachrichtigungen Module600Desc=Senden Sie Benachrichtigungen (per E-Mail) zu dolibarr-Events Module700Name=Spenden Module700Desc=Spendenverwaltung -Module800Name=OSCommerce -Module800Desc=Schnittstelle zur Verwaltung von OSCommerce über direkten Datenbankzugriff -Module900Name=OSCommerce über Webservices -Module900Desc=Schnittstelle zur Verwaltung von OSCommerce über WebServices \nDiese Modul erfordert die Installatio der Komponente /oscommerce_ws/ws_server auf Ihrem OSCommerce-Sercer. Siehe Readme-Datei in /oscommerce_ws/ws_server. Module1200Name=Mantis Module1200Desc=Mantis-Integation Module1400Name=Buchhaltung diff --git a/htdocs/langs/de_DE/shop.lang b/htdocs/langs/de_DE/shop.lang deleted file mode 100644 index d435660b0f1..00000000000 --- a/htdocs/langs/de_DE/shop.lang +++ /dev/null @@ -1,11 +0,0 @@ -# Dolibarr language file - Source file is en_US - shop -FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup -Shop=Shop -ShopWeb=Internetshop -LastOrders=Letzte Bestellungen -OnStandBy=Im Warte-Modus -TreatmentInProgress=In Bearbeitung -LastCustomers=Letzte Kunden -OSCommerceShop=OsCommerce Shop -OSCommerce=OSCommerce -AddProd=Produkt hinzufügen diff --git a/htdocs/langs/el_GR/admin.lang b/htdocs/langs/el_GR/admin.lang index d7b7b640870..ceddf7f8824 100644 --- a/htdocs/langs/el_GR/admin.lang +++ b/htdocs/langs/el_GR/admin.lang @@ -487,10 +487,6 @@ Module600Name=Notifications Module600Desc=Send notifications by email on some Dolibarr business events to third party contacts Module700Name=Δωρεές Module700Desc=Donation management -Module800Name=OSCommerce by direct database access -Module800Desc=Interface to show an OSCommerce or OSCSS shop via direct database access -Module900Name=OSCommerce by WS -Module900Desc=Interface to show an OSCommerce shop via Web services. This module requiere you to install components from /oscommerce_ws/ws_server into your OSCommerce server. See README file in /oscommerce_ws/ws_server. Module1200Name=Mantis Module1200Desc=Mantis integration Module1400Name=Accounting diff --git a/htdocs/langs/el_GR/shop.lang b/htdocs/langs/el_GR/shop.lang deleted file mode 100644 index 1c353b5677a..00000000000 --- a/htdocs/langs/el_GR/shop.lang +++ /dev/null @@ -1,11 +0,0 @@ -# Dolibarr language file - Source file is en_US - shop -FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup -Shop=Κατάστημα -ShopWeb=Web Shop -LastOrders=Τελευταία παραγγελίες -OnStandBy=Σε κατάσταση αναμονής -TreatmentInProgress=Επεξεργασία σε εξέλιξη -LastCustomers=Τελευταίοι πελάτες -OSCommerceShop=OsCommerce κατάστημα -OSCommerce=OsCommerce -AddProd=Online Πώληση diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index fae312ee8e8..28e19dd838d 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -487,10 +487,6 @@ Module600Name=Notifications Module600Desc=Send notifications by email on some Dolibarr business events to third party contacts Module700Name=Donations Module700Desc=Donation management -Module800Name=OSCommerce by direct database access -Module800Desc=Interface to show an OSCommerce or OSCSS shop via direct database access -Module900Name=OSCommerce by WS -Module900Desc=Interface to show an OSCommerce shop via Web services. This module requiere you to install components from /oscommerce_ws/ws_server into your OSCommerce server. See README file in /oscommerce_ws/ws_server. Module1200Name=Mantis Module1200Desc=Mantis integration Module1400Name=Accounting @@ -1541,4 +1537,4 @@ Opened=Opened Closed=Closed Format=Format -TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type \ No newline at end of file +TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type diff --git a/htdocs/langs/en_US/shop.lang b/htdocs/langs/en_US/shop.lang deleted file mode 100644 index 156af426bb0..00000000000 --- a/htdocs/langs/en_US/shop.lang +++ /dev/null @@ -1,11 +0,0 @@ -# Dolibarr language file - Source file is en_US - shop -FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup -Shop=Shop -ShopWeb=Web Shop -LastOrders=Last orders -OnStandBy=On standby -TreatmentInProgress=Treatment in progress -LastCustomers=Last customers -OSCommerceShop=OSCommerce shop -OSCommerce=OSCommerce -AddProd=Sell online diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang index 704b30761e3..8dfcbfc080f 100644 --- a/htdocs/langs/es_ES/admin.lang +++ b/htdocs/langs/es_ES/admin.lang @@ -487,10 +487,6 @@ Module600Name=Notificaciones Module600Desc=Envío de notificaciones (por correo electrónico) sobre los eventos de trabajo Dolibarr Module700Name=Donaciones Module700Desc=Gestión de donaciones -Module800Name=OSCommerce 1 -Module800Desc=Interfaz de visualización de una tienda OSCommerce mediante acceso directo a su base de datos -Module900Name=OSCommerce 2 -Module900Desc=Interfaz de visualización de una tienda OSCommerce mediante Web services. Este módulo requiere instalar los archivos de /oscommerce_ws/ws_server en OSCommerce. Lea el archivo README del directorio /oscommerce_ws/ws_server. Module1200Name=Mantis Module1200Desc=Interfaz con el sistema de seguimiento de incidencias Mantis Module1400Name=Contabilidad experta diff --git a/htdocs/langs/es_ES/shop.lang b/htdocs/langs/es_ES/shop.lang deleted file mode 100644 index 67bf61fb702..00000000000 --- a/htdocs/langs/es_ES/shop.lang +++ /dev/null @@ -1,11 +0,0 @@ -# Dolibarr language file - Source file is en_US - shop -FailedConnectDBCheckModuleSetup=No se pudo conectar con la base de datos oscommerce. Compruebe la configuración del módulo -Shop=Tienda -ShopWeb=Tienda web -LastOrders=Últimos pedidos -OnStandBy=En espera -TreatmentInProgress=En proceso -LastCustomers=Ultimos clientes -OSCommerceShop=Tienda OSCommerce -OSCommerce=OSCommerce -AddProd=Venta en línea diff --git a/htdocs/langs/et_EE/admin.lang b/htdocs/langs/et_EE/admin.lang index 38c75eb486a..830ae1158c0 100644 --- a/htdocs/langs/et_EE/admin.lang +++ b/htdocs/langs/et_EE/admin.lang @@ -487,10 +487,6 @@ Module600Name=Teated Module600Desc=Saada mõnede Dolibarri äritegevusega seotud sündmuste puhul teade kolmandate isikute kontaktidele Module700Name=Annetused Module700Desc=Annetuste haldamine -Module800Name=OsCommerce integratsioon otsese andmebaasi ligipääsu abil -Module800Desc=Liides, mis näitab OSCommercei või OSCSSi poodi otsese andmebaasi ligipääsu abil -Module900Name=OSCommercei tegi WS -Module900Desc=Liides, mis näitab OSCommercei poodi veebiteenuste abil. See moodul nõuab /oscommerce_ws/ws_server kaustast pärit komponentide paigaldamist OSCommercei serverisse. Loe README faili /oscommerce_ws/ws_server kaustas. Module1200Name=Mantis Module1200Desc=Mantise integratsioon Module1400Name=Raamatupidamine diff --git a/htdocs/langs/et_EE/shop.lang b/htdocs/langs/et_EE/shop.lang deleted file mode 100644 index 5de29a9d33e..00000000000 --- a/htdocs/langs/et_EE/shop.lang +++ /dev/null @@ -1,11 +0,0 @@ -# Dolibarr language file - Source file is en_US - shop -FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup -Shop=Pood -ShopWeb=Veebipood -LastOrders=Viimased tellimused -OnStandBy=Ootel -TreatmentInProgress=Töötlemine pooleli -LastCustomers=Viimased kliendid -OSCommerceShop=OsCommercei pood -OSCommerce=OsCommerce -AddProd=Müü veebis diff --git a/htdocs/langs/eu_ES/admin.lang b/htdocs/langs/eu_ES/admin.lang index a48b51c952b..0ff71f9e2c2 100644 --- a/htdocs/langs/eu_ES/admin.lang +++ b/htdocs/langs/eu_ES/admin.lang @@ -487,10 +487,6 @@ Module600Name=Notifications Module600Desc=Send notifications by email on some Dolibarr business events to third party contacts Module700Name=Donations Module700Desc=Donation management -Module800Name=OSCommerce by direct database access -Module800Desc=Interface to show an OSCommerce or OSCSS shop via direct database access -Module900Name=OSCommerce by WS -Module900Desc=Interface to show an OSCommerce shop via Web services. This module requiere you to install components from /oscommerce_ws/ws_server into your OSCommerce server. See README file in /oscommerce_ws/ws_server. Module1200Name=Mantis Module1200Desc=Mantis integration Module1400Name=Accounting diff --git a/htdocs/langs/eu_ES/shop.lang b/htdocs/langs/eu_ES/shop.lang deleted file mode 100644 index 156af426bb0..00000000000 --- a/htdocs/langs/eu_ES/shop.lang +++ /dev/null @@ -1,11 +0,0 @@ -# Dolibarr language file - Source file is en_US - shop -FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup -Shop=Shop -ShopWeb=Web Shop -LastOrders=Last orders -OnStandBy=On standby -TreatmentInProgress=Treatment in progress -LastCustomers=Last customers -OSCommerceShop=OSCommerce shop -OSCommerce=OSCommerce -AddProd=Sell online diff --git a/htdocs/langs/fa_IR/admin.lang b/htdocs/langs/fa_IR/admin.lang index 1ecf3e51e85..5d9b3c02c64 100644 --- a/htdocs/langs/fa_IR/admin.lang +++ b/htdocs/langs/fa_IR/admin.lang @@ -487,10 +487,6 @@ Module600Name=اطلاعیه ها Module600Desc=ارسال اطلاعیه ها از طریق ایمیل در برخی از وقایع کسب و کار Dolibarr به تماس با شخص ثالث Module700Name=کمک های مالی Module700Desc=مدیریت کمک مالی -Module800Name=آهنگ تولد با دسترسی به پایگاه داده مستقیم -Module800Desc=رابط برای نشان دادن آهنگ تولد و یا فروشگاه OSCSS از طریق دسترسی به پایگاه داده مستقیم -Module900Name=آهنگ تولد توسط WS -Module900Desc=رابط برای نشان دادن یک فروشگاه آهنگ تولد از طریق خدمات وب است. این ماژول requiere شما به نصب قطعات از / oscommerce_ws / ws_server به سرور آهنگ تولد خود را. فایل README را در / oscommerce_ws / ws_server کنید. Module1200Name=اخوندک Module1200Desc=ادغام آخوندک Module1400Name=حسابداری diff --git a/htdocs/langs/fa_IR/shop.lang b/htdocs/langs/fa_IR/shop.lang deleted file mode 100644 index 72454575e51..00000000000 --- a/htdocs/langs/fa_IR/shop.lang +++ /dev/null @@ -1,11 +0,0 @@ -# Dolibarr language file - Source file is en_US - shop -FailedConnectDBCheckModuleSetup=برای اتصال به پایگاه داده با همکاری شکست خورد. بررسی کنید راه اندازی ماژول شما -Shop=فروشگاه -ShopWeb=وب سایت فروشگاه -LastOrders=آخرین سفارشات -OnStandBy=آماده به کار -TreatmentInProgress=درمان در حال پیشرفت است -LastCustomers=تاریخ و زمان آخرین مشتریان -OSCommerceShop=فروشگاه آهنگ تولد -OSCommerce=آهنگ تولد -AddProd=فروش آنلاین diff --git a/htdocs/langs/fi_FI/admin.lang b/htdocs/langs/fi_FI/admin.lang index 1d4b8c7be6f..fd74d1ebe1b 100644 --- a/htdocs/langs/fi_FI/admin.lang +++ b/htdocs/langs/fi_FI/admin.lang @@ -487,10 +487,6 @@ Module600Name=Ilmoitukset Module600Desc=Lähetä ilmoitukset (sähköposti) on Dolibarr liiketoiminnan tapahtumat Module700Name=Lahjoitukset Module700Desc=Lahjoitukset hallinto -Module800Name=OSCommerce suoraan -Module800Desc=Liitäntä osoittavat OSCommerce tai OSCSS liikkeen kautta suoraan tietokantaan pääsy -Module900Name=OSCommerce se oli -Module900Desc=Liitäntä osoittavat OSCommerce liikkeen kautta web-palveluja. \\ NTämä moduuli requiere voit asentaa komponentteja / oscommerce_ws / ws_server osaksi OSCommerce palvelimeen. Katso README-tiedosto / oscommerce_ws / ws_server. Module1200Name=Mantis Module1200Desc=Mantis yhdentyminen Module1400Name=Kirjanpidon asiantuntija diff --git a/htdocs/langs/fi_FI/shop.lang b/htdocs/langs/fi_FI/shop.lang deleted file mode 100644 index cef02012db1..00000000000 --- a/htdocs/langs/fi_FI/shop.lang +++ /dev/null @@ -1,11 +0,0 @@ -# Dolibarr language file - Source file is en_US - shop -FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup -Shop=Shop -ShopWeb=Web Shop -LastOrders=Viimeisin tilaukset -OnStandBy=Valmiustilassa -TreatmentInProgress=Käsittely kehitykseen -LastCustomers=Viimeisin asiakkaille -OSCommerceShop=OSCommerce shop -OSCommerce=OSCommerce -AddProd=Sell online diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang index d5692042b06..28edf08867b 100644 --- a/htdocs/langs/fr_FR/admin.lang +++ b/htdocs/langs/fr_FR/admin.lang @@ -487,10 +487,6 @@ Module600Name=Notifications Module600Desc=Envoi de notifications (par email) aux contacts de tiers sur certains événements métiers Module700Name=Dons Module700Desc=Gestion des dons -Module800Name=OSCommerce direct -Module800Desc=Interface de visualisation d'une boutique OSCommerce ou OSCSS par accès direct en base -Module900Name=OSCommerce by WS -Module900Desc=Interface de visualisation d'une boutique OSCommerce par accès via des Web services. Ce module requiert d'installer les fichiers de /oscommerce_ws/ws_server sur OSCommerce. Voir fichier README dans /oscommerce_ws/ws_server. Module1200Name=Mantis Module1200Desc=Interface avec le bug tracker Mantis Module1400Name=Comptabilité diff --git a/htdocs/langs/fr_FR/shop.lang b/htdocs/langs/fr_FR/shop.lang deleted file mode 100644 index a04bb133c21..00000000000 --- a/htdocs/langs/fr_FR/shop.lang +++ /dev/null @@ -1,11 +0,0 @@ -# Dolibarr language file - Source file is en_US - shop -FailedConnectDBCheckModuleSetup=Impossible de se connecter à la base de données oscommerce. Vérifiez la configuration du module -Shop=Boutique -ShopWeb=Boutique Web -LastOrders=Dernières commandes -OnStandBy=En attente -TreatmentInProgress=Traitement en cours -LastCustomers=Derniers clients -OSCommerceShop=Boutique OSCommerce -OSCommerce=OSCommerce -AddProd=Vendre en ligne diff --git a/htdocs/langs/he_IL/admin.lang b/htdocs/langs/he_IL/admin.lang index 08859ff806f..a00efa4fd6d 100644 --- a/htdocs/langs/he_IL/admin.lang +++ b/htdocs/langs/he_IL/admin.lang @@ -487,10 +487,6 @@ Module600Name=הודעות Module600Desc=שלח דיווחים בדואר אלקטרוני על כמה אירועים עסקיים Dolibarr לאנשי הקשר הצד השלישי Module700Name=תרומות Module700Desc=התרומה של ההנהלה -Module800Name=OsCommerce על ידי גישה ישירה באתר -Module800Desc=ממשק להראות osCommerce או חנות OSCSS באמצעות גישה ישירה באתר -Module900Name=OsCommerce ידי WS -Module900Desc=ממשק להראות חנות osCommerce באמצעות שירותי אינטרנט. מודול זה requiere לך להתקין רכיבים מ / oscommerce_ws / ws_server אל שרת osCommerce שלך. הצג הקובץ README ב / oscommerce_ws / ws_server. Module1200Name=גמל שלמה Module1200Desc=גמל שלמה אינטגרציה Module1400Name=חשבונאות diff --git a/htdocs/langs/he_IL/shop.lang b/htdocs/langs/he_IL/shop.lang deleted file mode 100644 index 156af426bb0..00000000000 --- a/htdocs/langs/he_IL/shop.lang +++ /dev/null @@ -1,11 +0,0 @@ -# Dolibarr language file - Source file is en_US - shop -FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup -Shop=Shop -ShopWeb=Web Shop -LastOrders=Last orders -OnStandBy=On standby -TreatmentInProgress=Treatment in progress -LastCustomers=Last customers -OSCommerceShop=OSCommerce shop -OSCommerce=OSCommerce -AddProd=Sell online diff --git a/htdocs/langs/hr_HR/admin.lang b/htdocs/langs/hr_HR/admin.lang index b5309121e95..0b0b69620f9 100644 --- a/htdocs/langs/hr_HR/admin.lang +++ b/htdocs/langs/hr_HR/admin.lang @@ -487,10 +487,6 @@ Module600Name=Notifications Module600Desc=Send notifications by email on some Dolibarr business events to third party contacts Module700Name=Donations Module700Desc=Donation management -Module800Name=OSCommerce by direct database access -Module800Desc=Interface to show an OSCommerce or OSCSS shop via direct database access -Module900Name=OSCommerce by WS -Module900Desc=Interface to show an OSCommerce shop via Web services. This module requiere you to install components from /oscommerce_ws/ws_server into your OSCommerce server. See README file in /oscommerce_ws/ws_server. Module1200Name=Mantis Module1200Desc=Mantis integration Module1400Name=Accounting diff --git a/htdocs/langs/hr_HR/shop.lang b/htdocs/langs/hr_HR/shop.lang deleted file mode 100644 index 595948cc6fb..00000000000 --- a/htdocs/langs/hr_HR/shop.lang +++ /dev/null @@ -1,11 +0,0 @@ -# Dolibarr language file - Source file is en_US - shop -FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup -Shop=Trgovina -ShopWeb=Web trgovina -LastOrders=Zadnje narudžbe -OnStandBy=Na čekanju -TreatmentInProgress=Tretman je u tijeku -LastCustomers=Zadnji kupci -OSCommerceShop=OScommerce trgovina -OSCommerce=OSCommerce -AddProd=Prodavaj putem web trgovine diff --git a/htdocs/langs/hu_HU/admin.lang b/htdocs/langs/hu_HU/admin.lang index 4344a0df8d5..9a80f571345 100644 --- a/htdocs/langs/hu_HU/admin.lang +++ b/htdocs/langs/hu_HU/admin.lang @@ -487,10 +487,6 @@ Module600Name=Értesítések Module600Desc=Küldés e-mailben értesítést néhány Dolibarr üzleti rendezvények, harmadik fél kapcsolatok Module700Name=Adományok Module700Desc=Adomány vezetése -Module800Name=Webáruház közvetlen adatbázis elérés -Module800Desc=Interfész mutatnak OsCommerce vagy OSCSS üzlet Közvetlen adatbázis hozzáférés -Module900Name=OsCommerce WS -Module900Desc=Interfész mutatnak OsCommerce üzlet web-szolgáltatásokat. Ez a modul telepítését requiere komponenseket / oscommerce_ws / ws_server be OsCommerce szerverre. Lásd a README fájl a / oscommerce_ws / ws_server. Module1200Name=Mantis Module1200Desc=Mantis integráció Module1400Name=Számvitel diff --git a/htdocs/langs/hu_HU/shop.lang b/htdocs/langs/hu_HU/shop.lang deleted file mode 100644 index 07c66d77d53..00000000000 --- a/htdocs/langs/hu_HU/shop.lang +++ /dev/null @@ -1,11 +0,0 @@ -# Dolibarr language file - Source file is en_US - shop -FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup -Shop=Bolt -ShopWeb=Web Bolt -LastOrders=Utolsó rendelések -OnStandBy=Készenléti állapotban -TreatmentInProgress=Kezelés folyamatban -LastCustomers=Utolsó vásárlók -OSCommerceShop=OSCommerce bolt -OSCommerce=OSCommerce -AddProd=Online eladás diff --git a/htdocs/langs/id_ID/admin.lang b/htdocs/langs/id_ID/admin.lang index a3ff7341c4a..37b7fd37335 100644 --- a/htdocs/langs/id_ID/admin.lang +++ b/htdocs/langs/id_ID/admin.lang @@ -487,10 +487,6 @@ Module600Name=Notifications Module600Desc=Send notifications by email on some Dolibarr business events to third party contacts Module700Name=Donations Module700Desc=Donation management -Module800Name=OSCommerce by direct database access -Module800Desc=Interface to show an OSCommerce or OSCSS shop via direct database access -Module900Name=OSCommerce by WS -Module900Desc=Interface to show an OSCommerce shop via Web services. This module requiere you to install components from /oscommerce_ws/ws_server into your OSCommerce server. See README file in /oscommerce_ws/ws_server. Module1200Name=Mantis Module1200Desc=Mantis integration Module1400Name=Accounting diff --git a/htdocs/langs/id_ID/shop.lang b/htdocs/langs/id_ID/shop.lang deleted file mode 100644 index 156af426bb0..00000000000 --- a/htdocs/langs/id_ID/shop.lang +++ /dev/null @@ -1,11 +0,0 @@ -# Dolibarr language file - Source file is en_US - shop -FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup -Shop=Shop -ShopWeb=Web Shop -LastOrders=Last orders -OnStandBy=On standby -TreatmentInProgress=Treatment in progress -LastCustomers=Last customers -OSCommerceShop=OSCommerce shop -OSCommerce=OSCommerce -AddProd=Sell online diff --git a/htdocs/langs/is_IS/admin.lang b/htdocs/langs/is_IS/admin.lang index 895cff19ca9..35d97475337 100644 --- a/htdocs/langs/is_IS/admin.lang +++ b/htdocs/langs/is_IS/admin.lang @@ -487,10 +487,6 @@ Module600Name=Tilkynningar Module600Desc=tengiliðir Senda tilkynningar í tölvupósti um sum Dolibarr viðskipti viðburðir til þriðja aðila Module700Name=Fjárframlög Module700Desc=Framlög í stjórnun -Module800Name=OsCommerce með beinni gagnasafn aðgang -Module800Desc=Tengi til að birta osCommerce eða OSCSS versla með beinni gagnasafn aðgang -Module900Name=OsCommerce eftir WS -Module900Desc=Tengi til að birta osCommerce búð um Vefur þjónustu. Þessi eining requiere þér að setja inn hluti frá / oscommerce_ws / ws_server inn osCommerce netþjóninn. Sjá README skrá í / oscommerce_ws / ws_server. Module1200Name=Mantis Module1200Desc=Mantis sameining Module1400Name=Bókhald diff --git a/htdocs/langs/is_IS/shop.lang b/htdocs/langs/is_IS/shop.lang deleted file mode 100644 index 1647180583a..00000000000 --- a/htdocs/langs/is_IS/shop.lang +++ /dev/null @@ -1,11 +0,0 @@ -# Dolibarr language file - Source file is en_US - shop -FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup -Shop=Shop -ShopWeb=Vefverslun -LastOrders=Síðasta pantanir -OnStandBy=Í biðstöðu -TreatmentInProgress=Meðhöndlun í gangi -LastCustomers=Síðasta viðskiptavina -OSCommerceShop=OsCommerce Vefverslun -OSCommerce=OsCommerce -AddProd=Sala á netinu diff --git a/htdocs/langs/it_IT/admin.lang b/htdocs/langs/it_IT/admin.lang index ee2688d5cbf..ec85bedbf4c 100644 --- a/htdocs/langs/it_IT/admin.lang +++ b/htdocs/langs/it_IT/admin.lang @@ -487,10 +487,6 @@ Module600Name=Notifiche Module600Desc=Inviare notifiche (via email), per eventi aziendali Dolibarr Module700Name=Donazioni Module700Desc=Gestione donazioni -Module800Name=OsCommerce -Module800Desc=Interfaccia per un negozio online osCommerce tramite l'accesso diretto al database -Module900Name=OsCommerce da WS -Module900Desc=Interfaccia per mostrare un osCommerce tramite webservices.
Il modulo richiede l'installazione sul server di componenti da /oscommerce_ws/ws_server. Vedere file README in /oscommerce_ws/ws_server. Module1200Name=Mantis Module1200Desc=Integrazione Mantis Module1400Name=Contabilità avanzata diff --git a/htdocs/langs/it_IT/shop.lang b/htdocs/langs/it_IT/shop.lang deleted file mode 100644 index edcdd0c7478..00000000000 --- a/htdocs/langs/it_IT/shop.lang +++ /dev/null @@ -1,11 +0,0 @@ -# Dolibarr language file - Source file is en_US - shop -FailedConnectDBCheckModuleSetup=Connessione al database di oscommerce fallita. Controlla le impostazioni di setup del tuo modulo. -Shop=Negozio -ShopWeb=Negozio online -LastOrders=Ultimi ordini -OnStandBy=In standby -TreatmentInProgress=Trattamento in corso -LastCustomers=Ultimi clienti -OSCommerceShop=Negozio OSCommerce -OSCommerce=OSCommerce -AddProd=Vendita online diff --git a/htdocs/langs/ja_JP/admin.lang b/htdocs/langs/ja_JP/admin.lang index 61f46f13bdf..afa19d9eb9c 100644 --- a/htdocs/langs/ja_JP/admin.lang +++ b/htdocs/langs/ja_JP/admin.lang @@ -487,10 +487,6 @@ Module600Name=通知 Module600Desc=サードパーティの連絡先にいくつかのDolibarrのビジネスイベントを電子メールで通知を送信 Module700Name=寄付 Module700Desc=寄付金の管理 -Module800Name=データベースに直接アクセスでosCommerceの -Module800Desc=データベースへの直接アクセスを介してosCommerceのかOSCSS店を表示するためのインタフェース -Module900Name=WSでosCommerceの -Module900Desc=Webサービスを介してosCommerceのショップを表示するためのインターフェース。このモジュールは、/ oscommerce_ws / ws_serverからあなたのosCommerceのサーバーにコンポーネントをインストールすることができrequiere。 / oscommerce_ws / ws_serverのREADMEファイルを参照してください。 Module1200Name=カマキリ Module1200Desc=カマキリの統合 Module1400Name=会計 diff --git a/htdocs/langs/ja_JP/shop.lang b/htdocs/langs/ja_JP/shop.lang deleted file mode 100644 index d6aee12c58e..00000000000 --- a/htdocs/langs/ja_JP/shop.lang +++ /dev/null @@ -1,11 +0,0 @@ -# Dolibarr language file - Source file is en_US - shop -FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup -Shop=ショップ -ShopWeb=ウェブショップ -LastOrders=ラストオーダー -OnStandBy=待機して -TreatmentInProgress=進行中の治療 -LastCustomers=最後のお客さま -OSCommerceShop=osCommerceのショップ -OSCommerce=osCommerceの -AddProd=オンライン販売 diff --git a/htdocs/langs/ko_KR/admin.lang b/htdocs/langs/ko_KR/admin.lang index f08daf12dbb..9fb727b20e4 100644 --- a/htdocs/langs/ko_KR/admin.lang +++ b/htdocs/langs/ko_KR/admin.lang @@ -487,10 +487,6 @@ Module600Name=Notifications Module600Desc=Send notifications by email on some Dolibarr business events to third party contacts Module700Name=Donations Module700Desc=Donation management -Module800Name=OSCommerce by direct database access -Module800Desc=Interface to show an OSCommerce or OSCSS shop via direct database access -Module900Name=OSCommerce by WS -Module900Desc=Interface to show an OSCommerce shop via Web services. This module requiere you to install components from /oscommerce_ws/ws_server into your OSCommerce server. See README file in /oscommerce_ws/ws_server. Module1200Name=Mantis Module1200Desc=Mantis integration Module1400Name=Accounting diff --git a/htdocs/langs/ko_KR/shop.lang b/htdocs/langs/ko_KR/shop.lang deleted file mode 100644 index 156af426bb0..00000000000 --- a/htdocs/langs/ko_KR/shop.lang +++ /dev/null @@ -1,11 +0,0 @@ -# Dolibarr language file - Source file is en_US - shop -FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup -Shop=Shop -ShopWeb=Web Shop -LastOrders=Last orders -OnStandBy=On standby -TreatmentInProgress=Treatment in progress -LastCustomers=Last customers -OSCommerceShop=OSCommerce shop -OSCommerce=OSCommerce -AddProd=Sell online diff --git a/htdocs/langs/lt_LT/admin.lang b/htdocs/langs/lt_LT/admin.lang index 3158ece74b6..82b6a410baa 100644 --- a/htdocs/langs/lt_LT/admin.lang +++ b/htdocs/langs/lt_LT/admin.lang @@ -487,10 +487,6 @@ Module600Name=Pranešimai Module600Desc=Siųsti pranešimus elektroniniu paštu apie kai kokius Dolibarr verslo įvykius į trečiųjų šalių kontaktus Module700Name=Parama Module700Desc=Paramos valdymas -Module800Name=OSCommerce pagal tiesioginį priėjimą prie duomenų bazės -Module800Desc=Sąsaja rodo OSCommerce ar OSCSS parduotuvę per tiesioginį priėjimą prie duomenų bazės -Module900Name=OSCommerce pagal WS -Module900Desc=Sąsaja rodo OSCommerce parduotuvę per interneto paslaugas. Šis modulis reikalauja įdiegti komponentus iš /oscommerce_ws/ws_server į savo OSCommerce serverį. Žiūrėti README failą į /oscommerce_ws/ws_server. Module1200Name=Mantis Module1200Desc=Mančio integracija Module1400Name=Apskaita diff --git a/htdocs/langs/lt_LT/shop.lang b/htdocs/langs/lt_LT/shop.lang deleted file mode 100644 index 5d214fe63fa..00000000000 --- a/htdocs/langs/lt_LT/shop.lang +++ /dev/null @@ -1,11 +0,0 @@ -# Dolibarr language file - Source file is en_US - shop -FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup -Shop=Parduotuvė -ShopWeb=Interneto parduotuvė -LastOrders=Paskutiniai užsakymai -OnStandBy=Budėjimo režimu -TreatmentInProgress=Apdorojimas vyksta -LastCustomers=Naujausi klientai -OSCommerceShop=OSCommerce parduotuvė -OSCommerce=OSCommerce -AddProd=Parduoti internete diff --git a/htdocs/langs/lv_LV/admin.lang b/htdocs/langs/lv_LV/admin.lang index 42b7966eba7..7d86abfa21d 100644 --- a/htdocs/langs/lv_LV/admin.lang +++ b/htdocs/langs/lv_LV/admin.lang @@ -487,10 +487,6 @@ Module600Name=Paziņojumi Module600Desc=Sūtīt paziņojumus pa e-pastu uz dažiem Dolibarr biznesa notikumiem trešo pušu kontaktiem Module700Name=Ziedojumi Module700Desc=Ziedojumu pārvaldība -Module800Name=OsCommerce tieša datu bāzes piekļuves -Module800Desc=Saskarne uzrāda OsCommerce vai OSCSS veikalu, izmantojot tiešu datu bāzes piekļuvi -Module900Name=OsCommerce ar WS -Module900Desc=Saskarne uzrāda osCommerce veikalu, izmantojot Web pakalpojumus. Šis modulis requiere instalēt komponentus no / oscommerce_ws / ws_server jūsu osCommerce serverī. Skatīt README failu / oscommerce_ws / ws_server. Module1200Name=Dievlūdzējs Module1200Desc=Mantis integrācija Module1400Name=Grāmatvedība diff --git a/htdocs/langs/lv_LV/shop.lang b/htdocs/langs/lv_LV/shop.lang deleted file mode 100644 index 32d11e3bc0b..00000000000 --- a/htdocs/langs/lv_LV/shop.lang +++ /dev/null @@ -1,11 +0,0 @@ -# Dolibarr language file - Source file is en_US - shop -FailedConnectDBCheckModuleSetup=Kļūda, nevar pieslēgties oscommerce datubāzei. Pārbaudiet moduļa iestatījumus -Shop=Veikals -ShopWeb=Interneta veikals -LastOrders=Pēdējie pasūtījumi -OnStandBy=Gaidīšanas režīmā -TreatmentInProgress=Apstrādāšana procesā -LastCustomers=Pēdējais klients -OSCommerceShop=OsCommerce veikals -OSCommerce=OsCommerce -AddProd=Pārdot internetā diff --git a/htdocs/langs/mk_MK/admin.lang b/htdocs/langs/mk_MK/admin.lang index 13821724bc9..e3e30f01dd4 100644 --- a/htdocs/langs/mk_MK/admin.lang +++ b/htdocs/langs/mk_MK/admin.lang @@ -487,10 +487,6 @@ Module600Name=Notifications Module600Desc=Send notifications by email on some Dolibarr business events to third party contacts Module700Name=Donations Module700Desc=Donation management -Module800Name=OSCommerce by direct database access -Module800Desc=Interface to show an OSCommerce or OSCSS shop via direct database access -Module900Name=OSCommerce by WS -Module900Desc=Interface to show an OSCommerce shop via Web services. This module requiere you to install components from /oscommerce_ws/ws_server into your OSCommerce server. See README file in /oscommerce_ws/ws_server. Module1200Name=Mantis Module1200Desc=Mantis integration Module1400Name=Accounting diff --git a/htdocs/langs/mk_MK/shop.lang b/htdocs/langs/mk_MK/shop.lang deleted file mode 100644 index 156af426bb0..00000000000 --- a/htdocs/langs/mk_MK/shop.lang +++ /dev/null @@ -1,11 +0,0 @@ -# Dolibarr language file - Source file is en_US - shop -FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup -Shop=Shop -ShopWeb=Web Shop -LastOrders=Last orders -OnStandBy=On standby -TreatmentInProgress=Treatment in progress -LastCustomers=Last customers -OSCommerceShop=OSCommerce shop -OSCommerce=OSCommerce -AddProd=Sell online diff --git a/htdocs/langs/nb_NO/admin.lang b/htdocs/langs/nb_NO/admin.lang index 6fc6b7579d1..89545e80ea0 100644 --- a/htdocs/langs/nb_NO/admin.lang +++ b/htdocs/langs/nb_NO/admin.lang @@ -487,10 +487,6 @@ Module600Name=Varselmeldinger Module600Desc=Sender beskjeder (med e-post) om Dolibarrhendleser Module700Name=Donasjoner Module700Desc=Behandling av donasjoner -Module800Name=OSCommerce direkte -Module800Desc=Viser nettbutikk (OSCommerce eller OSCSS) via direkte databasetilgang -Module900Name=OSCommerce med WS -Module900Desc=Viser en OSCommerce nettbutikk via Web services.\nDenne modulen krever at du installerer komponenter fra /oscommerce_ws/ws_server i din OSCommerce server. Se filen README i /oscommerce_ws/ws_server. Module1200Name=Mantis Module1200Desc=Mantisintegrasjon Module1400Name=Regnskapsekspert diff --git a/htdocs/langs/nb_NO/shop.lang b/htdocs/langs/nb_NO/shop.lang deleted file mode 100644 index 0a89a344017..00000000000 --- a/htdocs/langs/nb_NO/shop.lang +++ /dev/null @@ -1,11 +0,0 @@ -# Dolibarr language file - Source file is en_US - shop -FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup -Shop=Butikk -ShopWeb=Nettbutikk -LastOrders=Siste ordre -OnStandBy=På vent -TreatmentInProgress=Under behandling -LastCustomers=Siste kunder -OSCommerceShop=OSCommerce butikk -OSCommerce=OSCommerce -AddProd=Selg i nettbutikk diff --git a/htdocs/langs/nl_BE/shop.lang b/htdocs/langs/nl_BE/shop.lang deleted file mode 100644 index b491fb35e91..00000000000 --- a/htdocs/langs/nl_BE/shop.lang +++ /dev/null @@ -1,3 +0,0 @@ -# Dolibarr language file - Source file is en_US - shop -LastCustomers=Laatste klanten -OSCommerceShop=OSCommerce shop diff --git a/htdocs/langs/nl_NL/admin.lang b/htdocs/langs/nl_NL/admin.lang index 2fc99c549b2..fcf67430b16 100644 --- a/htdocs/langs/nl_NL/admin.lang +++ b/htdocs/langs/nl_NL/admin.lang @@ -487,10 +487,6 @@ Module600Name=Kennisgevingen Module600Desc=Stuur kennisgevingen per e-mail van sommige Dolibarr zakelijke gebeurtenisen naar contactpersonen van derde partijen Module700Name=Giften Module700Desc=Donatiebeheer -Module800Name=OSCommerce door directe databasetoegang -Module800Desc=Interface om een OSCommerce of osCSS winkel via directe databasetoegang weer te geven -Module900Name=OSCommerce door WS -Module900Desc=Interface om een OSCommerce winkel via webdiensten weer te geven. Deze module vereist installatie van componenten van /oscommerce_ws/ws_server in uw OSCommerce server. Zie het README bestand in /oscommerce_ws/ws_server. Module1200Name=Mantis Module1200Desc=Mantis integratie Module1400Name=Boekhouden diff --git a/htdocs/langs/nl_NL/shop.lang b/htdocs/langs/nl_NL/shop.lang deleted file mode 100644 index 95f3ad3c5ee..00000000000 --- a/htdocs/langs/nl_NL/shop.lang +++ /dev/null @@ -1,11 +0,0 @@ -# Dolibarr language file - Source file is en_US - shop -FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup -Shop=Winkel -ShopWeb=Webwinkel -LastOrders=Laatste orders -OnStandBy=Op stand-by -TreatmentInProgress=Behandeling in uitvoering -LastCustomers=Laatste afnemers -OSCommerceShop=OSCommerce winkel -OSCommerce=OSCommerce -AddProd=Verkopen online diff --git a/htdocs/langs/pl_PL/admin.lang b/htdocs/langs/pl_PL/admin.lang index 2e6738e2725..ccd8fa8bdd7 100644 --- a/htdocs/langs/pl_PL/admin.lang +++ b/htdocs/langs/pl_PL/admin.lang @@ -487,10 +487,6 @@ Module600Name=Powiadomienia Module600Desc=Wyślij powiadomienia (przez e-mail) na Dolibarr działalności wydarzenia Module700Name=Darowizny Module700Desc=Darowizny zarządzania -Module800Name=OsCommerce bezpośrednie -Module800Desc=Interfejs do wykazują osCommerce lub OSCSS sklepu za pośrednictwem bezpośredniego dostępu do baz danych -Module900Name=OsCommerce przez WAS -Module900Desc=Interfejs do wykazują osCommerce sklep z web services. \\ NW tym module requiere o zainstalowanie składników z / oscommerce_ws / ws_server osCommerce do swojego serwera. Zobacz plik README w / oscommerce_ws / ws_server. Module1200Name=Mantis Module1200Desc=Mantis integracji Module1400Name=Księgowość ekspertów diff --git a/htdocs/langs/pl_PL/shop.lang b/htdocs/langs/pl_PL/shop.lang deleted file mode 100644 index cebcc7e1a75..00000000000 --- a/htdocs/langs/pl_PL/shop.lang +++ /dev/null @@ -1,11 +0,0 @@ -# Dolibarr language file - Source file is en_US - shop -FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup -Shop=Sklep -ShopWeb=Shop internetowy -LastOrders=Ostatnie zamówienia -OnStandBy=Oczekuje -TreatmentInProgress=W przygotowaniu -LastCustomers=Ostatni klienci -OSCommerceShop=Sklep osCommerce -OSCommerce=OsCommerce -AddProd=Sprzedaż online diff --git a/htdocs/langs/pt_BR/admin.lang b/htdocs/langs/pt_BR/admin.lang index 3014e494d16..1ba5011996d 100644 --- a/htdocs/langs/pt_BR/admin.lang +++ b/htdocs/langs/pt_BR/admin.lang @@ -481,10 +481,6 @@ Module600Name=Notificações Module600Desc=Envio de Notificações (por correio eletrônico) sobre os eventos de trabalho Dolibarr Module700Name=Bolsas Module700Desc=Administração de Bolsas -Module800Name=OSCommerce 1 -Module800Desc=Interface de visualização de uma loja OSCommerce mediante acesso direto à sua base de dados -Module900Name=OSCommerce 2 -Module900Desc=Interface de visualização de uma loja OSCommerce mediante Web services.\nEste módulo requer instalar os arquivos de /oscommerce_ws/ws_server em OSCommerce. Leia o Arquivo README da pasta /oscommerce_ws/ws_server. Module1200Name=Mantis Module1200Desc=Interface com o sistema de seguimento de incidências Mantis Module1400Name=Contabilidade diff --git a/htdocs/langs/pt_BR/shop.lang b/htdocs/langs/pt_BR/shop.lang deleted file mode 100644 index f9084688bf0..00000000000 --- a/htdocs/langs/pt_BR/shop.lang +++ /dev/null @@ -1,11 +0,0 @@ -# Dolibarr language file - Source file is en_US - shop -FailedConnectDBCheckModuleSetup=Falha na conexão com banco de dados do osCommerce. Verifique a configuração do módulo -Shop=Loja -ShopWeb=Loja web -LastOrders=últimos pedidos -OnStandBy=Em espera -TreatmentInProgress=Em progresso -LastCustomers=últimos clientes -OSCommerceShop=Loja OS Commerce -OSCommerce=OSCommerce -AddProd=Venda em linha diff --git a/htdocs/langs/pt_PT/admin.lang b/htdocs/langs/pt_PT/admin.lang index 8e88cdea601..bb9d495ca4c 100644 --- a/htdocs/langs/pt_PT/admin.lang +++ b/htdocs/langs/pt_PT/admin.lang @@ -487,10 +487,6 @@ Module600Name=Notificações Module600Desc=Envío de Notificações (por correio electrónico) sobre os eventos de trabalho ERP/CRM Module700Name=Bolsas Module700Desc=Gestão de Bolsas -Module800Name=OSCommerce 1 -Module800Desc=Interface de visualização de uma loja OSCommerce mediante acesso directo à sua base de dados -Module900Name=OSCommerce 2 -Module900Desc=Interface de visualização de uma loja OSCommerce mediante Web services.\nEste módulo requer a instalação os ficheiros de /oscommerce_ws/ws_server em OSCommerce. Leia o Ficheiro README da pasta /oscommerce_ws/ws_server. Module1200Name=Mantis Module1200Desc=Interface com o sistema de seguimento de incidencias Mantis Module1400Name=Perito de Contabilidade diff --git a/htdocs/langs/pt_PT/shop.lang b/htdocs/langs/pt_PT/shop.lang deleted file mode 100644 index 39b80d52387..00000000000 --- a/htdocs/langs/pt_PT/shop.lang +++ /dev/null @@ -1,11 +0,0 @@ -# Dolibarr language file - Source file is en_US - shop -FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup -Shop=Loja -ShopWeb=Loja web -LastOrders=Últimos pedidos -OnStandBy=Em espera -TreatmentInProgress=Em progresso -LastCustomers=Últimos clientes -OSCommerceShop=Loja OS Commerce -OSCommerce=OSCommerce -AddProd=Venda em linha diff --git a/htdocs/langs/ro_RO/admin.lang b/htdocs/langs/ro_RO/admin.lang index b0dafabe665..56532fcc85e 100644 --- a/htdocs/langs/ro_RO/admin.lang +++ b/htdocs/langs/ro_RO/admin.lang @@ -487,10 +487,6 @@ Module600Name=Notificări Module600Desc=Trimite notificări (prin e-mail) pe Dolibarr de afaceri evenimente Module700Name=Donatii Module700Desc=MAnagementul Donaţiilor -Module800Name=OSCommerce direct -Module800Desc=Interfata pentru a afişa o OSCommerce OSCSS magazin sau prin intermediul bazei de date de acces direct -Module900Name=OSCommerce de WS -Module900Desc=Interfata pentru a afişa un magazin OSCommerce prin servicii Web. \\ NAcest modul requiere vă pentru a instala componente de la / oscommerce_ws / ws_server în OSCommerce server. Vezi README fişier în / oscommerce_ws / ws_server. Module1200Name=Mantis Module1200Desc=Mantis integrare Module1400Name=Contabilitate diff --git a/htdocs/langs/ro_RO/shop.lang b/htdocs/langs/ro_RO/shop.lang deleted file mode 100644 index cb9e5b921e4..00000000000 --- a/htdocs/langs/ro_RO/shop.lang +++ /dev/null @@ -1,11 +0,0 @@ -# Dolibarr language file - Source file is en_US - shop -FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup -Shop=Shop -ShopWeb=Web Shop -LastOrders=Ultima ordinelor -OnStandBy=Pe de aşteptare -TreatmentInProgress=Tratamentul în curs de desfăşurare -LastCustomers=Ultima clienţi -OSCommerceShop=OSCommerce magazin -OSCommerce=OSCommerce -AddProd=Vanzare online diff --git a/htdocs/langs/ru_RU/admin.lang b/htdocs/langs/ru_RU/admin.lang index 2f3924ef90e..f9ec0b0c210 100644 --- a/htdocs/langs/ru_RU/admin.lang +++ b/htdocs/langs/ru_RU/admin.lang @@ -487,10 +487,6 @@ Module600Name=Уведомления Module600Desc=Отправить уведомления (по электронной почте) о Dolibarr деловых мероприятий Module700Name=Пожертвования Module700Desc=Пожертвования управления -Module800Name=OSCommerce прямой -Module800Desc=Интерфейс показать OSCommerce или OSCSS магазина с помощью прямого доступа к базам данных -Module900Name=OSCommerce по БЫЛО -Module900Desc=Интерфейс показать OSCommerce магазина с помощью веб-служб. \\ NThis модуль requiere устанавливать компоненты из oscommerce_ws / ws_server в вашем OSCommerce сервера. Смотрите README файл в / oscommerce_ws / ws_server. Module1200Name=Mantis Module1200Desc=Mantis интеграции Module1400Name=Бухгалтерия эксперт diff --git a/htdocs/langs/ru_RU/shop.lang b/htdocs/langs/ru_RU/shop.lang deleted file mode 100644 index b982ab65dd9..00000000000 --- a/htdocs/langs/ru_RU/shop.lang +++ /dev/null @@ -1,11 +0,0 @@ -# Dolibarr language file - Source file is en_US - shop -FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup -Shop=Магазин -ShopWeb=Интернет-магазин -LastOrders=Последние заказы -OnStandBy=В ожидании -TreatmentInProgress=В обработке -LastCustomers=Последние Покупатели -OSCommerceShop=Магазин OSCommerce -OSCommerce=OSCommerce -AddProd=Онлайн Продажа diff --git a/htdocs/langs/ru_UA/shop.lang b/htdocs/langs/ru_UA/shop.lang deleted file mode 100644 index be8df87052e..00000000000 --- a/htdocs/langs/ru_UA/shop.lang +++ /dev/null @@ -1 +0,0 @@ -# Dolibarr language file - Source file is en_US - shop diff --git a/htdocs/langs/sk_SK/admin.lang b/htdocs/langs/sk_SK/admin.lang index f341b745418..630d6829374 100644 --- a/htdocs/langs/sk_SK/admin.lang +++ b/htdocs/langs/sk_SK/admin.lang @@ -487,10 +487,6 @@ Module600Name=Upozornenie Module600Desc=Zasielať upozornenia e-mailom na niektorých firemných akcií Dolibarr tretích strán kontakty Module700Name=Dary Module700Desc=Darovanie riadenie -Module800Name=Oscommerce priamym prístup k databáze -Module800Desc=Rozhranie ukazovať osCommerce alebo OSCSS obchod prostredníctvom priameho prístupu do databázy -Module900Name=Oscommerce podľa WS -Module900Desc=Rozhranie ukazovať osCommerce obchod prostredníctvom webových služieb. Tento modul requiere k inštalácii komponenty / oscommerce_ws / ws_server do osCommerce servera. Pozri súbor README v / oscommerce_ws / ws_server. Module1200Name=Mantis Module1200Desc=Mantis integrácia Module1400Name=Účtovníctvo diff --git a/htdocs/langs/sk_SK/shop.lang b/htdocs/langs/sk_SK/shop.lang deleted file mode 100644 index db6390a243c..00000000000 --- a/htdocs/langs/sk_SK/shop.lang +++ /dev/null @@ -1,11 +0,0 @@ -# Dolibarr language file - Source file is en_US - shop -FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup -Shop=Obchod -ShopWeb=Web Shop -LastOrders=Posledné objednávky -OnStandBy=Na pohotovosti -TreatmentInProgress=Liečba prebieha -LastCustomers=Posledný zákazníkmi -OSCommerceShop=Oscommerce obchod -OSCommerce=Oscommerce -AddProd=Predaj on-line diff --git a/htdocs/langs/sl_SI/admin.lang b/htdocs/langs/sl_SI/admin.lang index afdba19edd1..27fd5033c7c 100644 --- a/htdocs/langs/sl_SI/admin.lang +++ b/htdocs/langs/sl_SI/admin.lang @@ -487,10 +487,6 @@ Module600Name=Obvestila Module600Desc=Pošiljanje obvestil o nekaterih Dolibarr dogodkih po e-mailu kontaktom pri partnerjih Module700Name=Donacije Module700Desc=Upravljanje donacij -Module800Name=OSCommerce z direktnim dostopom do baze -Module800Desc=Vmesnik za prikaz OSCommerce ali OSCSS trgovine z direktnim dostopom do baze -Module900Name=OSCommerce z WS -Module900Desc=Vmesnik za prikaz OSCommerce trgovine preko Web storitev. Ta modul zahteva inštalacijo komponent s strežnika /oscommerce_ws/ws_server v vaš OSCommerce strežnik. Glejte datoteko README v /oscommerce_ws/ws_server. Module1200Name=Mantis Module1200Desc=Mantis integracija Module1400Name=Računovodstvo diff --git a/htdocs/langs/sl_SI/shop.lang b/htdocs/langs/sl_SI/shop.lang deleted file mode 100644 index 369edcaa29a..00000000000 --- a/htdocs/langs/sl_SI/shop.lang +++ /dev/null @@ -1,11 +0,0 @@ -# Dolibarr language file - Source file is en_US - shop -FailedConnectDBCheckModuleSetup=Povezava z bazo podatkov oscommerce ni uspela. Preverite nastavitve modula -Shop=Trgovina -ShopWeb=Spletna trgovina -LastOrders=Zadnja naročila -OnStandBy=Na čakanju -TreatmentInProgress=Obdelava v teku -LastCustomers=Zadnje stranke -OSCommerceShop=OSCommerce trgovina -OSCommerce=OSCommerce -AddProd=Spletna prodaja diff --git a/htdocs/langs/sq_AL/admin.lang b/htdocs/langs/sq_AL/admin.lang index 13821724bc9..e3e30f01dd4 100644 --- a/htdocs/langs/sq_AL/admin.lang +++ b/htdocs/langs/sq_AL/admin.lang @@ -487,10 +487,6 @@ Module600Name=Notifications Module600Desc=Send notifications by email on some Dolibarr business events to third party contacts Module700Name=Donations Module700Desc=Donation management -Module800Name=OSCommerce by direct database access -Module800Desc=Interface to show an OSCommerce or OSCSS shop via direct database access -Module900Name=OSCommerce by WS -Module900Desc=Interface to show an OSCommerce shop via Web services. This module requiere you to install components from /oscommerce_ws/ws_server into your OSCommerce server. See README file in /oscommerce_ws/ws_server. Module1200Name=Mantis Module1200Desc=Mantis integration Module1400Name=Accounting diff --git a/htdocs/langs/sq_AL/shop.lang b/htdocs/langs/sq_AL/shop.lang deleted file mode 100644 index 156af426bb0..00000000000 --- a/htdocs/langs/sq_AL/shop.lang +++ /dev/null @@ -1,11 +0,0 @@ -# Dolibarr language file - Source file is en_US - shop -FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup -Shop=Shop -ShopWeb=Web Shop -LastOrders=Last orders -OnStandBy=On standby -TreatmentInProgress=Treatment in progress -LastCustomers=Last customers -OSCommerceShop=OSCommerce shop -OSCommerce=OSCommerce -AddProd=Sell online diff --git a/htdocs/langs/sv_SE/admin.lang b/htdocs/langs/sv_SE/admin.lang index 31c94f978ad..bab67d2c1ad 100644 --- a/htdocs/langs/sv_SE/admin.lang +++ b/htdocs/langs/sv_SE/admin.lang @@ -487,10 +487,6 @@ Module600Name=Anmälningar Module600Desc=Skicka meddelanden via e-post på några Dolibarr affärshändelser till annans kontakter Module700Name=Donationer Module700Desc=Donation ledning -Module800Name=OSCommerce genom direkt databasåtkomst -Module800Desc=Gränssnitt för att visa en OSCommerce eller OSCSS butik via direkta databasåtkomst -Module900Name=OSCommerce av WS -Module900Desc=Gränssnitt för att visa en OSCommerce butik via webbtjänster. Denna modul requiere du installera komponenter från / oscommerce_ws / ws_server i din OSCommerce server. Se README-filen i / oscommerce_ws / ws_server. Module1200Name=Mantis Module1200Desc=Mantis integration Module1400Name=Bokföring diff --git a/htdocs/langs/sv_SE/shop.lang b/htdocs/langs/sv_SE/shop.lang deleted file mode 100644 index 94f6e3efb88..00000000000 --- a/htdocs/langs/sv_SE/shop.lang +++ /dev/null @@ -1,11 +0,0 @@ -# Dolibarr language file - Source file is en_US - shop -FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup -Shop=Shop -ShopWeb=Web Shop -LastOrders=Sista beställningen -OnStandBy=I beredskap -TreatmentInProgress=Behandling pågår -LastCustomers=Senaste kunder -OSCommerceShop=OSCommerce butik -OSCommerce=OSCommerce -AddProd=Sälja online diff --git a/htdocs/langs/th_TH/admin.lang b/htdocs/langs/th_TH/admin.lang index d147744ec24..c3d3acf451c 100644 --- a/htdocs/langs/th_TH/admin.lang +++ b/htdocs/langs/th_TH/admin.lang @@ -487,10 +487,6 @@ Module600Name=Notifications Module600Desc=Send notifications by email on some Dolibarr business events to third party contacts Module700Name=Donations Module700Desc=Donation management -Module800Name=OSCommerce by direct database access -Module800Desc=Interface to show an OSCommerce or OSCSS shop via direct database access -Module900Name=OSCommerce by WS -Module900Desc=Interface to show an OSCommerce shop via Web services. This module requiere you to install components from /oscommerce_ws/ws_server into your OSCommerce server. See README file in /oscommerce_ws/ws_server. Module1200Name=Mantis Module1200Desc=Mantis integration Module1400Name=Accounting diff --git a/htdocs/langs/th_TH/shop.lang b/htdocs/langs/th_TH/shop.lang deleted file mode 100644 index 156af426bb0..00000000000 --- a/htdocs/langs/th_TH/shop.lang +++ /dev/null @@ -1,11 +0,0 @@ -# Dolibarr language file - Source file is en_US - shop -FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup -Shop=Shop -ShopWeb=Web Shop -LastOrders=Last orders -OnStandBy=On standby -TreatmentInProgress=Treatment in progress -LastCustomers=Last customers -OSCommerceShop=OSCommerce shop -OSCommerce=OSCommerce -AddProd=Sell online diff --git a/htdocs/langs/tr_TR/admin.lang b/htdocs/langs/tr_TR/admin.lang index cb3fd775dff..1cb78579d33 100644 --- a/htdocs/langs/tr_TR/admin.lang +++ b/htdocs/langs/tr_TR/admin.lang @@ -487,10 +487,6 @@ Module600Name=Duyurlar Module600Desc=Dolibarr iş etkinleri için üçüncü partilerin ilgililerine eposta ile duyurular gönderin Module700Name=Bağışlar Module700Desc=Bağış yönetimi -Module800Name=Doğrudan veritabanı erişimi yoluyla OSCommerce -Module800Desc=Doğrudan veritabanı erişimi yoluyla OSCommerce ya da OSCSS mağazası -Module900Name=OsCommerce Türkiye WS (web servisi yoluyla) -Module900Desc=OSCommerce mağazasını Web servisi yoluyla gösteren arayüz. Bu modül /oscommerce_ws/ws_server den sizin OSCommerce sunucusuna bileşen kurmanızı gerektirir. /oscommerce_ws/ws_server daki README dosyasına bakın. Module1200Name=Mantis Module1200Desc=Mantis entegrasyonu Module1400Name=Muhasebe diff --git a/htdocs/langs/tr_TR/shop.lang b/htdocs/langs/tr_TR/shop.lang deleted file mode 100644 index 4925111b19a..00000000000 --- a/htdocs/langs/tr_TR/shop.lang +++ /dev/null @@ -1,11 +0,0 @@ -# Dolibarr language file - Source file is en_US - shop -FailedConnectDBCheckModuleSetup=Oscommerce veritabanına bağlantıda hata oluştu. Modül kurulumunu kontrol ediniz. -Shop=Mağaza -ShopWeb=Web Mağazası -LastOrders=Son siparişler -OnStandBy=Beklemede -TreatmentInProgress=İşlemi devam ediyor -LastCustomers=Son müşteriler -OSCommerceShop=OSCommerce mağazası -OSCommerce=OSCommerce -AddProd=Çevrimiçi satış diff --git a/htdocs/langs/uk_UA/admin.lang b/htdocs/langs/uk_UA/admin.lang index c8b20ae090c..d0a47c3bcf5 100644 --- a/htdocs/langs/uk_UA/admin.lang +++ b/htdocs/langs/uk_UA/admin.lang @@ -487,10 +487,6 @@ Module600Name=Notifications Module600Desc=Send notifications by email on some Dolibarr business events to third party contacts Module700Name=Donations Module700Desc=Donation management -Module800Name=OSCommerce by direct database access -Module800Desc=Interface to show an OSCommerce or OSCSS shop via direct database access -Module900Name=OSCommerce by WS -Module900Desc=Interface to show an OSCommerce shop via Web services. This module requiere you to install components from /oscommerce_ws/ws_server into your OSCommerce server. See README file in /oscommerce_ws/ws_server. Module1200Name=Mantis Module1200Desc=Mantis integration Module1400Name=Accounting diff --git a/htdocs/langs/uk_UA/shop.lang b/htdocs/langs/uk_UA/shop.lang deleted file mode 100644 index 156af426bb0..00000000000 --- a/htdocs/langs/uk_UA/shop.lang +++ /dev/null @@ -1,11 +0,0 @@ -# Dolibarr language file - Source file is en_US - shop -FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup -Shop=Shop -ShopWeb=Web Shop -LastOrders=Last orders -OnStandBy=On standby -TreatmentInProgress=Treatment in progress -LastCustomers=Last customers -OSCommerceShop=OSCommerce shop -OSCommerce=OSCommerce -AddProd=Sell online diff --git a/htdocs/langs/uz_UZ/admin.lang b/htdocs/langs/uz_UZ/admin.lang index 13821724bc9..e3e30f01dd4 100644 --- a/htdocs/langs/uz_UZ/admin.lang +++ b/htdocs/langs/uz_UZ/admin.lang @@ -487,10 +487,6 @@ Module600Name=Notifications Module600Desc=Send notifications by email on some Dolibarr business events to third party contacts Module700Name=Donations Module700Desc=Donation management -Module800Name=OSCommerce by direct database access -Module800Desc=Interface to show an OSCommerce or OSCSS shop via direct database access -Module900Name=OSCommerce by WS -Module900Desc=Interface to show an OSCommerce shop via Web services. This module requiere you to install components from /oscommerce_ws/ws_server into your OSCommerce server. See README file in /oscommerce_ws/ws_server. Module1200Name=Mantis Module1200Desc=Mantis integration Module1400Name=Accounting diff --git a/htdocs/langs/uz_UZ/shop.lang b/htdocs/langs/uz_UZ/shop.lang deleted file mode 100644 index 156af426bb0..00000000000 --- a/htdocs/langs/uz_UZ/shop.lang +++ /dev/null @@ -1,11 +0,0 @@ -# Dolibarr language file - Source file is en_US - shop -FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup -Shop=Shop -ShopWeb=Web Shop -LastOrders=Last orders -OnStandBy=On standby -TreatmentInProgress=Treatment in progress -LastCustomers=Last customers -OSCommerceShop=OSCommerce shop -OSCommerce=OSCommerce -AddProd=Sell online diff --git a/htdocs/langs/vi_VN/shop.lang b/htdocs/langs/vi_VN/shop.lang deleted file mode 100644 index bfc4e1a7d71..00000000000 --- a/htdocs/langs/vi_VN/shop.lang +++ /dev/null @@ -1,11 +0,0 @@ -# Dolibarr language file - Source file is en_US - shop -FailedConnectDBCheckModuleSetup=Không thể kết nối với cơ sở dữ liệu osCommerce. Kiểm tra thiết lập module của bạn -Shop=Cửa hàng -ShopWeb=Web cửa hàng -LastOrders=Đơn đặt hàng cuối cùng -OnStandBy=Ở chế độ chờ -TreatmentInProgress=Điều trị cơ bản dở -LastCustomers=Khách hàng cuối -OSCommerceShop=OsCommerce cửa hàng -OSCommerce=OsCommerce -AddProd=Bán hàng trực tuyến diff --git a/htdocs/langs/zh_CN/admin.lang b/htdocs/langs/zh_CN/admin.lang index 202c2232e0f..e0a4870b103 100644 --- a/htdocs/langs/zh_CN/admin.lang +++ b/htdocs/langs/zh_CN/admin.lang @@ -487,10 +487,6 @@ Module600Name=通知 Module600Desc=当系统中一些商业事件发生时，通过电邮通知第三方联系人。 Module700Name=捐赠 Module700Desc=捐款的管理 -Module800Name=OSCommerce (通过直接数据库访问) -Module800Desc=通过直接访问其数据库，在界面中显示 OSCommerce 或 OSCSS 店铺 -Module900Name=OSCommerce by WS -Module900Desc=Interface to show an OSCommerce shop via Web services. This module requiere you to install components from /oscommerce_ws/ws_server into your OSCommerce server. See README file in /oscommerce_ws/ws_server. Module1200Name=Mantis Module1200Desc=Mantis 整合 Module1400Name=会计 diff --git a/htdocs/langs/zh_CN/shop.lang b/htdocs/langs/zh_CN/shop.lang deleted file mode 100644 index a51ce042f69..00000000000 --- a/htdocs/langs/zh_CN/shop.lang +++ /dev/null @@ -1,11 +0,0 @@ -# Dolibarr language file - Source file is en_US - shop -FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup -Shop=店 -ShopWeb=网上商店 -LastOrders=最后的订单 -OnStandBy=待命 -TreatmentInProgress=治疗进展 -LastCustomers=最后客户 -OSCommerceShop=oscommerce的店铺 -OSCommerce=oscommerce的 -AddProd=在线销售 diff --git a/htdocs/langs/zh_TW/admin.lang b/htdocs/langs/zh_TW/admin.lang index 8f2d2e92eb9..09d12f227e3 100644 --- a/htdocs/langs/zh_TW/admin.lang +++ b/htdocs/langs/zh_TW/admin.lang @@ -487,10 +487,6 @@ Module600Name=通知 Module600Desc=由一些商業活動的電子郵件發送Dolibarr通知給第三方的交往 Module700Name=捐贈 Module700Desc=捐款的管理 -Module800Name=直接檔由數據庫訪問 -Module800Desc=通過界面顯示直接數據庫訪問oscommerce的店舖或OSCSS -Module900Name=被檔由 -Module900Desc=界面顯示一個通過Web服務oscommerce的商店。此模組requiere您安裝/ oscommerce_ws / ws_server到您oscommerce的服務器組件。查看自述文件/ oscommerce_ws / ws_server。 Module1200Name=螂 Module1200Desc=螳螂一體化 Module1400Name=會計 diff --git a/htdocs/langs/zh_TW/shop.lang b/htdocs/langs/zh_TW/shop.lang deleted file mode 100644 index df0cf54c4cc..00000000000 --- a/htdocs/langs/zh_TW/shop.lang +++ /dev/null @@ -1,11 +0,0 @@ -# Dolibarr language file - Source file is en_US - shop -FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup -Shop=店 -ShopWeb=網上商店 -LastOrders=最後的訂單 -OnStandBy=待命 -TreatmentInProgress=治療進展 -LastCustomers=最後客戶 -OSCommerceShop=oscommerce的店鋪 -OSCommerce=oscommerce的 -AddProd=在線銷售 diff --git a/htdocs/public/demo/index.php b/htdocs/public/demo/index.php index 8a6bcd62e58..5c2efc4a0ac 100644 --- a/htdocs/public/demo/index.php +++ b/htdocs/public/demo/index.php @@ -61,22 +61,22 @@ if (empty($reshook)) { $demoprofiles=array( array('default'=>'1', 'key'=>'profdemoservonly','label'=>'DemoCompanyServiceOnly', - 'disablemodules'=>'adherent,barcode,boutique,cashdesk,categorie,don,expedition,externalsite,mailmanspip,margin,prelevement,product,stock', + 'disablemodules'=>'adherent,barcode,cashdesk,categorie,don,expedition,externalsite,mailmanspip,margin,prelevement,product,stock', 'icon'=>DOL_URL_ROOT.'/public/demo/dolibarr_screenshot8.png'), array('default'=>'-1','key'=>'profdemoshopwithdesk','label'=>'DemoCompanyShopWithCashDesk', - 'disablemodules'=>'adherent,boutique,categorie,don,externalsite,ficheinter,mailmanspip,prelevement,product,stock', + 'disablemodules'=>'adherent,categorie,don,externalsite,ficheinter,mailmanspip,prelevement,product,stock', 'icon'=>DOL_URL_ROOT.'/public/demo/dolibarr_screenshot2.png'), array('default'=>'0', 'key'=>'profdemoprodstock','label'=>'DemoCompanyProductAndStocks', - 'disablemodules'=>'adherent,boutique,contrat,categorie,don,externalsite,ficheinter,mailmanspip,prelevement,service', + 'disablemodules'=>'adherent,contrat,categorie,don,externalsite,ficheinter,mailmanspip,prelevement,service', 'icon'=>DOL_URL_ROOT.'/public/demo/dolibarr_screenshot2.png'), array('default'=>'0', 'key'=>'profdemoall','label'=>'DemoCompanyAll', - 'disablemodules'=>'adherent,boutique,don,externalsite,mailmanspip', + 'disablemodules'=>'adherent,don,externalsite,mailmanspip', 'icon'=>DOL_URL_ROOT.'/public/demo/dolibarr_screenshot9.png'), array('default'=>'-1', 'key'=>'profdemofun','label'=>'DemoFundation', - 'disablemodules'=>'banque,barcode,boutique,cashdesk,commande,commercial,compta,comptabilite,contrat,expedition,externalsite,facture,ficheinter,fournisseur,mailmanspip,margin,prelevement,product,projet,propal,propale,service,societe,stock,tax', + 'disablemodules'=>'banque,barcode,cashdesk,commande,commercial,compta,comptabilite,contrat,expedition,externalsite,facture,ficheinter,fournisseur,mailmanspip,margin,prelevement,product,projet,propal,propale,service,societe,stock,tax', 'icon'=>DOL_URL_ROOT.'/public/demo/dolibarr_screenshot6.png'), array('default'=>'0', 'key'=>'profdemofun2','label'=>'DemoFundation2', - 'disablemodules'=>'barcode,boutique,cashdesk,commande,commercial,compta,comptabilite,contrat,expedition,externalsite,facture,ficheinter,fournisseur,mailmanspip,margin,prelevement,product,projet,propal,propale,service,societe,stock,tax', + 'disablemodules'=>'barcode,cashdesk,commande,commercial,compta,comptabilite,contrat,expedition,externalsite,facture,ficheinter,fournisseur,mailmanspip,margin,prelevement,product,projet,propal,propale,service,societe,stock,tax', 'icon'=>DOL_URL_ROOT.'/public/demo/dolibarr_screenshot6.png') ); @@ -88,7 +88,7 @@ if (empty($reshook)) 'mailmanspip','notification','syslog','user','webservices', // Extended modules 'memcached','numberwords','zipautofillfr'); - $alwayshiddenuncheckedmodules=array('boutique','ftp', + $alwayshiddenuncheckedmodules=array('ftp', // Extended modules 'awstats','bittorrent','bootstrap','cabinetmed','cmcic','concatpdf','customfield','dolicloud','filemanager','lightbox','mantis','monitoring','moretemplates','multicompany','nltechno','numberingpack','openstreetmap', 'ovh','phenix','phpsysinfo','pibarcode','postnuke','selectbank','skincoloreditor','submiteverywhere','survey','thomsonphonebook','topten','tvacerfa','voyage','webcalendar','webmail'); diff --git a/htdocs/theme/auguria/img/menus/shop.png b/htdocs/theme/auguria/img/menus/shop.png deleted file mode 100644 index efd6859ab60..00000000000 Binary files a/htdocs/theme/auguria/img/menus/shop.png and /dev/null differ diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php index 42988c4c910..e66c0d5623e 100644 --- a/htdocs/theme/auguria/style.css.php +++ b/htdocs/theme/auguria/style.css.php @@ -392,7 +392,7 @@ $mainmenuusedarray=array_unique(explode(',',$mainmenuused)); $mainmenuusedarray=array(); // Disable $generic=1; -$divalreadydefined=array('home','companies','products','commercial','accountancy','project','tools','members','shop','agenda','ecm','cashdesk'); +$divalreadydefined=array('home','companies','products','commercial','accountancy','project','tools','members','agenda','ecm','cashdesk'); foreach($mainmenuusedarray as $val) { if (empty($val) || in_array($val,$divalreadydefined)) continue; diff --git a/htdocs/theme/bureau2crea/img/menus/shop.png b/htdocs/theme/bureau2crea/img/menus/shop.png deleted file mode 100644 index efd6859ab60..00000000000 Binary files a/htdocs/theme/bureau2crea/img/menus/shop.png and /dev/null differ diff --git a/htdocs/theme/bureau2crea/style.css.php b/htdocs/theme/bureau2crea/style.css.php index be33c3484e8..3c4f7c8d712 100644 --- a/htdocs/theme/bureau2crea/style.css.php +++ b/htdocs/theme/bureau2crea/style.css.php @@ -424,7 +424,7 @@ $mainmenuusedarray=array_unique(explode(',',$mainmenuused)); $mainmenuusedarray=array(); // Disable $generic=1; -$divalreadydefined=array('home','companies','products','commercial','accountancy','project','tools','members','shop','agenda','ecm','cashdesk'); +$divalreadydefined=array('home','companies','products','commercial','accountancy','project','tools','members','agenda','ecm','cashdesk'); foreach($mainmenuusedarray as $val) { if (empty($val) || in_array($val,$divalreadydefined)) continue; diff --git a/htdocs/theme/cameleo/img/menus/shop.png b/htdocs/theme/cameleo/img/menus/shop.png deleted file mode 100644 index efd6859ab60..00000000000 Binary files a/htdocs/theme/cameleo/img/menus/shop.png and /dev/null differ diff --git a/htdocs/theme/cameleo/style.css.php b/htdocs/theme/cameleo/style.css.php index 0de71405cb9..be3403fabcb 100644 --- a/htdocs/theme/cameleo/style.css.php +++ b/htdocs/theme/cameleo/style.css.php @@ -537,10 +537,6 @@ div.mainmenu.tools { background-image: url(); } -div.mainmenu.shop { - background-image: url(); -} - div.mainmenu.google { background-image: url(); } @@ -564,7 +560,7 @@ foreach($conf->modules as $val) $mainmenuusedarray=array_unique(explode(',',$mainmenuused)); $generic=1; -$divalreadydefined=array('home','companies','products','commercial','accountancy','project','tools','members','shop','agenda','ecm','bookmark','cashdesk','geoipmaxmind','gravatar','clicktodial','paypal','webservices'); +$divalreadydefined=array('home','companies','products','commercial','accountancy','project','tools','members','agenda','ecm','bookmark','cashdesk','geoipmaxmind','gravatar','clicktodial','paypal','webservices'); foreach($mainmenuusedarray as $val) { if (empty($val) || in_array($val,$divalreadydefined)) continue; diff --git a/htdocs/theme/eldy/img/menus/shop.png b/htdocs/theme/eldy/img/menus/shop.png deleted file mode 100644 index efd6859ab60..00000000000 Binary files a/htdocs/theme/eldy/img/menus/shop.png and /dev/null differ diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 38cbc232695..92c0058680d 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -738,10 +738,6 @@ div.mainmenu.tools { background-image: url(); } -div.mainmenu.shop { - background-image: url(); -} - div.mainmenu.webservices { } @@ -769,7 +765,7 @@ foreach($conf->modules as $val) $mainmenuusedarray=array_unique(explode(',',$mainmenuused)); $generic=1; -$divalreadydefined=array('home','companies','products','commercial','accountancy','project','tools','members','shop','agenda','holiday','bookmark','cashdesk','ecm','geoipmaxmind','gravatar','clicktodial','paypal','webservices'); +$divalreadydefined=array('home','companies','products','commercial','accountancy','project','tools','members','agenda','holiday','bookmark','cashdesk','ecm','geoipmaxmind','gravatar','clicktodial','paypal','webservices'); foreach($mainmenuusedarray as $val) { if (empty($val) || in_array($val,$divalreadydefined)) continue; diff --git a/test/phpunit/ModulesTest.php b/test/phpunit/ModulesTest.php index 974ce8ea70a..b5529489d00 100755 --- a/test/phpunit/ModulesTest.php +++ b/test/phpunit/ModulesTest.php @@ -125,7 +125,7 @@ class ModulesTest extends PHPUnit_Framework_TestCase $langs=$this->savlangs; $db=$this->savdb; - $modulelist=array('Accounting','Adherent','Agenda','Banque','Barcode','Bookmark','Boutique', + $modulelist=array('Accounting','Adherent','Agenda','Banque','Barcode','Bookmark', 'CashDesk','Categorie','ClickToDial','Commande','Comptabilite','Contrat','Cron','Deplacement','Document','Don', 'ECM','Expedition','Export','ExternalRss','ExternalSite','Facture', 'Fckeditor','Ficheinter','Fournisseur','FTP','GeoIPMaxmind','Gravatar','Holiday','Import','Label','Ldap','Mailing', diff --git a/test/phpunit/phpunittest.xml b/test/phpunit/phpunittest.xml index 8237367ebef..ac4e29df3b5 100644 --- a/test/phpunit/phpunittest.xml +++ b/test/phpunit/phpunittest.xml @@ -52,9 +52,8 @@ ../../htdocs/contact/canvas/ ../../htdocs/societe/canvas/ ../../htdocs/includes/ - ../../htdocs/boutique/osc_master.inc.php ../../htdocs/holiday/common.inc.php - \ No newline at end of file +