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

Doc

Browse Source
This commit is contained in:
Laurent Destailleur 2011-07-13 15:25:21 +00:00
parent d01a8f22bd
commit cf184ec351
7 changed files with 83 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/core/class/commonobject.class.php
View File

@ -22,7 +22,7 @@
* \file htdocs/core/class/commonobject.class.php * \file htdocs/core/class/commonobject.class.php
* \ingroup core * \ingroup core
* \brief File of parent class of all other business classes (invoices, contracts, proposals, orders, ...) * \brief File of parent class of all other business classes (invoices, contracts, proposals, orders, ...)
* \version $Id: commonobject.class.php,v 1.146 2011/07/13 16:55:25 eldy Exp $ * \version $Id: commonobject.class.php,v 1.145 2011/07/10 16:50:40 eldy Exp $
*/ */
@ -365,10 +365,9 @@ class CommonObject
* Return array with list of possible values for type of contacts * Return array with list of possible values for type of contacts
* @param source internal, external or all if not defined * @param source internal, external or all if not defined
* @param order Sort order by : code or rowid * @param order Sort order by : code or rowid
* @param option 0=Return array id->label, 1=Return array code->label * @return array List of type of contacts
* @return array Array list of type of contacts (id->label if option=0, code->label if option=1)
*/ */
function liste_type_contact($source='internal', $order='code', $option=0) function liste_type_contact($source='internal', $order='code')
{ {
global $langs; global $langs;
@ -391,8 +390,7 @@ class CommonObject
$transkey="TypeContact_".$this->element."_".$source."_".$obj->code; $transkey="TypeContact_".$this->element."_".$source."_".$obj->code;
$libelle_type=($langs->trans($transkey)!=$transkey ? $langs->trans($transkey) : $obj->libelle); $libelle_type=($langs->trans($transkey)!=$transkey ? $langs->trans($transkey) : $obj->libelle);
if (empty($option)) $tab[$obj->rowid]=$libelle_type; $tab[$obj->rowid]=$libelle_type;
else $tab[$obj->code]=$libelle_type;
$i++; $i++;
} }
return $tab; return $tab;

6
htdocs/core/class/conf.class.php
View File

@ -25,7 +25,7 @@
* \ingroup core * \ingroup core
* \brief Fichier de la classe de stockage de la config courante * \brief Fichier de la classe de stockage de la config courante
* \remarks La config est stockee dans le fichier conf/conf.php * \remarks La config est stockee dans le fichier conf/conf.php
* \version $Id: conf.class.php,v 1.61 2011/07/13 18:04:25 eldy Exp $ * \version $Id: conf.class.php,v 1.60 2011/07/09 05:28:42 hregis Exp $
*/ */
@ -145,13 +145,13 @@ class Conf
elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_TRIGGERS$/i',$key,$reg)) elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_TRIGGERS$/i',$key,$reg))
{ {
$modulename = strtolower($reg[1]); $modulename = strtolower($reg[1]);
$this->triggers_modules[] = '/'.$modulename.'/inc/triggers/'; // TODO Replace inc by includes to have same path than standard $this->triggers_modules[] = '/'.$modulename.'/inc/triggers/';
} }
// If this is constant for login method activated by a module // If this is constant for login method activated by a module
elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_LOGIN_METHOD$/i',$key,$reg)) elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_LOGIN_METHOD$/i',$key,$reg))
{ {
$modulename = strtolower($reg[1]); $modulename = strtolower($reg[1]);
$this->login_method_modules[] = DOL_DOCUMENT_ROOT.'/'.$modulename.'/inc/login/'; // TODO Replace inc by includes to have same path than standard $this->login_method_modules[] = DOL_DOCUMENT_ROOT.'/'.$modulename.'/inc/login/';
} }
// If this is constant for hook activated by a module. Value is list of hooked tabs separated with : // If this is constant for hook activated by a module. Value is list of hooked tabs separated with :
elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_HOOKS$/i',$key,$reg)) elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_HOOKS$/i',$key,$reg))

22
htdocs/core/class/html.formmail.class.php
View File

@ -22,7 +22,7 @@
* \file htdocs/core/class/html.formmail.class.php * \file htdocs/core/class/html.formmail.class.php
* \ingroup core * \ingroup core
* \brief Fichier de la classe permettant la generation du formulaire html d'envoi de mail unitaire * \brief Fichier de la classe permettant la generation du formulaire html d'envoi de mail unitaire
* \version $Id: html.formmail.class.php,v 1.32 2011/07/13 16:55:25 eldy Exp $ * \version $Id: html.formmail.class.php,v 1.31 2011/07/10 20:03:41 eldy Exp $
*/ */
require_once(DOL_DOCUMENT_ROOT ."/core/class/html.form.class.php"); require_once(DOL_DOCUMENT_ROOT ."/core/class/html.form.class.php");
@ -547,15 +547,15 @@ class FormMail
$defaultmessage=""; $defaultmessage="";
// TODO A partir du type, proposer liste de messages dans table llx_models // TODO A partir du type, proposer liste de messages dans table llx_models
if ($this->param["models"]=='body') { $defaultmessage=$this->withbody; }
if ($this->param["models"]=='facture_send') { $defaultmessage=$langs->transnoentities("PredefinedMailContentSendInvoice"); } if ($this->param["models"]=='facture_send') { $defaultmessage=$langs->transnoentities("PredefinedMailContentSendInvoice"); }
elseif ($this->param["models"]=='facture_relance') { $defaultmessage=$langs->transnoentities("PredefinedMailContentSendInvoiceReminder"); } if ($this->param["models"]=='facture_relance') { $defaultmessage=$langs->transnoentities("PredefinedMailContentSendInvoiceReminder"); }
elseif ($this->param["models"]=='propal_send') { $defaultmessage=$langs->transnoentities("PredefinedMailContentSendProposal"); } if ($this->param["models"]=='propal_send') { $defaultmessage=$langs->transnoentities("PredefinedMailContentSendProposal"); }
elseif ($this->param["models"]=='order_send') { $defaultmessage=$langs->transnoentities("PredefinedMailContentSendOrder"); } if ($this->param["models"]=='order_send') { $defaultmessage=$langs->transnoentities("PredefinedMailContentSendOrder"); }
elseif ($this->param["models"]=='order_supplier_send') { $defaultmessage=$langs->transnoentities("PredefinedMailContentSendSupplierOrder"); } if ($this->param["models"]=='order_supplier_send') { $defaultmessage=$langs->transnoentities("PredefinedMailContentSendSupplierOrder"); }
elseif ($this->param["models"]=='invoice_supplier_send') { $defaultmessage=$langs->transnoentities("PredefinedMailContentSendSupplierInvoice"); } if ($this->param["models"]=='invoice_supplier_send') { $defaultmessage=$langs->transnoentities("PredefinedMailContentSendSupplierInvoice"); }
elseif ($this->param["models"]=='shipping_send') { $defaultmessage=$langs->transnoentities("PredefinedMailContentSendShipping"); } if ($this->param["models"]=='shipping_send') { $defaultmessage=$langs->transnoentities("PredefinedMailContentSendShipping"); }
elseif ($this->param["models"]=='fichinter_send') { $defaultmessage=$langs->transnoentities("PredefinedMailContentSendFichInter"); } if ($this->param["models"]=='fichinter_send') { $defaultmessage=$langs->transnoentities("PredefinedMailContentSendFichInter"); }
elseif (! is_numeric($this->withbody)) { $defaultmessage=$this->withbody; }
if ($conf->paypal->enabled && $conf->global->PAYPAL_ADD_PAYMENT_URL) if ($conf->paypal->enabled && $conf->global->PAYPAL_ADD_PAYMENT_URL)
{ {
@ -565,12 +565,12 @@ class FormMail
if ($this->param["models"]=='order_send') if ($this->param["models"]=='order_send')
{ {
$url=getPaypalPaymentUrl('order',$this->substit['__ORDERREF__']); $url=getPaymentUrl('order',$this->substit['__ORDERREF__']);
$defaultmessage=$langs->transnoentities("PredefinedMailContentSendOrderWithPaypalLink",$url); $defaultmessage=$langs->transnoentities("PredefinedMailContentSendOrderWithPaypalLink",$url);
} }
if ($this->param["models"]=='facture_send') if ($this->param["models"]=='facture_send')
{ {
$url=getPaypalPaymentUrl('invoice',$this->substit['__FACREF__']); $url=getPaymentUrl('invoice',$this->substit['__FACREF__']);
$defaultmessage=$langs->transnoentities("PredefinedMailContentSendInvoiceWithPaypalLink",$url); $defaultmessage=$langs->transnoentities("PredefinedMailContentSendInvoiceWithPaypalLink",$url);
} }
} }

14
htdocs/includes/triggers/interface_modAgenda_ActionsAuto.class.php
View File

@ -22,7 +22,7 @@
* \file htdocs/includes/triggers/interface_modAgenda_ActionsAuto.class.php * \file htdocs/includes/triggers/interface_modAgenda_ActionsAuto.class.php
* \ingroup agenda * \ingroup agenda
* \brief Trigger file for agenda module * \brief Trigger file for agenda module
* \version $Id: interface_modAgenda_ActionsAuto.class.php,v 1.34 2011/07/13 18:05:27 eldy Exp $ * \version $Id: interface_modAgenda_ActionsAuto.class.php,v 1.33 2011/07/07 09:18:27 simnandez Exp $
*/ */
@ -550,14 +550,8 @@ class InterfaceActionsAuto
{ {
$now=dol_now(); $now=dol_now();
require_once(DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php');
require_once(DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php');
$contactforaction=new Contact($this->db);
$societeforaction=new Societe($this->db);
if ($object->sendtoid > 0) $contactforaction->fetch($object->sendtoid);
if ($object->socid > 0) $societeforaction->fetch($object->socid);
// Insertion action // Insertion action
require_once(DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php');
require_once(DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php'); require_once(DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php');
$actioncomm = new ActionComm($this->db); $actioncomm = new ActionComm($this->db);
$actioncomm->type_code = $object->actiontypecode; $actioncomm->type_code = $object->actiontypecode;
@ -568,8 +562,8 @@ class InterfaceActionsAuto
$actioncomm->durationp = 0; $actioncomm->durationp = 0;
$actioncomm->punctual = 1; $actioncomm->punctual = 1;
$actioncomm->percentage = -1; // Not applicable $actioncomm->percentage = -1; // Not applicable
$actioncomm->contact = $contactforaction; $actioncomm->contact = new Contact($this->db,$object->sendtoid);
$actioncomm->societe = $societeforaction; $actioncomm->societe = new Societe($this->db,$object->socid);
$actioncomm->author = $user; // User saving action $actioncomm->author = $user; // User saving action
//$actioncomm->usertodo = $user; // User affected to action //$actioncomm->usertodo = $user; // User affected to action
$actioncomm->userdone = $user; // User doing action $actioncomm->userdone = $user; // User doing action

2
htdocs/langs/fr_FR/categories.lang
View File

@ -42,7 +42,7 @@ ErrCatAlreadyExists=Ce nom est déjà utilisé
AddProductToCat=Ajouter ce produit à une catégorie ? AddProductToCat=Ajouter ce produit à une catégorie ?
ImpossibleAddCat=Impossible d'ajouter la catégorie ImpossibleAddCat=Impossible d'ajouter la catégorie
ImpossibleAssociateCategory=Impossible d'associer la catégorie ImpossibleAssociateCategory=Impossible d'associer la catégorie
WasAddedSuccessfully=<b>%s</b> a été ajouté avec succès. WasAddedSuccessfully=<b>%s</b> a été ajoutée avec succès.
ObjectAlreadyLinkedToCategory=L'élément est déjà lié à cette catégorie. ObjectAlreadyLinkedToCategory=L'élément est déjà lié à cette catégorie.
CategorySuccessfullyCreated=La catégorie %s a été ajouté avec succès. CategorySuccessfullyCreated=La catégorie %s a été ajouté avec succès.
ProductIsInCategories=Ce produit/service est dans les catégories suivantes ProductIsInCategories=Ce produit/service est dans les catégories suivantes

4
htdocs/paypal/lib/paypal.lib.php
View File

@ -22,7 +22,7 @@
* \file htdocs/paypal/lib/paypal.lib.php * \file htdocs/paypal/lib/paypal.lib.php
* \ingroup paypal * \ingroup paypal
* \brief Library for common paypal functions * \brief Library for common paypal functions
* \version $Id: paypal.lib.php,v 1.25 2011/07/13 16:55:34 eldy Exp $ * \version $Id$
*/ */
function llxHeaderPaypal($title, $head = "") function llxHeaderPaypal($title, $head = "")
{ {
@ -153,7 +153,7 @@ function paypaladmin_prepare_head()
/** /**
* *
*/ */
function getPaypalPaymentUrl($source='',$ref='',$amount=0,$freetag='') function getPaymentUrl($source='',$ref='',$amount=0,$freetag='')
{ {
global $conf; global $conf;

12
htdocs/societe/socnote.php
View File

@ -23,7 +23,7 @@
* \file htdocs/societe/socnote.php * \file htdocs/societe/socnote.php
* \brief Tab for notes on third party * \brief Tab for notes on third party
* \ingroup societe * \ingroup societe
* \version $Id: socnote.php,v 1.22 2011/07/13 16:24:57 eldy Exp $ * \version $Id$
*/ */
require("../main.inc.php"); require("../main.inc.php");
@ -44,7 +44,7 @@ $result = restrictedArea($user, 'societe', $socid);
* Actions * Actions
*/ */
if ($action == 'add' && ! GETPOST('cancel')) if ($action == 'add')
{ {
$sql = "UPDATE ".MAIN_DB_PREFIX."societe SET note='".$db->escape($_POST["note"])."' WHERE rowid=".$_POST["socid"]; $sql = "UPDATE ".MAIN_DB_PREFIX."societe SET note='".$db->escape($_POST["note"])."' WHERE rowid=".$_POST["socid"];
$result = $db->query($sql); $result = $db->query($sql);
@ -133,11 +133,7 @@ if ($socid > 0)
if ($action == 'edit') if ($action == 'edit')
{ {
print '<tr><td colspan="2" align="center">'; print '<tr><td colspan="2" align="center"><input type="submit" class="button" value="'.$langs->trans("Save").'"></td></tr>';
print '<input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
print ' &nbsp; ';
print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
print '</td></tr>';
} }
print "</table>"; print "</table>";
@ -167,5 +163,5 @@ if ($action != 'edit')
$db->close(); $db->close();
llxFooter('$Date: 2011/07/13 16:24:57 $ - $Revision: 1.22 $'); llxFooter('$Date$ - $Revision$');
?> ?>