From 9a1919238ff364afba788ca3d82210cfcc031b80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= Date: Tue, 4 Mar 2014 08:19:59 +0100 Subject: [PATCH 1/5] TCPDF: Replaced missing courier monotype font by provided freemono The courier font is missing from TCPDF's directory. This leads to "TCPDF ERROR: Could not include font definition file: courier" being outputed by PHP when the library attempts to render an element with a monotyped font. Use freemono instead since it's a better alternative (e.g. supports more glyphs) and is already shipped with Dolibarr. --- htdocs/includes/tcpdf/tcpdf.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/includes/tcpdf/tcpdf.php b/htdocs/includes/tcpdf/tcpdf.php index 1d11d636fcd..b500e2d70bf 100644 --- a/htdocs/includes/tcpdf/tcpdf.php +++ b/htdocs/includes/tcpdf/tcpdf.php @@ -1258,7 +1258,7 @@ class TCPDF { * @protected * @since 4.5.025 (2009-03-10) */ - protected $default_monospaced_font = 'courier'; + protected $default_monospaced_font = 'freemono'; /** * Cloned copy of the current class object. From e2b29bb108904b8f743d7705647353192fcf0a77 Mon Sep 17 00:00:00 2001 From: philippe Date: Wed, 5 Mar 2014 09:57:36 +0100 Subject: [PATCH 2/5] fix english misspelling --- ChangeLog | 12 ++--- htdocs/comm/action/class/actioncomm.class.php | 6 +-- htdocs/core/class/commonobject.class.php | 4 +- htdocs/core/class/extrafields.class.php | 46 +++++++++---------- htdocs/core/class/html.form.class.php | 12 ++--- htdocs/core/lib/security.lib.php | 10 ++-- htdocs/core/triggers/README | 30 ++++++------ .../install/mysql/tables/llx_actioncomm.sql | 2 +- htdocs/langs/zh_CN/paypal.lang | 2 +- htdocs/langs/zh_TW/paypal.lang | 2 +- htdocs/main.inc.php | 2 +- .../company/actions_card_company.class.php | 8 ++-- .../actions_card_individual.class.php | 8 ++-- htdocs/user/class/user.class.php | 4 +- 14 files changed, 74 insertions(+), 74 deletions(-) diff --git a/ChangeLog b/ChangeLog index c400db96fe9..dd9c26677d0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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. diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php index 37b31f5c1fb..ee9e4c032ee 100644 --- a/htdocs/comm/action/class/actioncomm.class.php +++ b/htdocs/comm/action/class/actioncomm.class.php @@ -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 diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index 9f96f3ff8ec..8efd364dbf4 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -5,7 +5,7 @@ * Copyright (C) 2012 Christophe Battarel * Copyright (C) 2010-2011 Juanjo Menent * Copyright (C) 2012-2013 Christophe Battarel - * Copyright (C) 2011-2012 Philippe Grand + * Copyright (C) 2011-2014 Philippe Grand * Copyright (C) 2012 Marcos García * * 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='') { diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php index 128dec24d8c..c35fad153b4 100644 --- a/htdocs/core/class/extrafields.class.php +++ b/htdocs/core/class/extrafields.class.php @@ -1,25 +1,25 @@ * Copyright (C) 2002-2003 Jean-Louis Bergamo -* Copyright (C) 2004 Sebastien Di Cintio -* Copyright (C) 2004 Benoit Mortier -* Copyright (C) 2009-2012 Laurent Destailleur -* Copyright (C) 2009-2012 Regis Houssin -* Copyright (C) 2013 Florian Henry -* -* 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 . -*/ + * Copyright (C) 2004 Sebastien Di Cintio + * Copyright (C) 2004 Benoit Mortier + * Copyright (C) 2009-2012 Laurent Destailleur + * Copyright (C) 2009-2012 Regis Houssin + * Copyright (C) 2013 Florian Henry + * + * 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 . + */ /** * \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', ...) diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index deeb7c122be..3574c841339 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -10,10 +10,10 @@ * Copyright (C) 2007 Franky Van Liedekerke * Copyright (C) 2007 Patrick Raguin * Copyright (C) 2010 Juanjo Menent - * Copyright (C) 2010 Philippe Grand + * Copyright (C) 2010-2014 Philippe Grand * Copyright (C) 2011 Herve Prot * Copyright (C) 2012 Marcos García - * Copyright (C) 2013 Raphaël Doursenaud + * Copyright (C) 2013 Raphaël Doursenaud * * 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 '' diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php index b9dcda4b55a..edb89a1d8a8 100644 --- a/htdocs/core/lib/security.lib.php +++ b/htdocs/core/lib/security.lib.php @@ -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 */ diff --git a/htdocs/core/triggers/README b/htdocs/core/triggers/README index b54c3809ab1..30692943fe5 100644 --- a/htdocs/core/triggers/README +++ b/htdocs/core/triggers/README @@ -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. + diff --git a/htdocs/install/mysql/tables/llx_actioncomm.sql b/htdocs/install/mysql/tables/llx_actioncomm.sql index 906188d8ceb..1dce458fb72 100644 --- a/htdocs/install/mysql/tables/llx_actioncomm.sql +++ b/htdocs/install/mysql/tables/llx_actioncomm.sql @@ -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 diff --git a/htdocs/langs/zh_CN/paypal.lang b/htdocs/langs/zh_CN/paypal.lang index 2b9d05a9947..c2c166b3257 100644 --- a/htdocs/langs/zh_CN/paypal.lang +++ b/htdocs/langs/zh_CN/paypal.lang @@ -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=这是交易编号：%s PAYPAL_ADD_PAYMENT_URL=当你邮寄一份文件，添加URL Paypal付款 PAYPAL_IPN_MAIL_ADDRESS=E-mail地址，即时付款通知（IPN） diff --git a/htdocs/langs/zh_TW/paypal.lang b/htdocs/langs/zh_TW/paypal.lang index 72d4f3b1d64..0c45f0fbdff 100644 --- a/htdocs/langs/zh_TW/paypal.lang +++ b/htdocs/langs/zh_TW/paypal.lang @@ -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=這是交易編號：%s PAYPAL_ADD_PAYMENT_URL=當你郵寄一份文件，添加URL Paypal付款 PAYPAL_IPN_MAIL_ADDRESS=E-mail地址，即時付款通知（IPN） diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 419730c5bb1..944aedbdc88 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -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'])) diff --git a/htdocs/societe/canvas/company/actions_card_company.class.php b/htdocs/societe/canvas/company/actions_card_company.class.php index 13ad2739efc..f986f426fe8 100644 --- a/htdocs/societe/canvas/company/actions_card_company.class.php +++ b/htdocs/societe/canvas/company/actions_card_company.class.php @@ -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') diff --git a/htdocs/societe/canvas/individual/actions_card_individual.class.php b/htdocs/societe/canvas/individual/actions_card_individual.class.php index 4c35e98bd97..85449440f7b 100644 --- a/htdocs/societe/canvas/individual/actions_card_individual.class.php +++ b/htdocs/societe/canvas/individual/actions_card_individual.class.php @@ -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') diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php index 25fc77311ac..0bc8a018583 100644 --- a/htdocs/user/class/user.class.php +++ b/htdocs/user/class/user.class.php @@ -7,7 +7,7 @@ * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2005 Lionel Cousteix * Copyright (C) 2011 Herve Prot - * Copyright (C) 2013 Philippe Grand + * Copyright (C) 2013-2014 Philippe Grand * Copyright (C) 2013 Alexandre Spangaro * * 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) From e32d31f76dbb5ccbd439f14a6e86406ae47e6ffc Mon Sep 17 00:00:00 2001 From: Grand Philippe Date: Wed, 5 Mar 2014 09:58:52 +0100 Subject: [PATCH 3/5] fix english misspelling --- htdocs/core/triggers/README | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/htdocs/core/triggers/README b/htdocs/core/triggers/README index 30692943fe5..5fff755c357 100644 --- a/htdocs/core/triggers/README +++ b/htdocs/core/triggers/README @@ -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 optional 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. + From a80ecc805279200806ca84b9f26cbb927e9c0ac1 Mon Sep 17 00:00:00 2001 From: KreizIT Date: Wed, 5 Mar 2014 12:06:01 +0100 Subject: [PATCH 4/5] Correct multiline comments not manage by dolibarr Avoid error in loading data and also loading data which not be to. --- htdocs/install/mysql/data/llx_accounting.sql | 100 +++++++++---------- 1 file changed, 50 insertions(+), 50 deletions(-) diff --git a/htdocs/install/mysql/data/llx_accounting.sql b/htdocs/install/mysql/data/llx_accounting.sql index 0b2852117af..8720a2aedd5 100644 --- a/htdocs/install/mysql/data/llx_accounting.sql +++ b/htdocs/install/mysql/data/llx_accounting.sql @@ -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 (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 (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 (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 (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 (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 (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 (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 (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 (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 (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 (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 (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 (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 (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 (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 (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 (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 (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 (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 (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 (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 (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 (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 (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 (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'); -*/ +-- 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 (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 (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 (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 (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 (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 (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 (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 (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 (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 (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 (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 (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 (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 (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 (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 (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 (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 (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 (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 (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 (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 (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 (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 (1398, 'PCMN-BASE', 'HBILAN', 'XXXXXX', '09', '0', 'Droits et engagements divers', '1'); +-- */ From 2f150a89276d8cf9b42ae7ee234234a2d3c3f55c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= Date: Thu, 6 Mar 2014 18:15:50 +0100 Subject: [PATCH 5/5] Updated dolibarr_changes --- dev/dolibarr_changes.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dev/dolibarr_changes.txt b/dev/dolibarr_changes.txt index 2bf2e1a5c99..7f3490da165 100644 --- a/dev/dolibarr_changes.txt +++ b/dev/dolibarr_changes.txt @@ -39,6 +39,11 @@ into // initialize subsetchars $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: --------