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

Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2014-03-06 18:27:09 +01:00
commit 0283c16a47
17 changed files with 116 additions and 111 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. use the "print" view on screen.
- New: Add a menu entry to a barcode generation page. - 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 - 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: Add button cancel into edition of notes.
- New: Improved Opensurvey module and added options to disable comments and disable - New: Improved Opensurvey module and added options to disable comments and disable
public votes. public votes.
@ -56,8 +56,8 @@ Dolibarr better:
- The deprecated way (with 4 parameters) to declare a new tab into a module descriptor file has been - 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. 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. - Remove the javascript function ac_delay() that is not used anymore by core code.
- Properties "dictionnaries" into module descriptor files has been renamed into "dictionaries". - Properties "dictionaries" into module descriptor files has been renamed into "dictionaries".
@ -66,7 +66,7 @@ Fix: Do not report trigger errors twice.
Fix: Error when creating event was not reported. Fix: Error when creating event was not reported.
Fix: Bug of import of agenda when using https link Fix: Bug of import of agenda when using https link
Fix: Field nature not saved correctly 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: Bad translation of date format for pt_BR.
Fix: priority field of agenda record is smallint. Fix: priority field of agenda record is smallint.
Fix: Missing loading of lang in some pages. Fix: Missing loading of lang in some pages.
@ -75,7 +75,7 @@ Fix: Link to paypal was invalid into email text.
Fix: ref and date of supplier invoice. Fix: ref and date of supplier invoice.
Fix: Check on bank account. Fix: Check on bank account.
Fix: Problem with file upload and download. 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 added option MAIN_DISABLE_AJAX_COMBOX to disable javascript
combo feature that is root cause of problem. combo feature that is root cause of problem.
Fix: [ bug #1231 ] PDF always generated in interventions Fix: [ bug #1231 ] PDF always generated in interventions
@ -1501,7 +1501,7 @@ For developers:
- Add Dolibarr triggers support on payments. - Add Dolibarr triggers support on payments.
- Add Dolibarr triggers on supplier and customers orders. - Add Dolibarr triggers on supplier and customers orders.
- Webcalendar triggers for actions on Member module. - 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. - Support for several RSS boxes in external RSS module. Setup easier.
- Can attach documents on Action, Orders, Invoices, Commercial proposals. - Can attach documents on Action, Orders, Invoices, Commercial proposals.
- Can attach contacts on proposals, orders, contracts, invoices. - Can attach contacts on proposals, orders, contracts, invoices.

5
dev/dolibarr_changes.txt
View File

@ -39,6 +39,11 @@ into
// initialize subsetchars // initialize subsetchars
$subsetchars = array_fill(0, 256, true); $subsetchars = array_fill(0, 256, true);
* Made freemono the default monotype font because we removed courier
In htdocs/includes/tcpdf/tcpdf.php
- protected $default_monospaced_font = 'courier';
+ protected $default_monospaced_font = 'freemono';
JSGANTT: JSGANTT:
-------- --------

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 $usertodo; // Object user that must do action
var $userdone; // Object user that did action var $userdone; // Object user that did action
var $societe; // Company linked to action (optionnal) var $societe; // Company linked to action (optional)
var $contact; // Contact linked tot action (optionnal) var $contact; // Contact linked to action (optional)
var $fk_project; // Id of project (optionnal) var $fk_project; // Id of project (optional)
// Properties for links to other objects // 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) 2012 Christophe Battarel <christophe.battarel@altairis.fr>
* Copyright (C) 2010-2011 Juanjo Menent <jmenent@2byte.es> * Copyright (C) 2010-2011 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2012-2013 Christophe Battarel <christophe.battarel@altairis.fr> * 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> * Copyright (C) 2012 Marcos García <marcosgdf@gmail.com>
* *
* This program is free software; you can redistribute it and/or modify * 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 int $rowid Id of line
* @param array $optionsArray Array resulting of call of extrafields->fetch_name_optionals_label() * @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='') function fetch_optionals($rowid,$optionsArray='')
{ {

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

@ -1,25 +1,25 @@
<?php <?php
/* Copyright (C) 2002-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2002-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2002-2003 Jean-Louis Bergamo <jlb@j1b.org> * Copyright (C) 2002-2003 Jean-Louis Bergamo <jlb@j1b.org>
* Copyright (C) 2004 Sebastien Di Cintio <sdicintio@ressource-toi.org> * Copyright (C) 2004 Sebastien Di Cintio <sdicintio@ressource-toi.org>
* Copyright (C) 2004 Benoit Mortier <benoit.mortier@opensides.be> * Copyright (C) 2004 Benoit Mortier <benoit.mortier@opensides.be>
* Copyright (C) 2009-2012 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2009-2012 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2009-2012 Regis Houssin <regis.houssin@capnetworks.com> * Copyright (C) 2009-2012 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2013 Florian Henry <forian.henry@open-concept.pro> * Copyright (C) 2013 Florian Henry <forian.henry@open-concept.pro>
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
/** /**
* \file htdocs/core/class/extrafields.class.php * \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. * This is a private method. For public method, use addExtraField.
* *
* @param string $attrname code of attribute * @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 $attrname code of attribute
* @param string $label label 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 $attrname Code of attribute to delete
* @param string $elementtype Element type ('member', 'product', 'company', 'contact', ...) * @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 $attrname Code of attribute to delete
* @param string $elementtype Element type ('member', 'product', 'company', ...) * @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 Franky Van Liedekerke <franky.van.liedekerker@telenet.be>
* Copyright (C) 2007 Patrick Raguin <patrick.raguin@gmail.com> * Copyright (C) 2007 Patrick Raguin <patrick.raguin@gmail.com>
* Copyright (C) 2010 Juanjo Menent <jmenent@2byte.es> * 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) 2011 Herve Prot <herve.prot@symeos.com>
* Copyright (C) 2012 Marcos García <marcosgdf@gmail.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 * 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 * 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 $selected Preselected type
* @param string $htmlname Name of field in form * @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 $showempty Add an empty field
* @param int $showtype Show third party type in combolist (customer, prospect or supplier) * @param int $showtype Show third party type in combolist (customer, prospect or supplier)
* @param int $forcecombo Force to use combo box * @param int $forcecombo Force to use combo box
@ -742,7 +742,7 @@ class Form
* *
* @param string $selected Preselected type * @param string $selected Preselected type
* @param string $htmlname Name of field in form * @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 $showempty Add an empty field
* @param int $showtype Show third party type in combolist (customer, prospect or supplier) * @param int $showtype Show third party type in combolist (customer, prospect or supplier)
* @param int $forcecombo Force to use combo box * @param int $forcecombo Force to use combo box
@ -3196,7 +3196,7 @@ class Form
* @param string $page Page * @param string $page Page
* @param string $selected Id preselected * @param string $selected Id preselected
* @param string $htmlname Name of HTML select * @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 $showempty Add an empty field
* @param int $showtype Show third party type in combolist (customer, prospect or supplier) * @param int $showtype Show third party type in combolist (customer, prospect or supplier)
* @param int $forcecombo Force to use combo box * @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 : * Fields are preselected with :
* - set_time date (Local PHP server timestamps or date format YYYY-MM-DD or YYYY-MM-DD HH:MM) * - 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 '' * - 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 User $user User to check
* @param string $features Features to check (it must be module name. Examples: 'societe', 'contact', 'produit&service', ...) * @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 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 optionnal key to define where to check entity. Not used if objectid is null (optionnal) * @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 (optionnal) * @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 (optionnal) * @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 (optionnal) * @param string $dbt_select Field name for select if not rowid. Not used if objectid is null (optional)
* @param Canvas $objcanvas Object canvas * @param Canvas $objcanvas Object canvas
* @return int Always 1, die process if not allowed * @return int Always 1, die process if not allowed
*/ */

2
htdocs/core/triggers/README
View File

@ -10,6 +10,6 @@ where:
directory or value 'all' if not enabled by a particular module. directory or value 'all' if not enabled by a particular module.
> Mytrigger is name of the trigger. The PHP class inside the trigger file > Mytrigger is name of the trigger. The PHP class inside the trigger file
would be named InterfaceMytrigger. would be named InterfaceMytrigger.
> -NORUN is optionnal and disable completely a trigger file if set. To use > -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. a trigger with such a name, rename file to remove the -NORUN part.

2
htdocs/includes/tcpdf/tcpdf.php
View File

@ -1258,7 +1258,7 @@ class TCPDF {
* @protected * @protected
* @since 4.5.025 (2009-03-10) * @since 4.5.025 (2009-03-10)
*/ */
protected $default_monospaced_font = 'courier'; protected $default_monospaced_font = 'freemono';
/** /**
* Cloned copy of the current class object. * Cloned copy of the current class object.

100
htdocs/install/mysql/data/llx_accounting.sql
View File

@ -1400,54 +1400,54 @@ INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype,
INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1348, 'PCMN-BASE', 'PROD', 'XXXXXX', '792', '79', 'Prélèvement sur les réserves', '1'); INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1348, 'PCMN-BASE', 'PROD', 'XXXXXX', '792', '79', 'Prélèvement sur les réserves', '1');
INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1349, 'PCMN-BASE', 'PROD', 'XXXXXX', '793', '79', 'Perte à reporter', '1'); INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1349, 'PCMN-BASE', 'PROD', 'XXXXXX', '793', '79', 'Perte à reporter', '1');
INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1350, 'PCMN-BASE', 'PROD', 'XXXXXX', '794', '79', 'Intervention d''associés (ou du propriétaire) dans la perte', '1'); INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1350, 'PCMN-BASE', 'PROD', 'XXXXXX', '794', '79', 'Intervention d''associés (ou du propriétaire) dans la perte', '1');
/* -- dolibarr read and execute query line by line so /* is not effective and lead to error
INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1351, 'PCMN-BASE', 'HBILAN', 'XXXXXX', '00', '0', 'Garanties constituées par des tiers pour le compte de l''entreprise', '1'); -- INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1351, 'PCMN-BASE', 'HBILAN', 'XXXXXX', '00', '0', 'Garanties constituées par des tiers pour le compte de l''entreprise', '1');
INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1352, 'PCMN-BASE', 'HBILAN', 'XXXXXX', '00', '0', 'Créanciers, bénéficiaires de garanties de tiers', '1'); -- INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1352, 'PCMN-BASE', 'HBILAN', 'XXXXXX', '00', '0', 'Créanciers, bénéficiaires de garanties de tiers', '1');
INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1353, 'PCMN-BASE', 'HBILAN', 'XXXXXX', '01', '0', 'Tiers constituants de garanties pour compte de l''entreprise', '1'); -- INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1353, 'PCMN-BASE', 'HBILAN', 'XXXXXX', '01', '0', 'Tiers constituants de garanties pour compte de l''entreprise', '1');
INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1354, 'PCMN-BASE', 'HBILAN', 'XXXXXX', '01', '0', 'Garanties constituées pour compte de tiers', '1'); -- INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1354, 'PCMN-BASE', 'HBILAN', 'XXXXXX', '01', '0', 'Garanties constituées pour compte de tiers', '1');
INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1355, 'PCMN-BASE', 'HBILAN', 'XXXXXX', '010', '01', 'Débiteurs pour engagements sur effets', '1'); -- INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1355, 'PCMN-BASE', 'HBILAN', 'XXXXXX', '010', '01', 'Débiteurs pour engagements sur effets', '1');
INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1356, 'PCMN-BASE', 'HBILAN', 'XXXXXX', '011', '01', 'Créanciers d''engagements sur effets', '1'); -- INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1356, 'PCMN-BASE', 'HBILAN', 'XXXXXX', '011', '01', 'Créanciers d''engagements sur effets', '1');
INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1357, 'PCMN-BASE', 'HBILAN', 'XXXXXX', '0110', '011', 'Effets cédés par l''entreprise sous endos', '1'); -- INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1357, 'PCMN-BASE', 'HBILAN', 'XXXXXX', '0110', '011', 'Effets cédés par l''entreprise sous endos', '1');
INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1358, 'PCMN-BASE', 'HBILAN', 'XXXXXX', '0111', '011', 'Autres engagements sur effets en circulation', '1'); -- INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1358, 'PCMN-BASE', 'HBILAN', 'XXXXXX', '0111', '011', 'Autres engagements sur effets en circulation', '1');
INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1359, 'PCMN-BASE', 'HBILAN', 'XXXXXX', '012', '01', 'Débiteurs pour autres garanties personnelles', '1'); -- INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1359, 'PCMN-BASE', 'HBILAN', 'XXXXXX', '012', '01', 'Débiteurs pour autres garanties personnelles', '1');
INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1360, 'PCMN-BASE', 'HBILAN', 'XXXXXX', '013', '01', 'Créanciers d''autres garanties personnelles', '1'); -- INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1360, 'PCMN-BASE', 'HBILAN', 'XXXXXX', '013', '01', 'Créanciers d''autres garanties personnelles', '1');
INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1361, 'PCMN-BASE', 'HBILAN', 'XXXXXX', '02', '0', 'Garanties réelles constituées sur avoirs propres', '1'); -- INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1361, 'PCMN-BASE', 'HBILAN', 'XXXXXX', '02', '0', 'Garanties réelles constituées sur avoirs propres', '1');
INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1362, 'PCMN-BASE', 'HBILAN', 'XXXXXX', '020', '02', 'Créanciers de l''entreprise, bénéficiaires de garanties réelles', '1'); -- INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1362, 'PCMN-BASE', 'HBILAN', 'XXXXXX', '020', '02', 'Créanciers de l''entreprise, bénéficiaires de garanties réelles', '1');
INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1363, 'PCMN-BASE', 'HBILAN', 'XXXXXX', '021', '02', 'Garanties réelles constituées pour compte propre', '1'); -- INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1363, 'PCMN-BASE', 'HBILAN', 'XXXXXX', '021', '02', 'Garanties réelles constituées pour compte propre', '1');
INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1364, 'PCMN-BASE', 'HBILAN', 'XXXXXX', '022', '02', 'Créanciers de tiers, bénéficiaires de garanties réelles', '1'); -- INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1364, 'PCMN-BASE', 'HBILAN', 'XXXXXX', '022', '02', 'Créanciers de tiers, bénéficiaires de garanties réelles', '1');
INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1365, 'PCMN-BASE', 'HBILAN', 'XXXXXX', '023', '02', 'Garanties réelles constituées pour compte de tiers', '1'); -- INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1365, 'PCMN-BASE', 'HBILAN', 'XXXXXX', '023', '02', 'Garanties réelles constituées pour compte de tiers', '1');
INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1366, 'PCMN-BASE', 'HBILAN', 'XXXXXX', '03', '0', 'Garanties reçues', '1'); -- INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1366, 'PCMN-BASE', 'HBILAN', 'XXXXXX', '03', '0', 'Garanties reçues', '1');
INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1367, 'PCMN-BASE', 'HBILAN', 'XXXXXX', '030', '03', 'Dépôts statutaires', '1'); -- INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1367, 'PCMN-BASE', 'HBILAN', 'XXXXXX', '030', '03', 'Dépôts statutaires', '1');
INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1368, 'PCMN-BASE', 'HBILAN', 'XXXXXX', '031', '03', 'Déposants statutaires', '1'); -- INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1368, 'PCMN-BASE', 'HBILAN', 'XXXXXX', '031', '03', 'Déposants statutaires', '1');
INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1369, 'PCMN-BASE', 'HBILAN', 'XXXXXX', '032', '03', 'Garanties reçues', '1'); -- INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1369, 'PCMN-BASE', 'HBILAN', 'XXXXXX', '032', '03', 'Garanties reçues', '1');
INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1370, 'PCMN-BASE', 'HBILAN', 'XXXXXX', '033', '03', 'Constituants de garanties', '1'); -- INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1370, 'PCMN-BASE', 'HBILAN', 'XXXXXX', '033', '03', 'Constituants de garanties', '1');
INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1371, 'PCMN-BASE', 'HBILAN', 'XXXXXX', '04', '0', 'Biens te valeurs détenus pat des tiers en leur nom mais aux risques et profits de l''entreprise', '1'); -- INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1371, 'PCMN-BASE', 'HBILAN', 'XXXXXX', '04', '0', 'Biens te valeurs détenus pat des tiers en leur nom mais aux risques et profits de l''entreprise', '1');
INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1372, 'PCMN-BASE', 'HBILAN', 'XXXXXX', '040', '04', 'Tiers, détenteurs en leur nom mais aux risques et profits de l''entreprise de biens et de valeurs', '1'); -- INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1372, 'PCMN-BASE', 'HBILAN', 'XXXXXX', '040', '04', 'Tiers, détenteurs en leur nom mais aux risques et profits de l''entreprise de biens et de valeurs', '1');
INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1373, 'PCMN-BASE', 'HBILAN', 'XXXXXX', '041', '04', 'Biens et valeurs détenus par des tiers en leur nom mais aux risques et profits de l''entreprise', '1'); -- INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1373, 'PCMN-BASE', 'HBILAN', 'XXXXXX', '041', '04', 'Biens et valeurs détenus par des tiers en leur nom mais aux risques et profits de l''entreprise', '1');
INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1374, 'PCMN-BASE', 'HBILAN', 'XXXXXX', '05', '0', 'Engagements d''acquisition et de cession d''immobilisation', '1'); -- INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1374, 'PCMN-BASE', 'HBILAN', 'XXXXXX', '05', '0', 'Engagements d''acquisition et de cession d''immobilisation', '1');
INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1375, 'PCMN-BASE', 'HBILAN', 'XXXXXX', '050', '05', 'Engagements d''acquisition', '1'); -- INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1375, 'PCMN-BASE', 'HBILAN', 'XXXXXX', '050', '05', 'Engagements d''acquisition', '1');
INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1376, 'PCMN-BASE', 'HBILAN', 'XXXXXX', '051', '05', 'Créanciers d''engagements d''acquisition', '1'); -- INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1376, 'PCMN-BASE', 'HBILAN', 'XXXXXX', '051', '05', 'Créanciers d''engagements d''acquisition', '1');
INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1377, 'PCMN-BASE', 'HBILAN', 'XXXXXX', '052', '05', 'Débiteurs pour engagements de cession', '1'); -- INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1377, 'PCMN-BASE', 'HBILAN', 'XXXXXX', '052', '05', 'Débiteurs pour engagements de cession', '1');
INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1378, 'PCMN-BASE', 'HBILAN', 'XXXXXX', '053', '05', 'Engagements de cession', '1'); -- INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1378, 'PCMN-BASE', 'HBILAN', 'XXXXXX', '053', '05', 'Engagements de cession', '1');
INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1379, 'PCMN-BASE', 'HBILAN', 'XXXXXX', '06', '0', 'Marchés à terme', '1'); -- INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1379, 'PCMN-BASE', 'HBILAN', 'XXXXXX', '06', '0', 'Marchés à terme', '1');
INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1380, 'PCMN-BASE', 'HBILAN', 'XXXXXX', '060', '06', 'Marchandises achetées à terme - à recevoir', '1'); -- INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1380, 'PCMN-BASE', 'HBILAN', 'XXXXXX', '060', '06', 'Marchandises achetées à terme - à recevoir', '1');
INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1381, 'PCMN-BASE', 'HBILAN', 'XXXXXX', '061', '06', 'Créanciers pour marchandises achetées à terme', '1'); -- INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1381, 'PCMN-BASE', 'HBILAN', 'XXXXXX', '061', '06', 'Créanciers pour marchandises achetées à terme', '1');
INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1382, 'PCMN-BASE', 'HBILAN', 'XXXXXX', '062', '06', 'Débiteurs pour marchandises vendues à terme - à livrer', '1'); -- INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1382, 'PCMN-BASE', 'HBILAN', 'XXXXXX', '062', '06', 'Débiteurs pour marchandises vendues à terme - à livrer', '1');
INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1383, 'PCMN-BASE', 'HBILAN', 'XXXXXX', '063', '06', 'Marchandises vendues à terme - à livrer', '1'); -- INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1383, 'PCMN-BASE', 'HBILAN', 'XXXXXX', '063', '06', 'Marchandises vendues à terme - à livrer', '1');
INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1384, 'PCMN-BASE', 'HBILAN', 'XXXXXX', '064', '06', 'Devises achetées à terme - à recevoir', '1'); -- INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1384, 'PCMN-BASE', 'HBILAN', 'XXXXXX', '064', '06', 'Devises achetées à terme - à recevoir', '1');
INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1385, 'PCMN-BASE', 'HBILAN', 'XXXXXX', '065', '06', 'Créanciers pour devises achetées à terme', '1'); -- INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1385, 'PCMN-BASE', 'HBILAN', 'XXXXXX', '065', '06', 'Créanciers pour devises achetées à terme', '1');
INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1386, 'PCMN-BASE', 'HBILAN', 'XXXXXX', '066', '06', 'Débiteurs pour devises vendues à terme', '1'); -- INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1386, 'PCMN-BASE', 'HBILAN', 'XXXXXX', '066', '06', 'Débiteurs pour devises vendues à terme', '1');
INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1387, 'PCMN-BASE', 'HBILAN', 'XXXXXX', '067', '06', 'Devises vendues à terme - à livrer', '1'); -- INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1387, 'PCMN-BASE', 'HBILAN', 'XXXXXX', '067', '06', 'Devises vendues à terme - à livrer', '1');
INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1388, 'PCMN-BASE', 'HBILAN', 'XXXXXX', '07', '0', 'Biens et valeurs de tiers détenus pat l''entreprise', '1'); -- INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1388, 'PCMN-BASE', 'HBILAN', 'XXXXXX', '07', '0', 'Biens et valeurs de tiers détenus pat l''entreprise', '1');
INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1389, 'PCMN-BASE', 'HBILAN', 'XXXXXX', '070', '07', 'Droits d''usage à long terme', '1'); -- INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1389, 'PCMN-BASE', 'HBILAN', 'XXXXXX', '070', '07', 'Droits d''usage à long terme', '1');
INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1390, 'PCMN-BASE', 'HBILAN', 'XXXXXX', '0700', '070', 'Sur terrains et constructions', '1'); -- INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1390, 'PCMN-BASE', 'HBILAN', 'XXXXXX', '0700', '070', 'Sur terrains et constructions', '1');
INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1391, 'PCMN-BASE', 'HBILAN', 'XXXXXX', '0701', '070', 'Sur installations, machines et outillage', '1'); -- INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1391, 'PCMN-BASE', 'HBILAN', 'XXXXXX', '0701', '070', 'Sur installations, machines et outillage', '1');
INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1392, 'PCMN-BASE', 'HBILAN', 'XXXXXX', '0702', '070', 'Sur mobilier et matériel roulant', '1'); -- INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1392, 'PCMN-BASE', 'HBILAN', 'XXXXXX', '0702', '070', 'Sur mobilier et matériel roulant', '1');
INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1393, 'PCMN-BASE', 'HBILAN', 'XXXXXX', '071', '07', 'Créanciers de loyers et redevances', '1'); -- INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1393, 'PCMN-BASE', 'HBILAN', 'XXXXXX', '071', '07', 'Créanciers de loyers et redevances', '1');
INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1394, 'PCMN-BASE', 'HBILAN', 'XXXXXX', '072', '07', 'Biens et valeurs de tiers reçus en dépôt, en consignation ou à façon', '1'); -- INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1394, 'PCMN-BASE', 'HBILAN', 'XXXXXX', '072', '07', 'Biens et valeurs de tiers reçus en dépôt, en consignation ou à façon', '1');
INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1395, 'PCMN-BASE', 'HBILAN', 'XXXXXX', '073', '07', 'Commettants et déposants de biens et valeurs', '1'); -- INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1395, 'PCMN-BASE', 'HBILAN', 'XXXXXX', '073', '07', 'Commettants et déposants de biens et valeurs', '1');
INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1396, 'PCMN-BASE', 'HBILAN', 'XXXXXX', '074', '07', 'Biens et valeurs détenus pour compte ou aux risques et profits de tiers', '1'); -- INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1396, 'PCMN-BASE', 'HBILAN', 'XXXXXX', '074', '07', 'Biens et valeurs détenus pour compte ou aux risques et profits de tiers', '1');
INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1397, 'PCMN-BASE', 'HBILAN', 'XXXXXX', '075', '07', 'Créanciers de biens et valeurs détenus pour compte de tiers ou à leurs risques et profits', '1'); -- INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1397, 'PCMN-BASE', 'HBILAN', 'XXXXXX', '075', '07', 'Créanciers de biens et valeurs détenus pour compte de tiers ou à leurs risques et profits', '1');
INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1398, 'PCMN-BASE', 'HBILAN', 'XXXXXX', '09', '0', 'Droits et engagements divers', '1'); -- INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUE (1398, 'PCMN-BASE', 'HBILAN', 'XXXXXX', '09', '0', 'Droits et engagements divers', '1');
*/ -- */

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

@ -30,7 +30,7 @@ create table llx_actioncomm
datea datetime, -- deprecated datea datetime, -- deprecated
datea2 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 code varchar(32) NULL, -- code of action for automatic action
label varchar(128) NOT NULL, -- label/title of event 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=优惠“不可分割的”支付（信用卡+贝宝）或“贝宝”只 PAYPAL_API_INTEGRAL_OR_PAYPALONLY=优惠“不可分割的”支付（信用卡+贝宝）或“贝宝”只
PaypalModeIntegral=积分 PaypalModeIntegral=积分
PaypalModeOnlyPaypal=支付宝 PaypalModeOnlyPaypal=支付宝
PAYPAL_CSS_URL=optionnal付款页面的CSS样式表的URL PAYPAL_CSS_URL=optional付款页面的CSS样式表的URL
ThisIsTransactionId=这是交易编号<b>：%s</b> ThisIsTransactionId=这是交易编号<b>：%s</b>
PAYPAL_ADD_PAYMENT_URL=当你邮寄一份文件，添加URL Paypal付款 PAYPAL_ADD_PAYMENT_URL=当你邮寄一份文件，添加URL Paypal付款
PAYPAL_IPN_MAIL_ADDRESS=E-mail地址，即时付款通知（IPN） 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=優惠“不可分割的”支付（信用卡+貝寶）或“貝寶”只 PAYPAL_API_INTEGRAL_OR_PAYPALONLY=優惠“不可分割的”支付（信用卡+貝寶）或“貝寶”只
# PaypalModeIntegral=Integral # PaypalModeIntegral=Integral
# PaypalModeOnlyPaypal=PayPal only # PaypalModeOnlyPaypal=PayPal only
PAYPAL_CSS_URL=optionnal付款頁面的CSS樣式表的URL PAYPAL_CSS_URL=optional付款頁面的CSS樣式表的URL
ThisIsTransactionId=這是交易編號<b>：%s</b> ThisIsTransactionId=這是交易編號<b>：%s</b>
PAYPAL_ADD_PAYMENT_URL=當你郵寄一份文件，添加URL Paypal付款 PAYPAL_ADD_PAYMENT_URL=當你郵寄一份文件，添加URL Paypal付款
PAYPAL_IPN_MAIL_ADDRESS=E-mail地址，即時付款通知（IPN） 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 //@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. // A call first. Is the equivalent function dol_microtime_float not yet loaded.
$micro_start_time=0; $micro_start_time=0;
if (! empty($_SERVER['DOL_TUNING'])) 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 User $user User to check
* @param string $features Features to check (in most cases, it's module name) * @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 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 (optionnal) * @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 $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_keyfield Field name for socid foreign key if not fk_soc. (optional)
* @param string $dbt_select Field name for select if not rowid. (optionnal) * @param string $dbt_select Field name for select if not rowid. (optional)
* @return int 1 * @return int 1
*/ */
function restrictedArea($user, $features='societe', $objectid=0, $dbtablename='', $feature2='', $dbt_keyfield='fk_soc', $dbt_select='rowid') 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 User $user User to check
* @param string $features Features to check (in most cases, it's module name) * @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 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 (optionnal) * @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 $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_keyfield Field name for socid foreign key if not fk_soc. (optional)
* @param string $dbt_select Field name for select if not rowid. (optionnal) * @param string $dbt_select Field name for select if not rowid. (optional)
* @return int 1 * @return int 1
*/ */
function restrictedArea($user, $features='societe', $objectid=0, $dbtablename='', $feature2='', $dbt_keyfield='fk_soc', $dbt_select='rowid') 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-2012 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2005 Lionel Cousteix <etm_ltd@tiscali.co.uk> * Copyright (C) 2005 Lionel Cousteix <etm_ltd@tiscali.co.uk>
* Copyright (C) 2011 Herve Prot <herve.prot@symeos.com> * 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> * Copyright (C) 2013 Alexandre Spangaro <alexandre.spangaro@gmail.com>
* *
* This program is free software; you can redistribute it and/or modify * 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 * 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) * @param int $withpicto Include picto in link (0=No picto, 1=Inclut le picto dans le lien, 2=Picto seul)