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

Fix: On first install, default models was not preselected

Browse Source
This commit is contained in:
Laurent Destailleur 2010-07-09 23:15:06 +00:00
parent 391ef13fe7
commit bf6f17f8d3
5 changed files with 254 additions and 208 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/admin/expedition.php
View File

@ -80,6 +80,7 @@ if ($_GET["action"] == 'specimen')
} }
} }
// Activate a model
if ($_GET["action"] == 'set') if ($_GET["action"] == 'set')
{ {
$type='shipping'; $type='shipping';
@ -104,6 +105,7 @@ if ($_GET["action"] == 'del')
} }
} }
// Set default model
if ($_GET["action"] == 'setdoc') if ($_GET["action"] == 'setdoc')
{ {
$db->begin(); $db->begin();
@ -132,7 +134,7 @@ if ($_GET["action"] == 'setdoc')
} }
} }
// \todo A quoi servent les methode d'expedition ? // TODO A quoi servent les methode d'expedition ?
if ($_GET["action"] == 'setmethod' || $_GET["action"] == 'setmod') if ($_GET["action"] == 'setmethod' || $_GET["action"] == 'setmod')
{ {
$module=$_GET["module"]; $module=$_GET["module"];
@ -205,7 +207,7 @@ if ($_GET["action"] == 'setmethod' || $_GET["action"] == 'setmod')
if ($_GET["action"] == 'setmod') if ($_GET["action"] == 'setmod')
{ {
// \todo Verifier si module numerotation choisi peut etre active // TODO Verifier si module numerotation choisi peut etre active
// par appel methode canBeActivated // par appel methode canBeActivated
dolibarr_set_const($db, "EXPEDITION_ADDON",$_GET["module"],'chaine',0,'',$conf->entity); dolibarr_set_const($db, "EXPEDITION_ADDON",$_GET["module"],'chaine',0,'',$conf->entity);
@ -342,7 +344,7 @@ if(is_dir($dir))
print "</td>"; print "</td>";
} }
// Defaut // Default
print "<td align=\"center\">"; print "<td align=\"center\">";
if ($conf->global->EXPEDITION_ADDON_PDF == $name) if ($conf->global->EXPEDITION_ADDON_PDF == $name)
{ {

2
htdocs/admin/fournisseur.php
View File

@ -340,7 +340,7 @@ while (($file = readdir($handle))!==false)
else else
{ {
print "<td align=\"center\">\n"; print "<td align=\"center\">\n";
print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;value='.$name.'">'.$langs->trans("Activate").'</a>'; print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;value='.$name.'">'.img_picto($langs->trans("Disabled"),'off').'</a>';
print "</td>"; print "</td>";
} }

28
htdocs/includes/modules/modDon.class.php
View File

@ -1,6 +1,6 @@
<?php <?php
/* Copyright (C) 2003,2005 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2003,2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2007 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2010 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr> * Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@ -19,9 +19,9 @@
*/ */
/** /**
\defgroup don Module donation * \defgroup don Module donation
\brief Module pour gerer le suivi des dons * \brief Module pour gerer le suivi des dons
\version $Id$ * \version $Id$
*/ */
/** /**
@ -72,11 +72,14 @@ class modDon extends DolibarrModules
// Constants // Constants
$this->const = array(); $this->const = array();
$this->const[0][0] = "DON_FORM"; $r=0;
$this->const[0][1] = "chaine";
$this->const[0][2] = "fsfe.fr.php"; $this->const[$r][0] = "DON_ADDON_MODEL";
$this->const[0][3] = 'Nom du gestionnaire de formulaire de dons'; $this->const[$r][1] = "chaine";
$this->const[0][4] = 0; $this->const[$r][2] = "html_cerfafr";
$this->const[$r][3] = 'Nom du gestionnaire de generation de recu de dons';
$this->const[$r][4] = 0;
$r++;
// Boxes // Boxes
$this->boxes = array(); $this->boxes = array();
@ -112,7 +115,12 @@ class modDon extends DolibarrModules
*/ */
function init() function init()
{ {
$sql = array(); global $conf;
$sql = array(
"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->const[0][2]."' AND entity = ".$conf->entity,
"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->const[0][2]."','donation',".$conf->entity.")",
);
return $this->_init($sql); return $this->_init($sql);
} }

50
htdocs/includes/modules/modExpedition.class.php
View File

@ -1,6 +1,6 @@
<?php <?php
/* Copyright (C) 2003-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2003-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2007 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2010 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr> * Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@ -76,17 +76,36 @@ class modExpedition extends DolibarrModules
// Constantes // Constantes
$this->const = array(); $this->const = array();
$this->const[0][0] = "LIVRAISON_ADDON_PDF"; $r=0;
$this->const[0][1] = "chaine";
$this->const[0][2] = "typhon";
$this->const[0][3] = 'Nom du gestionnaire de generation des commandes en PDF';
$this->const[0][4] = 0;
$this->const[1][0] = "LIVRAISON_ADDON"; $this->const[$r][0] = "EXPEDITION_ADDON_PDF";
$this->const[1][1] = "chaine"; $this->const[$r][1] = "chaine";
$this->const[1][2] = "mod_livraison_jade"; $this->const[$r][2] = "rouget";
$this->const[1][3] = 'Nom du gestionnaire de numerotation des bons de livraison'; $this->const[$r][3] = 'Nom du gestionnaire de generation des bons expeditions en PDF';
$this->const[1][4] = 0; $this->const[$r][4] = 0;
$r++;
/*$this->const[$r][0] = "EXPEDITION_ADDON";
$this->const[$r][1] = "chaine";
$this->const[$r][2] = "xxx";
$this->const[$r][3] = 'Nom du gestionnaire de generation des bons expeditions en PDF';
$this->const[$r][4] = 0;
$r++;
*/
$this->const[$r][0] = "LIVRAISON_ADDON_PDF";
$this->const[$r][1] = "chaine";
$this->const[$r][2] = "typhon";
$this->const[$r][3] = 'Nom du gestionnaire de generation des bons de reception en PDF';
$this->const[$r][4] = 0;
$r++;
$this->const[$r][0] = "LIVRAISON_ADDON";
$this->const[$r][1] = "chaine";
$this->const[$r][2] = "mod_livraison_jade";
$this->const[$r][3] = 'Nom du gestionnaire de numerotation des bons de reception';
$this->const[$r][4] = 0;
$r++;
// Boxes // Boxes
$this->boxes = array(); $this->boxes = array();
@ -165,11 +184,20 @@ class modExpedition extends DolibarrModules
*/ */
function init() function init()
{ {
global $conf;
// Permissions // Permissions
$this->remove(); $this->remove();
$sql = array(); $sql = array();
$sql = array(
"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->const[0][2]."' AND entity = ".$conf->entity,
"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->const[0][2]."','shipping',".$conf->entity.")",
"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->const[1][2]."' AND entity = ".$conf->entity,
"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->const[1][2]."','delivery',".$conf->entity.")",
);
return $this->_init($sql); return $this->_init($sql);
} }

22
htdocs/includes/modules/modFournisseur.class.php
View File

@ -78,14 +78,17 @@ class modFournisseur extends DolibarrModules
// Constantes // Constantes
$this->const = array(); $this->const = array();
$r=0;
$this->const[0][0] = "COMMANDE_SUPPLIER_ADDON_PDF"; $this->const[$r][0] = "COMMANDE_SUPPLIER_ADDON_PDF";
$this->const[0][1] = "chaine"; $this->const[$r][1] = "chaine";
$this->const[0][2] = "muscadet"; $this->const[$r][2] = "muscadet";
$r++;
$this->const[1][0] = "COMMANDE_SUPPLIER_ADDON"; $this->const[$r][0] = "COMMANDE_SUPPLIER_ADDON";
$this->const[1][1] = "chaine"; $this->const[$r][1] = "chaine";
$this->const[1][2] = "mod_commande_fournisseur_muguet"; $this->const[$r][2] = "mod_commande_fournisseur_muguet";
$r++;
// Boxes // Boxes
$this->boxes = array(); $this->boxes = array();
@ -252,9 +255,14 @@ class modFournisseur extends DolibarrModules
*/ */
function init() function init()
{ {
global $conf;
$this->remove(); $this->remove();
$sql = array(); $sql = array(
"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->const[0][2]."' AND entity = ".$conf->entity,
"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->const[0][2]."','supplier_order',".$conf->entity.")",
);
$this->load_datas(); $this->load_datas();