/[dolibarr]/dolibarr/htdocs/master.inc.php
ViewVC logotype

Diff of /dolibarr/htdocs/master.inc.php

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.92 by eldy, Tue Nov 1 17:48:46 2005 UTC revision 1.93 by eldy, Fri Nov 11 20:11:57 2005 UTC
# Line 287  $conf->webcal->db->pass=defined('PHPWEBC Line 287  $conf->webcal->db->pass=defined('PHPWEBC
287  $conf->webcal->db->name=defined('PHPWEBCALENDAR_DBNAME')?PHPWEBCALENDAR_DBNAME:'';  $conf->webcal->db->name=defined('PHPWEBCALENDAR_DBNAME')?PHPWEBCALENDAR_DBNAME:'';
288    
289  $conf->facture->enabled=defined("MAIN_MODULE_FACTURE")?MAIN_MODULE_FACTURE:0;  $conf->facture->enabled=defined("MAIN_MODULE_FACTURE")?MAIN_MODULE_FACTURE:0;
290  if ($conf->facture->enabled) require_once(DOL_DOCUMENT_ROOT ."/includes/modules/facture/modules_facture.php");  // \todo Ajouter la ligne
291    // require_once(DOL_DOCUMENT_ROOT ."/includes/modules/facture/modules_facture.php");
292    // dans le fichier facturation-emission.php du module telephonie afin de pouvoir
293    // supprimer celles qui suivent.
294    if (defined("MAIN_MODULE_TELEPHONIE") && MAIN_MODULE_TELEPHONIE)
295    {
296        require_once(DOL_DOCUMENT_ROOT ."/includes/modules/facture/modules_facture.php");
297    }
298  $conf->facture->dir_output=DOL_DATA_ROOT."/facture";  $conf->facture->dir_output=DOL_DATA_ROOT."/facture";
299  $conf->facture->dir_images=DOL_DATA_ROOT."/facture/images";  $conf->facture->dir_images=DOL_DATA_ROOT."/facture/images";
300  if (defined('FAC_OUTPUTDIR') && FAC_OUTPUTDIR) { $conf->facture->dir_output=FAC_OUTPUTDIR; }                # Pour passer outre le rep par d?faut  if (defined('FAC_OUTPUTDIR') && FAC_OUTPUTDIR) { $conf->facture->dir_output=FAC_OUTPUTDIR; }                # Pour passer outre le rep par d?faut
301  $conf->propal->enabled=defined("MAIN_MODULE_PROPALE")?MAIN_MODULE_PROPALE:0;  $conf->propal->enabled=defined("MAIN_MODULE_PROPALE")?MAIN_MODULE_PROPALE:0;
 if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT ."/includes/modules/propale/modules_propale.php");  
302  if (!defined("PROPALE_NEW_FORM_NB_PRODUCT")) define("PROPALE_NEW_FORM_NB_PRODUCT", 4);  if (!defined("PROPALE_NEW_FORM_NB_PRODUCT")) define("PROPALE_NEW_FORM_NB_PRODUCT", 4);
303  $conf->propal->dir_output=DOL_DATA_ROOT."/propale";  $conf->propal->dir_output=DOL_DATA_ROOT."/propale";
304  $conf->propal->dir_images=DOL_DATA_ROOT."/propale/images";  $conf->propal->dir_images=DOL_DATA_ROOT."/propale/images";

Legend:
Removed from v.1.92  
changed lines
  Added in v.1.93

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26