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

fix english misspelling

Browse Source
This commit is contained in:
philippe 2014-03-05 09:57:36 +01:00
parent cdd2815d45
commit e2b29bb108
14 changed files with 74 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -14,7 +14,7 @@ For users:
use the "print" view on screen.
- New: Add a menu entry to a barcode generation page.
- New: Add option MAIN_AUTO_TIMESTAMP_IN_PUBLIC_NOTES and MAIN_AUTO_TIMESTAMP_IN_PRIVATE_NOTES
to automatically add timestamp and user line into editionf field when editing a note.
to automatically add timestamp and user line into edition field when editing a note.
- New: Add button cancel into edition of notes.
- New: Improved Opensurvey module and added options to disable comments and disable
public votes.
@ -54,8 +54,8 @@ Dolibarr better:
- The deprecated way (with 4 parameters) to declare a new tab into a module descriptor file has been
removed. You must now use the 6 parameters way. See file modMyModule.class.php for example.
- Remove the javascrit function ac_delay() that is not used anymore by core code.
- Properties "dictionnaries" into module descriptor files has been renamed into "dictionaries".
- Remove the javascript function ac_delay() that is not used anymore by core code.
- Properties "dictionaries" into module descriptor files has been renamed into "dictionaries".
@ -64,7 +64,7 @@ Fix: Do not report trigger errors twice.
Fix: Error when creating event was not reported.
Fix: Bug of import of agenda when using https link
Fix: Field nature not saved correctly
Fix: Substituion of extra field was ko for order
Fix: Substitution of extra field was ko for order
Fix: Bad translation of date format for pt_BR.
Fix: priority field of agenda record is smallint.
Fix: Missing loading of lang in some pages.
@ -73,7 +73,7 @@ Fix: Link to paypal was invalid into email text.
Fix: ref and date of supplier invoice.
Fix: Check on bank account.
Fix: Problem with file upload and download.
Fix: Page load not ending when large number of thirdparies. We
Fix: Page load not ending when large number of thirdparties. We
added option MAIN_DISABLE_AJAX_COMBOX to disable javascript
combo feature that is root cause of problem.
Fix: [ bug #1231 ] PDF always generated in interventions
@ -1499,7 +1499,7 @@ For developers:
- Add Dolibarr triggers support on payments.
- Add Dolibarr triggers on supplier and customers orders.
- Webcalendar triggers for actions on Member module.
- Support optionnal new javascript popup selector for date fields.
- Support optional new javascript popup selector for date fields.
- Support for several RSS boxes in external RSS module. Setup easier.
- Can attach documents on Action, Orders, Invoices, Commercial proposals.
- Can attach contacts on proposals, orders, contracts, invoices.

6
htdocs/comm/action/class/actioncomm.class.php
View File

@ -64,9 +64,9 @@ class ActionComm extends CommonObject
var $usertodo; // Object user that must do action
var $userdone; // Object user that did action
var $societe; // Company linked to action (optionnal)
var $contact; // Contact linked tot action (optionnal)
var $fk_project; // Id of project (optionnal)
var $societe; // Company linked to action (optional)
var $contact; // Contact linked to action (optional)
var $fk_project; // Id of project (optional)
// Properties for links to other objects

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

@ -5,7 +5,7 @@
* Copyright (C) 2012 Christophe Battarel <christophe.battarel@altairis.fr>
* Copyright (C) 2010-2011 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2012-2013 Christophe Battarel <christophe.battarel@altairis.fr>
* Copyright (C) 2011-2012 Philippe Grand <philippe.grand@atoo-net.com>
* Copyright (C) 2011-2014 Philippe Grand <philippe.grand@atoo-net.com>
* Copyright (C) 2012 Marcos García <marcosgdf@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
@ -2075,7 +2075,7 @@ abstract class CommonObject
*
* @param int $rowid Id of line
* @param array $optionsArray Array resulting of call of extrafields->fetch_name_optionals_label()
* @return int <0 if error, 0 if no optionals to find nor found, 1 if a line is found and optionnal loaded
* @return int <0 if error, 0 if no optionals to find nor found, 1 if a line is found and optional loaded
*/
function fetch_optionals($rowid,$optionsArray='')
{

46
htdocs/core/class/extrafields.class.php
View File

@ -1,25 +1,25 @@
<?php
/* Copyright (C) 2002-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2002-2003 Jean-Louis Bergamo <jlb@j1b.org>
* Copyright (C) 2004 Sebastien Di Cintio <sdicintio@ressource-toi.org>
* Copyright (C) 2004 Benoit Mortier <benoit.mortier@opensides.be>
* Copyright (C) 2009-2012 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2009-2012 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2013 Florian Henry <forian.henry@open-concept.pro>
*
* 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 <http://www.gnu.org/licenses/>.
*/
* Copyright (C) 2004 Sebastien Di Cintio <sdicintio@ressource-toi.org>
* Copyright (C) 2004 Benoit Mortier <benoit.mortier@opensides.be>
* Copyright (C) 2009-2012 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2009-2012 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2013 Florian Henry <forian.henry@open-concept.pro>
*
* 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 <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/core/class/extrafields.class.php
@ -135,7 +135,7 @@ class ExtraFields
}
/**
* Add a new optionnal attribute.
* Add a new optional attribute.
* This is a private method. For public method, use addExtraField.
*
* @param string $attrname code of attribute
@ -205,7 +205,7 @@ class ExtraFields
}
/**
* Add description of a new optionnal attribute
* Add description of a new optional attribute
*
* @param string $attrname code of attribute
* @param string $label label of attribute
@ -269,7 +269,7 @@ class ExtraFields
}
/**
* Delete an optionnal attribute
* Delete an optional attribute
*
* @param string $attrname Code of attribute to delete
* @param string $elementtype Element type ('member', 'product', 'company', 'contact', ...)
@ -300,7 +300,7 @@ class ExtraFields
}
/**
* Delete description of an optionnal attribute
* Delete description of an optional attribute
*
* @param string $attrname Code of attribute to delete
* @param string $elementtype Element type ('member', 'product', 'company', ...)

12
htdocs/core/class/html.form.class.php
View File

@ -10,10 +10,10 @@
* Copyright (C) 2007 Franky Van Liedekerke <franky.van.liedekerker@telenet.be>
* Copyright (C) 2007 Patrick Raguin <patrick.raguin@gmail.com>
* Copyright (C) 2010 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2010 Philippe Grand <philippe.grand@atoo-net.com>
* Copyright (C) 2010-2014 Philippe Grand <philippe.grand@atoo-net.com>
* Copyright (C) 2011 Herve Prot <herve.prot@symeos.com>
* Copyright (C) 2012 Marcos García <marcosgdf@gmail.com>
* Copyright (C) 2013 Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr>
* Copyright (C) 2013 Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr>
*
* 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
@ -724,7 +724,7 @@ class Form
*
* @param string $selected Preselected type
* @param string $htmlname Name of field in form
* @param string $filter Optionnal filters criteras (example: 's.rowid <> x')
* @param string $filter optional filters criteras (example: 's.rowid <> x')
* @param int $showempty Add an empty field
* @param int $showtype Show third party type in combolist (customer, prospect or supplier)
* @param int $forcecombo Force to use combo box
@ -742,7 +742,7 @@ class Form
*
* @param string $selected Preselected type
* @param string $htmlname Name of field in form
* @param string $filter Optionnal filters criteras (example: 's.rowid <> x')
* @param string $filter optional filters criteras (example: 's.rowid <> x')
* @param int $showempty Add an empty field
* @param int $showtype Show third party type in combolist (customer, prospect or supplier)
* @param int $forcecombo Force to use combo box
@ -3196,7 +3196,7 @@ class Form
* @param string $page Page
* @param string $selected Id preselected
* @param string $htmlname Name of HTML select
* @param string $filter Optionnal filters criteras
* @param string $filter optional filters criteras
* @param int $showempty Add an empty field
* @param int $showtype Show third party type in combolist (customer, prospect or supplier)
* @param int $forcecombo Force to use combo box
@ -3486,7 +3486,7 @@ class Form
/**
* Show a HTML widget to input a date or combo list for day, month, years and optionnaly hours and minutes
* Show a HTML widget to input a date or combo list for day, month, years and optionaly hours and minutes
* Fields are preselected with :
* - set_time date (Local PHP server timestamps or date format YYYY-MM-DD or YYYY-MM-DD HH:MM)
* - local date of PHP server if set_time is ''

10
htdocs/core/lib/security.lib.php
View File

@ -98,11 +98,11 @@ function dol_hash($chain,$type=0)
*
* @param User $user User to check
* @param string $features Features to check (it must be module name. Examples: 'societe', 'contact', 'produit&service', ...)
* @param int $objectid Object ID if we want to check a particular record (optionnal) is linked to a owned thirdparty (optionnal).
* @param string $dbtablename 'TableName&SharedElement' with Tablename is table where object is stored. SharedElement is an optionnal key to define where to check entity. Not used if objectid is null (optionnal)
* @param string $feature2 Feature to check, second level of permission (optionnal)
* @param string $dbt_keyfield Field name for socid foreign key if not fk_soc. Not used if objectid is null (optionnal)
* @param string $dbt_select Field name for select if not rowid. Not used if objectid is null (optionnal)
* @param int $objectid Object ID if we want to check a particular record (optional) is linked to a owned thirdparty (optional).
* @param string $dbtablename 'TableName&SharedElement' with Tablename is table where object is stored. SharedElement is an optional key to define where to check entity. Not used if objectid is null (optional)
* @param string $feature2 Feature to check, second level of permission (optional)
* @param string $dbt_keyfield Field name for socid foreign key if not fk_soc. Not used if objectid is null (optional)
* @param string $dbt_select Field name for select if not rowid. Not used if objectid is null (optional)
* @param Canvas $objcanvas Object canvas
* @return int Always 1, die process if not allowed
*/

30
htdocs/core/triggers/README
View File

@ -1,15 +1,15 @@
Directory content
--------------------------------------------------------
This directory contains all available Dolibarr triggers.
Trigger file name syntax is:
> interface_modModule_Mytrigger.php[-NORUN]
where:
> modModule is part of module descriptor file name found in core/modules
directory or value 'all' if not enabled by a particular module.
> Mytrigger is name of the trigger. The PHP class inside the trigger file
would be named InterfaceMytrigger.
> -NORUN is optionnal and disable completely a trigger file if set. To use
a trigger with such a name, rename file to remove the -NORUN part.
Directory content
--------------------------------------------------------
This directory contains all available Dolibarr triggers.
Trigger file name syntax is:
> interface_modModule_Mytrigger.php[-NORUN]
where:
> modModule is part of module descriptor file name found in core/modules
directory or value 'all' if not enabled by a particular module.
> Mytrigger is name of the trigger. The PHP class inside the trigger file
would be named InterfaceMytrigger.
> -NORUN is optional and disable completely a trigger file if set. To use
a trigger with such a name, rename file to remove the -NORUN part.

2
htdocs/install/mysql/tables/llx_actioncomm.sql
View File

@ -30,7 +30,7 @@ create table llx_actioncomm
datea datetime, -- deprecated
datea2 datetime, -- deprecated
fk_action integer, -- type of action (optionnal link with llx_c_actioncomm or null)
fk_action integer, -- type of action (optional link with llx_c_actioncomm or null)
code varchar(32) NULL, -- code of action for automatic action
label varchar(128) NOT NULL, -- label/title of event

2
htdocs/langs/zh_CN/paypal.lang
View File

@ -11,7 +11,7 @@ PAYPAL_API_SIGNATURE=API签名
PAYPAL_API_INTEGRAL_OR_PAYPALONLY=优惠“不可分割的”支付（信用卡+贝宝）或“贝宝”只
PaypalModeIntegral=积分
PaypalModeOnlyPaypal=支付宝
PAYPAL_CSS_URL=optionnal付款页面的CSS样式表的URL
PAYPAL_CSS_URL=optional付款页面的CSS样式表的URL
ThisIsTransactionId=这是交易编号<b>：%s</b>
PAYPAL_ADD_PAYMENT_URL=当你邮寄一份文件，添加URL Paypal付款
PAYPAL_IPN_MAIL_ADDRESS=E-mail地址，即时付款通知（IPN）

2
htdocs/langs/zh_TW/paypal.lang
View File

@ -11,7 +11,7 @@ PAYPAL_API_SIGNATURE=API簽名
PAYPAL_API_INTEGRAL_OR_PAYPALONLY=優惠“不可分割的”支付（信用卡+貝寶）或“貝寶”只
# PaypalModeIntegral=Integral
# PaypalModeOnlyPaypal=PayPal only
PAYPAL_CSS_URL=optionnal付款頁面的CSS樣式表的URL
PAYPAL_CSS_URL=optional付款頁面的CSS樣式表的URL
ThisIsTransactionId=這是交易編號<b>：%s</b>
PAYPAL_ADD_PAYMENT_URL=當你郵寄一份文件，添加URL Paypal付款
PAYPAL_IPN_MAIL_ADDRESS=E-mail地址，即時付款通知（IPN）

2
htdocs/main.inc.php
View File

@ -32,7 +32,7 @@
//@ini_set('memory_limit', '64M'); // This may be useless if memory is hard limited by your PHP
// For optionnal tuning. Enabled if environment variable DOL_TUNING is defined.
// For optional tuning. Enabled if environment variable DOL_TUNING is defined.
// A call first. Is the equivalent function dol_microtime_float not yet loaded.
$micro_start_time=0;
if (! empty($_SERVER['DOL_TUNING']))

8
htdocs/societe/canvas/company/actions_card_company.class.php
View File

@ -228,11 +228,11 @@ class ActionsCardCompany extends ActionsCardCommon
*
* @param User $user User to check
* @param string $features Features to check (in most cases, it's module name)
* @param int $objectid Object ID if we want to check permission on a particular record (optionnal)
* @param string $dbtablename Table name where object is stored. Not used if objectid is null (optionnal)
* @param int $objectid Object ID if we want to check permission on a particular record (optional)
* @param string $dbtablename Table name where object is stored. Not used if objectid is null (optional)
* @param string $feature2 Feature to check (second level of permission)
* @param string $dbt_keyfield Field name for socid foreign key if not fk_soc. (optionnal)
* @param string $dbt_select Field name for select if not rowid. (optionnal)
* @param string $dbt_keyfield Field name for socid foreign key if not fk_soc. (optional)
* @param string $dbt_select Field name for select if not rowid. (optional)
* @return int 1
*/
function restrictedArea($user, $features='societe', $objectid=0, $dbtablename='', $feature2='', $dbt_keyfield='fk_soc', $dbt_select='rowid')

8
htdocs/societe/canvas/individual/actions_card_individual.class.php
View File

@ -127,11 +127,11 @@ class ActionsCardIndividual extends ActionsCardCommon
*
* @param User $user User to check
* @param string $features Features to check (in most cases, it's module name)
* @param int $objectid Object ID if we want to check permission on a particular record (optionnal)
* @param string $dbtablename Table name where object is stored. Not used if objectid is null (optionnal)
* @param int $objectid Object ID if we want to check permission on a particular record (optional)
* @param string $dbtablename Table name where object is stored. Not used if objectid is null (optional)
* @param string $feature2 Feature to check (second level of permission)
* @param string $dbt_keyfield Field name for socid foreign key if not fk_soc. (optionnal)
* @param string $dbt_select Field name for select if not rowid. (optionnal)
* @param string $dbt_keyfield Field name for socid foreign key if not fk_soc. (optional)
* @param string $dbt_select Field name for select if not rowid. (optional)
* @return int 1
*/
function restrictedArea($user, $features='societe', $objectid=0, $dbtablename='', $feature2='', $dbt_keyfield='fk_soc', $dbt_select='rowid')

4
htdocs/user/class/user.class.php
View File

@ -7,7 +7,7 @@
* Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2005 Lionel Cousteix <etm_ltd@tiscali.co.uk>
* Copyright (C) 2011 Herve Prot <herve.prot@symeos.com>
* Copyright (C) 2013 Philippe Grand <philippe.grand@atoo-net.com>
* Copyright (C) 2013-2014 Philippe Grand <philippe.grand@atoo-net.com>
* Copyright (C) 2013 Alexandre Spangaro <alexandre.spangaro@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
@ -1762,7 +1762,7 @@ class User extends CommonObject
}
/**
* Return a link to the user card (with optionnaly the picto)
* Return a link to the user card (with optionaly the picto)
* Use this->id,this->lastname, this->firstname
*
* @param int $withpicto Include picto in link (0=No picto, 1=Inclut le picto dans le lien, 2=Picto seul)