diff --git a/.github/workflows/exakat.yml b/.github/workflows/exakat.yml index 26ea74183e4..d1bdffc71a6 100644 --- a/.github/workflows/exakat.yml +++ b/.github/workflows/exakat.yml @@ -22,7 +22,7 @@ jobs: - name: Exakat uses: docker://exakat/exakat-ga with: - ignore_rules: 'Classes/UseInstanceof,Performances/PrePostIncrement,Functions/UndefinedFunctions,Functions/WrongNumberOfArguments,Functions/WrongTypeWithCall,Variables/UndefinedVariable,Classes/DontUnsetProperties,Classes/NonPpp,Classes/StaticMethodsCalledFromObject,Classes/UseClassOperator,Functions/UsesDefaultArguments,Php/NoClassInGlobal,Php/ShouldUseCoalesce,Php/WrongTypeForNativeFunction,Structures/AddZero,Structures/DropElseAfterReturn,Structures/IfWithSameConditions,Structures/MergeIfThen,Structures/ElseIfElseif,Structures/ExitUsage,Structures/RepeatedPrint,Structures/RepeatedRegex,Structures/SameConditions,Structures/SwitchWithoutDefault,Structures/ShouldMakeTernary,Structures/UselessParenthesis,Structures/UseConstant' + ignore_rules: 'Classes/UseInstanceof,Performances/PrePostIncrement,Functions/UndefinedFunctions,Functions/WrongNumberOfArguments,Functions/WrongTypeWithCall,Variables/UndefinedVariable,Classes/DontUnsetProperties,Classes/NonPpp,Classes/StaticMethodsCalledFromObject,Classes/UseClassOperator,Functions/UsesDefaultArguments,Php/NoClassInGlobal,Php/ShouldUseCoalesce,Php/WrongTypeForNativeFunction,Structures/AddZero,Structures/DropElseAfterReturn,Structures/IfWithSameConditions,Structures/MergeIfThen,Structures/NestedTernary,Structures/ElseIfElseif,Structures/ExitUsage,Structures/RepeatedPrint,Structures/RepeatedRegex,Structures/SameConditions,Structures/SwitchWithoutDefault,Structures/ShouldMakeTernary,Structures/UselessParenthesis,Structures/UseConstant' ignore_dirs: '/htdocs/includes/,/htdocs/install/doctemplates/,/build/,/dev/,/doc/,/scripts/,/test/' file_extensions: php project_reports: Perfile \ No newline at end of file diff --git a/ChangeLog b/ChangeLog index 935b36fb78e..41341fa2d45 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,7 +3,15 @@ English Dolibarr ChangeLog -------------------------------------------------------------- -***** ChangeLog for 1.0.0 compared to 18.0.0 ***** +***** ChangeLog for 19.0.0 compared to 18.0.0 ***** + +For users: +---------- +... + +For developers or integrators: +------------------------------ +... WARNING: @@ -14,10 +22,44 @@ Following changes may create regressions for some external modules, but were nec +***** ChangeLog for 18.0.1 compared to 18.0.0 ***** +FIX: Adding a product in recurring invoice does not use the correct VAT +FIX: API /product/getAttributes +FIX: avoid php8 warnings +FIX: bad balance of TR tag in multicurrency price view +FIX: Bad calculation of localtax when price_base_type not defined. +FIX: Bad link into message +FIX: Bad message on menu to go to setup of accounting custom groups +FIX: Bank receipt was empty +FIX: Billing massaction should be possible on Processed Reception. +FIX: clone when cloning object with ->lines containing not object +FIX: Condition to show column POSModule and POSTerminal in invoice list +FIX: CSS +FIX: date survey : button to add dates would not work. Session would store cells numbers which would stay to 10 for next surveys created. +FIX: dir output path for ODT models on reception card +FIX: Duplicate tooltip on ref of an agenda event +FIX: encrypt sensitive data must not be done for const MAIN_AGENDA_ACTIONAUTO +FIX: Export when old file export_csv.modules.php is still present +FIX: fatal error with bad definition of dictionaries +FIX: fatal error with some parameters +FIX: hook formBuilddocOptions was broken when used by 2 modules +FIX: Line for revenuestamp in accountancy transfer must appear only if it exists +FIX: Navigation between bank receipts +FIX: payment card: misleading message when delete button disabled +FIX: reception odt dir output path +FIX: SQL request parenthesis +FIX: Suppliers addlines never have VAT if buyprice for this supplier not set +FIX: TakePOS receipt preview in admin #25648 +FIX: technical error on conciliation of lines +FIX: the account in chart of account to use for revenue stamp is on dict +FIX: url to check keyword not saved on partnership from public form +FIX: when adding new times on a survey, all hours would be erased. + + ***** ChangeLog for 18.0.0 compared to 17.0.0 ***** -For uses: ---------- +For users: +---------- NEW: PHP 8.2 compatibility (test not yet completed) NEW: Module Workstations Management upgraded to stable status diff --git a/dev/tools/apstats.php b/dev/tools/apstats.php index 6c45c68b617..271bd264270 100755 --- a/dev/tools/apstats.php +++ b/dev/tools/apstats.php @@ -230,6 +230,29 @@ th,td { .trgroup { background-color: #EEE; } +.seedetail { + color: #000088; +} +.box { + padding: 20px; + font-size: 1.2em; + margin-top: 10px; + margin-bottom: 10px; + width: 200px; +} +.box.inline-box { + display: inline-block; + text-align: center; + margin-left: 10px; +} +.back1 { + background-color: #888800; + color: #FFF; +} +.back1 { + background-color: #880088; + color: #FFF; +} '; $html .= ''; @@ -303,12 +326,14 @@ $html .= ''; $html .= '
'; $html .= '

Project value


'; -$html .= 'COCOMO (Basic organic model) value: $'; -$html .= formatNumber($arraycocomo['proj']['currency'] + $arraycocomo['dep']['currency'], 2); -$html .= '
'; -$html .= 'COCOMO (Basic organic model) effort: '; -$html .= formatNumber($arraycocomo['proj']['people'] * $arraycocomo['proj']['effort'] + $arraycocomo['dep']['people'] * $arraycocomo['dep']['effort']); -$html .= ' monthes people
'; +$html .= '
'; +$html .= 'COCOMO (Basic organic model) value:
'; +$html .= '$'.formatNumber($arraycocomo['proj']['currency'] + $arraycocomo['dep']['currency'], 2).''; +$html .= '
'; +$html .= '
'; +$html .= 'COCOMO (Basic organic model) effort
'; +$html .= ''.formatNumber($arraycocomo['proj']['people'] * $arraycocomo['proj']['effort'] + $arraycocomo['dep']['people'] * $arraycocomo['dep']['effort']); +$html .= ' monthes people
'; $html .= '
'; $html .= '
'; diff --git a/htdocs/accountancy/class/accountancysystem.class.php b/htdocs/accountancy/class/accountancysystem.class.php index 99f908e70e3..ddfa39c6309 100644 --- a/htdocs/accountancy/class/accountancysystem.class.php +++ b/htdocs/accountancy/class/accountancysystem.class.php @@ -2,6 +2,7 @@ /* Copyright (C) 2013-2014 Olivier Geffroy * Copyright (C) 2013-2014 Alexandre Spangaro * Copyright (C) 2013-2014 Florian Henry + * Copyright (C) 2023 Frédéric France * * 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 @@ -46,6 +47,13 @@ class AccountancySystem /** * @var int ID */ + public $id; + + /** + * @var int ID + * @deprecated + * @see $id + */ public $rowid; /** @@ -53,6 +61,21 @@ class AccountancySystem */ public $fk_pcg_version; + /** + * @var int pcg version + */ + public $pcg_version; + + /** + * @var string ref + */ + public $ref; + + /** + * @var int active + */ + public $active; + /** * @var string pcg type */ @@ -156,6 +179,7 @@ class AccountancySystem $id = $this->db->last_insert_id(MAIN_DB_PREFIX."accounting_system"); if ($id > 0) { + $this->id = $id; $this->rowid = $id; $result = $this->rowid; } else { diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php index 1170a20b969..1fd982f3567 100644 --- a/htdocs/accountancy/journal/purchasesjournal.php +++ b/htdocs/accountancy/journal/purchasesjournal.php @@ -72,6 +72,8 @@ if (!$user->hasRight('accounting', 'mouvements', 'lire')) { accessforbidden(); } +$error = 0; + /* * Actions @@ -182,6 +184,7 @@ if ($result) { $tabrctva = array(); $tabrclocaltax1 = array(); $tabrclocaltax2 = array(); + $vatdata_cache = array(); $num = $db->num_rows($result); @@ -208,7 +211,13 @@ if ($result) { } } - $vatdata = getTaxesFromId($obj->tva_tx.($obj->vat_src_code ? ' ('.$obj->vat_src_code.')' : ''), $mysoc, $mysoc, 0); + $tax_id = $obj->tva_tx . ($obj->vat_src_code ? ' (' . $obj->vat_src_code . ')' : ''); + if (array_key_exists($tax_id, $vatdata_cache)) { + $vatdata = $vatdata_cache[$tax_id]; + } else { + $vatdata = getTaxesFromId($tax_id, $mysoc, $mysoc, 0); + $vatdata_cache[$tax_id] = $vatdata; + } $compta_tva = (!empty($vatdata['accountancy_code_buy']) ? $vatdata['accountancy_code_buy'] : $cpttva); $compta_localtax1 = (!empty($vatdata['accountancy_code_buy']) ? $vatdata['accountancy_code_buy'] : $cpttva); $compta_localtax2 = (!empty($vatdata['accountancy_code_buy']) ? $vatdata['accountancy_code_buy'] : $cpttva); @@ -318,8 +327,16 @@ if ($result) { dol_print_error($db); } +// Check for too many invoices first. +if (count($tabfac) > 10000) { // Global config in htdocs/admin/const.php??? + $error++; + setEventMessages("TooManyInvoicesToProcessPleaseUseAMoreSelectiveFilter", null, 'errors'); +} + $errorforinvoice = array(); +/* +// Old way, 1 query for each invoice // Loop in invoices to detect lines with not binding lines foreach ($tabfac as $key => $val) { // Loop on each invoice $sql = "SELECT COUNT(fd.rowid) as nb"; @@ -336,12 +353,38 @@ foreach ($tabfac as $key => $val) { // Loop on each invoice dol_print_error($db); } } +*/ +// New way, single query, load all unbound lines +$sql = " +SELECT + fk_facture_fourn, + COUNT(fd.rowid) as nb +FROM + llx_facture_fourn_det as fd +WHERE + fd.product_type <= 2 + AND fd.fk_code_ventilation <= 0 + AND fd.total_ttc <> 0 + AND fk_facture_fourn IN (".$db->sanitize(join(",", array_keys($tabfac))).") +GROUP BY fk_facture_fourn +"; +$resql = $db->query($sql); + +$num = $db->num_rows($resql); +$i = 0; +while ($i < $num) { + $obj = $db->fetch_object($resql); + if ($obj->nb > 0) { + $errorforinvoice[$obj->fk_facture_fourn] = 'somelinesarenotbound'; + } + $i++; +} //var_dump($errorforinvoice);exit; // Bookkeeping Write -if ($action == 'writebookkeeping') { +if ($action == 'writebookkeeping' && !$error) { $now = dol_now(); $error = 0; @@ -712,7 +755,7 @@ if ($action == 'writebookkeeping') { $form = new Form($db); // Export -if ($action == 'exportcsv') { // ISO and not UTF8 ! +if ($action == 'exportcsv' && !$error) { // ISO and not UTF8 ! $sep = getDolGlobalString('ACCOUNTING_EXPORT_SEPARATORCSV'); $filename = 'journal'; diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php index 6ee2ae461ed..31986312388 100644 --- a/htdocs/accountancy/journal/sellsjournal.php +++ b/htdocs/accountancy/journal/sellsjournal.php @@ -74,6 +74,8 @@ if (!$user->hasRight('accounting', 'mouvements', 'lire')) { accessforbidden(); } +$error = 0; + /* * Actions @@ -360,7 +362,7 @@ foreach ($tabfac as $key => $val) { // Loop on each invoice // Bookkeeping Write -if ($action == 'writebookkeeping') { +if ($action == 'writebookkeeping' && !$error) { $now = dol_now(); $error = 0; @@ -764,7 +766,7 @@ if ($action == 'writebookkeeping') { $form = new Form($db); // Export -if ($action == 'exportcsv') { // ISO and not UTF8 ! +if ($action == 'exportcsv' && !$error) { // ISO and not UTF8 ! // Note that to have the button to get this feature enabled, you must enable ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL $sep = getDolGlobalString('ACCOUNTING_EXPORT_SEPARATORCSV'); diff --git a/htdocs/bookmarks/class/bookmark.class.php b/htdocs/bookmarks/class/bookmark.class.php index 389603fb161..afac3563dee 100644 --- a/htdocs/bookmarks/class/bookmark.class.php +++ b/htdocs/bookmarks/class/bookmark.class.php @@ -49,11 +49,6 @@ class Bookmark extends CommonObject */ public $picto = 'bookmark'; - /** - * @var DoliDB Database handler. - */ - public $db; - /** * Last error code on a local method * @var int Error number diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php index df69e0265c5..250d6c49aa0 100644 --- a/htdocs/commande/class/commande.class.php +++ b/htdocs/commande/class/commande.class.php @@ -82,6 +82,11 @@ class Commande extends CommonOrder */ public $ismultientitymanaged = 1; + /** + * @var int Does object support extrafields ? 0=No, 1=Yes + */ + public $isextrafieldmanaged = 1; + /** * 0=Default, 1=View may be restricted to sales representative only if no permission to see all or to company of external user if external user * @var integer diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index a7b625c1629..0b20b4ddae8 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -90,6 +90,11 @@ class Facture extends CommonInvoice */ public $ismultientitymanaged = 1; + /** + * @var int Does object support extrafields ? 0=No, 1=Yes + */ + public $isextrafieldmanaged = 1; + /** * 0=Default, 1=View may be restricted to sales representative only if no permission to see all or to company of external user if external user * @var integer diff --git a/htdocs/compta/paiement/class/cpaiement.class.php b/htdocs/compta/paiement/class/cpaiement.class.php index 683e9fc3679..7c7a275e8b6 100644 --- a/htdocs/compta/paiement/class/cpaiement.class.php +++ b/htdocs/compta/paiement/class/cpaiement.class.php @@ -25,17 +25,15 @@ * \brief This file is to manage CRUD function of type of payments */ +// Put here all includes required by your class file +require_once DOL_DOCUMENT_ROOT.'/core/class/commondict.class.php'; + /** * Class Cpaiement */ -class Cpaiement +class Cpaiement extends CommonDict { - /** - * @var DoliDB Database handler. - */ - public $db; - /** * @var string Id to identify managed objects */ @@ -46,18 +44,6 @@ class Cpaiement */ public $table_element = 'c_paiement'; - public $code; - - /** - * @var int ID - */ - public $id; - - /** - * @var string[] array of errors messages - */ - public $errors; - /** * @var string * @deprecated @@ -65,11 +51,6 @@ class Cpaiement */ public $libelle; - /** - * @var string - */ - public $label; - public $type; public $active; public $accountancy_code; diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php index 653fae23ff3..54c9f961f75 100644 --- a/htdocs/contact/class/contact.class.php +++ b/htdocs/contact/class/contact.class.php @@ -60,6 +60,11 @@ class Contact extends CommonObject */ public $ismultientitymanaged = 1; + /** + * @var int Does object support extrafields ? 0=No, 1=Yes + */ + public $isextrafieldmanaged = 1; + /** * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png */ diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php index e1bbbba56e0..bfec5a6c199 100644 --- a/htdocs/core/class/commondocgenerator.class.php +++ b/htdocs/core/class/commondocgenerator.class.php @@ -155,7 +155,10 @@ abstract class CommonDocGenerator public $posxdesc; // For description public $posxqty; public $posxpuht; - + public $posxtva; + public $atleastonephoto; + public $atleastoneratenotnull; + public $atleastonediscount; /** * Constructor diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index 78a98f77c6e..c5b3011e3bb 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -4315,6 +4315,9 @@ abstract class CommonObject if (empty($fk_object_where) || empty($field_where) || empty($table_element)) { return -1; } + if (!preg_match('/^[_a-zA-Z0-9]+$/', $field_select)) { + dol_syslog('Invalid value $field_select for parameter '.$field_select.' in call to getAllItemsLinkedByObjectID(). Must be a single field name.', LOG_ERR); + } global $db; @@ -4331,6 +4334,35 @@ abstract class CommonObject return $TRes; } + /** + * Count items linked to an object id in association table + * + * @param int $fk_object_where id of object we need to get linked items + * @param string $field_where name of field of object we need to get linked items + * @param string $table_element name of association table + * @return array|int Array of record, -1 if empty + */ + public static function getCountOfItemsLinkedByObjectID($fk_object_where, $field_where, $table_element) + { + if (empty($fk_object_where) || empty($field_where) || empty($table_element)) { + return -1; + } + + global $db; + + $sql = "SELECT COUNT(*) as nb FROM ".$db->prefix().$table_element." WHERE ".$field_where." = ".((int) $fk_object_where); + $resql = $db->query($sql); + $n = 0; + if ($resql) { + $res = $db->fetch_object($resql); + if ($res) { + $n = $res->nb; + } + } + + return $n; + } + /** * Function used to remove all items linked to an object id in association table * @@ -7493,13 +7525,13 @@ abstract class CommonObject * Return HTML string to show a field into a page * Code very similar with showOutputField of extra fields * - * @param array $val Array of properties of field to show - * @param string $key Key of attribute - * @param string $value Preselected value to show (for date type it must be in timestamp format, for amount or price it must be a php numeric value) - * @param string $moreparam To add more parametes on html input tag - * @param string $keysuffix Prefix string to add into name and id of field (can be used to avoid duplicate names) - * @param string $keyprefix Suffix string to add into name and id of field (can be used to avoid duplicate names) - * @param mixed $morecss Value for css to define size. May also be a numeric. + * @param array $val Array of properties of field to show + * @param string $key Key of attribute + * @param string $value Preselected value to show (for date type it must be in timestamp format, for amount or price it must be a php numeric value) + * @param string $moreparam To add more parameters on html tag + * @param string $keysuffix Prefix string to add into name and id of field (can be used to avoid duplicate names) + * @param string $keyprefix Suffix string to add into name and id of field (can be used to avoid duplicate names) + * @param mixed $morecss Value for CSS to use (Old usage: May also be a numeric to define a size). * @return string */ public function showOutputField($val, $key, $value, $moreparam = '', $keysuffix = '', $keyprefix = '', $morecss = '') diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php index bb7ff52a9f9..bbaed873c6a 100644 --- a/htdocs/core/class/conf.class.php +++ b/htdocs/core/class/conf.class.php @@ -287,7 +287,6 @@ class Conf $this->commande = new stdClass(); $this->propal = new stdClass(); $this->facture = new stdClass(); - $this->contrat = new stdClass(); $this->user = new stdClass(); $this->adherent = new stdClass(); $this->bank = new stdClass(); diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 13d5775196b..eecc41bd4eb 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -6606,7 +6606,7 @@ class Form * @param int $disabled Disable input fields * @param int $fullday When a checkbox with this html name is on, hour and day are set with 00:00 or 23:59 * @param string $addplusone Add a link "+1 hour". Value must be name of another select_date field. - * @param datetime $adddateof Add a link "Date of invoice" using the following date. + * @param int|string $adddateof Add a link "Date of invoice" using the following date. * @return string '' or HTML component string if nooutput is 1 * @deprecated * @see selectDate(), form_date(), select_month(), select_year(), select_dayofweek() @@ -6614,6 +6614,7 @@ class Form public function select_date($set_time = '', $prefix = 're', $h = 0, $m = 0, $empty = 0, $form_name = "", $d = 1, $addnowlink = 0, $nooutput = 0, $disabled = 0, $fullday = '', $addplusone = '', $adddateof = '') { // phpcs:enable + dol_syslog(__METHOD__ . ': using select_date is deprecated. Use selectDate instead.', LOG_WARNING); $retstring = $this->selectDate($set_time, $prefix, $h, $m, $empty, $form_name, $d, $addnowlink, $disabled, $fullday, $addplusone, $adddateof); if (!empty($nooutput)) { return $retstring; @@ -6668,7 +6669,7 @@ class Form * @param int $disabled Disable input fields * @param int $fullday When a checkbox with id #fullday is checked, hours are set with 00:00 (if value if 'fulldaystart') or 23:59 (if value is 'fulldayend') * @param string $addplusone Add a link "+1 hour". Value must be name of another selectDate field. - * @param datetime|string|array $adddateof Add a link "Date of ..." using the following date. Must be array(array('adddateof'=>..., 'labeladddateof'=>...)) + * @param int|string|array $adddateof Add a link "Date of ..." using the following date. Must be array(array('adddateof'=>..., 'labeladddateof'=>...)) * @param string $openinghours Specify hour start and hour end for the select ex 8,20 * @param int $stepminutes Specify step for minutes between 1 and 30 * @param string $labeladddateof Label to use for the $adddateof parameter. Deprecated. Used only when $adddateof is not an array. @@ -8055,6 +8056,9 @@ class Form // Search data $sql = "SELECT t.rowid, " . $fieldstoshow . " FROM " . $this->db->prefix() . $objecttmp->table_element . " as t"; + if (!empty($objecttmp->isextrafieldmanaged)) { + $sql .= " LEFT JOIN " . $this->db->prefix() . $objecttmp->table_element . "_extrafields as e ON t.rowid=e.fk_object"; + } if (isset($objecttmp->ismultientitymanaged)) { if (!is_numeric($objecttmp->ismultientitymanaged)) { $tmparray = explode('@', $objecttmp->ismultientitymanaged); diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php index d117140e156..264ed21b512 100644 --- a/htdocs/core/class/html.formmail.class.php +++ b/htdocs/core/class/html.formmail.class.php @@ -134,6 +134,7 @@ class FormMail extends Form public $withtocc; public $withtoccc; public $withtopic; + public $witherrorsto; /** * @var int 0=No attaches files, 1=Show attached files, 2=Can add new attached files @@ -150,13 +151,21 @@ class FormMail extends Form public $withreplytoreadonly; public $withtoreadonly; public $withtoccreadonly; + public $witherrorstoreadonly; public $withtocccreadonly; public $withtopicreadonly; + public $withbodyreadonly; public $withfilereadonly; public $withdeliveryreceipt; public $withcancel; + public $withdeliveryreceiptreadonly; public $withfckeditor; + /** + * @var string ckeditortoolbar + */ + public $ckeditortoolbar; + public $substit = array(); public $substit_lines = array(); public $param = array(); diff --git a/htdocs/core/class/html.formsms.class.php b/htdocs/core/class/html.formsms.class.php index 940f76d0ae8..8e20cb8d33c 100644 --- a/htdocs/core/class/html.formsms.class.php +++ b/htdocs/core/class/html.formsms.class.php @@ -62,6 +62,7 @@ class FormSms public $withreplytoreadonly; public $withtoreadonly; public $withtopicreadonly; + public $withbodyreadonly; public $withcancel; public $substit = array(); diff --git a/htdocs/core/class/lessc.class.php b/htdocs/core/class/lessc.class.php index f1620898028..29feea57f29 100644 --- a/htdocs/core/class/lessc.class.php +++ b/htdocs/core/class/lessc.class.php @@ -56,8 +56,12 @@ class Lessc public $scope; public $formatter; + public $formatterName; + public $parser; + public $_parseFile; public $env; public $count; + public $inExp; protected $numberPrecision = null; @@ -2640,7 +2644,15 @@ class lessc_parser protected static $literalCache = array(); public $env; + public $buffer; public $count; + public $line; + public $eatWhiteDefault; + public $lessc; + public $sourceName; + public $writeComments; + public $seenComments; + public $currentProperty; public function __construct($lessc, $sourceName = null) @@ -4245,6 +4257,7 @@ class lessc_formatter_classic public $breakSelectors = false; public $compressColors = false; + public $indentLevel; public function __construct() { diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 03974cb7737..710ad9f3dce 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -3133,7 +3133,7 @@ function dol_print_size($size, $shortvalue = 0, $shortunit = 0) * @param string $morecss More CSS * @return string HTML Link */ -function dol_print_url($url, $target = '_blank', $max = 32, $withpicto = 0, $morecss = 'float') +function dol_print_url($url, $target = '_blank', $max = 32, $withpicto = 0, $morecss = '') { global $langs; @@ -3141,26 +3141,30 @@ function dol_print_url($url, $target = '_blank', $max = 32, $withpicto = 0, $mor return ''; } - $link = 'trans("URL").': '.$url.'"'; + $linkstart .= '>'; + + $link = ''; if (!preg_match('/^http/i', $url)) { $link .= 'http://'; } $link .= dol_trunc($url, $max); - $link .= ''; - if ($morecss == 'float') { + $linkend = ''; + + if ($morecss == 'float') { // deprecated return '
'.($withpicto ?img_picto($langs->trans("Url"), 'globe').' ' : '').$link.'
'; } else { - return ''.($withpicto ?img_picto($langs->trans("Url"), 'globe').' ' : '').$link.''; + return $linkstart.''.($withpicto ?img_picto('', 'globe').' ' : '').$link.''.$linkend; } } @@ -3706,7 +3710,7 @@ function dol_print_phone($phone, $countrycode = '', $cid = 0, $socid = 0, $addli */ function dol_print_ip($ip, $mode = 0) { - global $conf, $langs; + global $langs; $ret = ''; diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php index 43b2c136044..07519ea55d2 100644 --- a/htdocs/core/lib/project.lib.php +++ b/htdocs/core/lib/project.lib.php @@ -214,7 +214,7 @@ function project_prepare_head(Project $project, $moreparam = '') if (isModEnabled('ticket') && $user->hasRight('ticket', 'read')) { require_once DOL_DOCUMENT_ROOT.'/ticket/class/ticket.class.php'; $Tickettatic = new Ticket($db); - $nbTicket = count($Tickettatic->getAllItemsLinkedByObjectID($project->id, '*', 'fk_project', 'ticket')); + $nbTicket = $Tickettatic->getCountOfItemsLinkedByObjectID($project->id, 'fk_project', 'ticket'); $head[$h][0] = DOL_URL_ROOT.'/ticket/list.php?projectid='.((int) $project->id); $head[$h][1] = $langs->trans("Ticket"); if ($nbTicket > 0) { diff --git a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php index 33b4a07c104..aaa8bad5ee7 100644 --- a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php +++ b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php @@ -329,6 +329,34 @@ class doc_generic_invoice_odt extends ModelePDFFactures } } + // and determine category of operation + $categoryOfOperation = 0; + $nbProduct = 0; + $nbService = 0; + foreach ($object->lines as $line) { + // determine category of operation + if ($categoryOfOperation < 2) { + $lineProductType = $line->product_type; + if ($lineProductType == Product::TYPE_PRODUCT) { + $nbProduct++; + } elseif ($lineProductType == Product::TYPE_SERVICE) { + $nbService++; + } + if ($nbProduct > 0 && $nbService > 0) { + // mixed products and services + $categoryOfOperation = 2; + } + } + } + + // determine category of operation + if ($categoryOfOperation <= 0) { + // only services + if ($nbProduct == 0 && $nbService > 0) { + $categoryOfOperation = 1; + } + } + // Make substitution $substitutionarray = array( '__FROM_NAME__' => $this->emetteur->name, @@ -402,6 +430,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures // TODO Search all tags {object_...:xxxx} into template then loop on this found tags to analyze them and the the corresponding // property of object and use the xxxx to know how to format it. // Before that, we hard code this substitution as if we have found them into the template. + $tmparray['object_PREVIOUS_MONTH'] = dol_print_date(dol_time_plus_duree($object->date, -1, 'm'), '%m'); $tmparray['object_MONTH'] = dol_print_date($object->date, '%m'); $tmparray['object_NEXT_MONTH'] = dol_print_date(dol_time_plus_duree($object->date, 1, 'm'), '%m'); @@ -411,6 +440,8 @@ class doc_generic_invoice_odt extends ModelePDFFactures $tmparray['object_PREVIOUS_YEAR'] = dol_print_date(dol_time_plus_duree($object->date, -1, 'y'), '%Y'); $tmparray['object_YEAR'] = dol_print_date($object->date, '%Y'); $tmparray['object_NEXT_YEAR'] = dol_print_date(dol_time_plus_duree($object->date, 1, 'y'), '%Y'); + $tmparray['object_productorservice_operation'] = $outputlangs->transnoentities("MentionCategoryOfOperations" . $categoryOfOperation); + // Call the ODTSubstitution hook $parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray); diff --git a/htdocs/core/modules/modPartnership.class.php b/htdocs/core/modules/modPartnership.class.php index b8aafc853fb..48244ae0455 100644 --- a/htdocs/core/modules/modPartnership.class.php +++ b/htdocs/core/modules/modPartnership.class.php @@ -253,8 +253,8 @@ class modPartnership extends DolibarrModules $datestart=dol_mktime(21, 15, 0, $arraydate['mon'], $arraydate['mday'], $arraydate['year']); $this->cronjobs = array( - 0 => array('priority'=>60, 'label'=>'CancelPartnershipForExpiredMembers', 'jobtype'=>'method', 'class'=>'/partnership/class/partnershiputils.class.php', 'objectname'=>'PartnershipUtils', 'method'=>'doCancelStatusOfMemberPartnership', 'parameters'=>'', 'comment'=>'Cancel status of partnership when subscription is expired + x days.', 'frequency'=>1, 'unitfrequency'=>86400, 'status'=>1, 'test'=>'$conf->partnership->enabled', 'datestart'=>$datestart), - 1 => array('priority'=>61, 'label'=>'PartnershipCheckBacklink', 'jobtype'=>'method', 'class'=>'/partnership/class/partnershiputils.class.php', 'objectname'=>'PartnershipUtils', 'method'=>'doWarningOfPartnershipIfDolibarrBacklinkNotfound', 'parameters'=>'', 'comment'=>'Warning of partnership if Dolibarr backlink not found on partner website.', 'frequency'=>1, 'unitfrequency'=>86400, 'status'=>0, 'test'=>'$conf->partnership->enabled', 'datestart'=>$datestart), + 0 => array('priority'=>60, 'label'=>'CancelPartnershipForExpiredMembers', 'jobtype'=>'method', 'class'=>'/partnership/class/partnershiputils.class.php', 'objectname'=>'PartnershipUtils', 'method'=>'doCancelStatusOfMemberPartnership', 'parameters'=>'', 'comment'=>'Cancel status of partnership when subscription is expired + x days.', 'frequency'=>1, 'unitfrequency'=>86400, 'status'=>1, 'test'=>'isModEnabled("partnership")', 'datestart'=>$datestart), + 1 => array('priority'=>61, 'label'=>'PartnershipCheckBacklink', 'jobtype'=>'method', 'class'=>'/partnership/class/partnershiputils.class.php', 'objectname'=>'PartnershipUtils', 'method'=>'doWarningOfPartnershipIfDolibarrBacklinkNotfound', 'parameters'=>'', 'comment'=>'Add a warning on partnership record if the backlink keyword is not found on the partner website.', 'frequency'=>1, 'unitfrequency'=>86400, 'status'=>0, 'test'=>'isModEnabled("partnership")', 'datestart'=>$datestart), ); // Permissions provided by this module diff --git a/htdocs/core/modules/project/doc/pdf_beluga.modules.php b/htdocs/core/modules/project/doc/pdf_beluga.modules.php index 0afff52ee73..a7cf4c50b96 100644 --- a/htdocs/core/modules/project/doc/pdf_beluga.modules.php +++ b/htdocs/core/modules/project/doc/pdf_beluga.modules.php @@ -88,10 +88,10 @@ class pdf_beluga extends ModelePDFProjects public $posxref; public $posxdate; - public $posxsociete; + public $posxsociety; public $posxamountht; public $posxamountttc; - public $posstatut; + public $posxstatut; /** @@ -156,10 +156,10 @@ class pdf_beluga extends ModelePDFProjects if ($this->page_largeur < 210) { // To work with US executive format $this->posxref -= 20; $this->posxdate -= 20; - $this->posxsociete -= 20; + $this->posxsociety -= 20; $this->posxamountht -= 20; $this->posxamountttc -= 20; - $this->posstatut -= 20; + $this->posxstatut -= 20; } } diff --git a/htdocs/don/class/don.class.php b/htdocs/don/class/don.class.php index c730c7d0b08..aad080fad2b 100644 --- a/htdocs/don/class/don.class.php +++ b/htdocs/don/class/don.class.php @@ -443,7 +443,6 @@ class Don extends CommonObject } } else { $this->error = $this->db->lasterror(); - $this->errno = $this->db->lasterrno(); $error++; } diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php index 0392bc8c4eb..967b4e9a4fb 100644 --- a/htdocs/expedition/class/expedition.class.php +++ b/htdocs/expedition/class/expedition.class.php @@ -79,6 +79,11 @@ class Expedition extends CommonObject */ public $ismultientitymanaged = 1; + /** + * @var int Does object support extrafields ? 0=No, 1=Yes + */ + public $isextrafieldmanaged = 1; + /** * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png */ diff --git a/htdocs/install/mysql/data/llx_accounting_abc.sql b/htdocs/install/mysql/data/llx_accounting_abc.sql index 00a961a5706..114f5eb6f08 100644 --- a/htdocs/install/mysql/data/llx_accounting_abc.sql +++ b/htdocs/install/mysql/data/llx_accounting_abc.sql @@ -71,6 +71,8 @@ INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUE -- Description of chart of account BE PCMN-BASE INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 2, 'PCMN-BASE', 'The base accountancy belgium plan', 1); +-- Description of chart of account BE PCMN-BASE +INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 2, 'MAR-VERKORT', 'The base accountancy belgium plan Dutch', 1); -- Description of chart of account ES PCG08-PYME INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 4, 'PCG08-PYME', 'The PYME accountancy spanish plan', 1); diff --git a/htdocs/install/mysql/data/llx_accounting_account_be.sql b/htdocs/install/mysql/data/llx_accounting_account_be.sql index e99fa1e54fe..248bb400927 100644 --- a/htdocs/install/mysql/data/llx_accounting_account_be.sql +++ b/htdocs/install/mysql/data/llx_accounting_account_be.sql @@ -945,3 +945,432 @@ INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, acc INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1355, 'PCMN-BASE', 'FINAN', '5', '0', 'Placement de trésorerie et de valeurs disponibles', 1); INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1356, 'PCMN-BASE', 'EXPENSE', '6', '0', 'Charges', 1); INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1357, 'PCMN-BASE', 'INCOME', '7', '0', 'Produits', 1); + +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10439, 'MAR-VERKORT', 'CAPIT', '1', '0', 'Eigen vermogen, voorzieningen voor risico''s en kosten en schulden op meer dan één jaar', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10440, 'MAR-VERKORT', 'CAPIT', '10', '10439', 'Kapitaal', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10441, 'MAR-VERKORT', 'CAPIT', '100', '10440', 'Geplaatst kapitaal', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10442, 'MAR-VERKORT', 'CAPIT', '101', '10440', 'Niet-opgevraagd kapitaal (-)', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10443, 'MAR-VERKORT', 'CAPIT', '11', '10439', 'Uitgiftepremies (+)', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10444, 'MAR-VERKORT', 'CAPIT', '12', '10439', 'Herwaarderingsmeerwaarden', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10445, 'MAR-VERKORT', 'CAPIT', '120', '10444', 'Herwaarderingsmeerwaarden op immateriële vaste activa (+)', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10446, 'MAR-VERKORT', 'CAPIT', '121', '10444', 'Herwaarderingsmeerwaarden op materiële vaste activa (+)', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10447, 'MAR-VERKORT', 'CAPIT', '122', '10444', 'Herwaarderingsmeerwaarden op financiële vaste activa (+)', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10448, 'MAR-VERKORT', 'CAPIT', '123', '10444', 'Herwaarderingsmeerwaarden op voorraden', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10449, 'MAR-VERKORT', 'CAPIT', '124', '10444', 'Terugneming van waardeverminderingen op geldbeleggingen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10450, 'MAR-VERKORT', 'CAPIT', '13', '10439', 'Reserves', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10451, 'MAR-VERKORT', 'CAPIT', '130', '10450', 'Wettelijke reserve', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10452, 'MAR-VERKORT', 'CAPIT', '131', '10450', 'Onbeschikbare reserves', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10453, 'MAR-VERKORT', 'CAPIT', '1310', '10452', 'Reserve voor eigen aandelen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10454, 'MAR-VERKORT', 'CAPIT', '1311', '10452', 'Andere onbeschikbare reserves', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10455, 'MAR-VERKORT', 'CAPIT', '132', '10450', 'Belastingvrije reserves', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10456, 'MAR-VERKORT', 'CAPIT', '133', '10450', 'Beschikbare reserves', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10457, 'MAR-VERKORT', 'CAPIT', '14', '10439', 'Overgedragen Winst of Overgedragen verlies (-)', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10458, 'MAR-VERKORT', 'CAPIT', '15', '10439', 'Kapitaalsubsidies', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10459, 'MAR-VERKORT', 'CAPIT', '16', '10439', 'Voorzieningen en Uitgestelde belastingen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10460, 'MAR-VERKORT', 'CAPIT', '160', '10459', 'Voorzieningen voor pensioenen en soortgelijke verplichtingen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10461, 'MAR-VERKORT', 'CAPIT', '161', '10459', 'Voorzieningen voor belastingen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10462, 'MAR-VERKORT', 'CAPIT', '162', '10459', 'Voorzieningen voor grote herstellingswerken en grote onderhoudswerken', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10463, 'MAR-VERKORT', 'CAPIT', '163', '10459', 'Voorzieningen voor milieuverplichtingen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10464, 'MAR-VERKORT', 'CAPIT', '168', '10459', 'Uitgestelde belastingen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10465, 'MAR-VERKORT', 'CAPIT', '1680', '10464', 'Uitgestelde belastingen op kapitaalsubsidies', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10466, 'MAR-VERKORT', 'CAPIT', '1681', '10464', 'Uitgestelde belastingen op gerealiseerde meerwaarden op immateriële vaste activa', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10467, 'MAR-VERKORT', 'CAPIT', '1682', '10464', 'Uitgestelde belastingen op gerealiseerde meerwaarden op materiële vaste activa', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10468, 'MAR-VERKORT', 'CAPIT', '1687', '10464', 'Uitgestelde belastingen op gerealiseerde meerwaarden op effecten die zijn uitgegeven door de Belgische openbare sector', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10469, 'MAR-VERKORT', 'CAPIT', '1688', '10464', 'Buitenlandse uitgestelde belastingen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10470, 'MAR-VERKORT', 'CAPIT', '17', '10439', 'Schulden op meer dan één jaar', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10471, 'MAR-VERKORT', 'CAPIT', '170', '10470', 'Achtergestelde leningen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10472, 'MAR-VERKORT', 'CAPIT', '1700', '10471', 'Converteerbaar', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10473, 'MAR-VERKORT', 'CAPIT', '1701', '10471', 'Niet-converteerbaar', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10474, 'MAR-VERKORT', 'CAPIT', '171', '10470', 'Niet achtergestelde obligatieleningen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10475, 'MAR-VERKORT', 'CAPIT', '1710', '10474', 'Converteerbaar', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10476, 'MAR-VERKORT', 'CAPIT', '1711', '10474', 'Niet-converteerbaar', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10477, 'MAR-VERKORT', 'CAPIT', '172', '10470', 'Leasingschulden en soortgelijke', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10478, 'MAR-VERKORT', 'CAPIT', '173', '10470', 'Kredietinstellingen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10479, 'MAR-VERKORT', 'CAPIT', '1730', '10478', 'Schulden op rekening', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10480, 'MAR-VERKORT', 'CAPIT', '1731', '10478', 'Promessen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10481, 'MAR-VERKORT', 'CAPIT', '1732', '10478', 'Acceptkredieten', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10482, 'MAR-VERKORT', 'CAPIT', '174', '10470', 'Overige leningen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10483, 'MAR-VERKORT', 'CAPIT', '175', '10470', 'Handelsschulden', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10484, 'MAR-VERKORT', 'CAPIT', '1750', '10483', 'Leveranciers', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10485, 'MAR-VERKORT', 'CAPIT', '1751', '10483', 'Te betalen wissels', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10486, 'MAR-VERKORT', 'CAPIT', '176', '10470', 'Vooruitbetalingen op bestellingen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10487, 'MAR-VERKORT', 'CAPIT', '178', '10470', 'Borgtochten ontvangen in contanten', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10488, 'MAR-VERKORT', 'CAPIT', '179', '10470', 'Overige schulden', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10489, 'MAR-VERKORT', 'CAPIT', '19', '10439', 'Voorschot aan de vennoten op de verdeling van het nettoactief (-)', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10490, 'MAR-VERKORT', 'IMMO', '2', '0', 'Oprichtingskosten, vaste activa en vorderingen op meer dan één jaar', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10491, 'MAR-VERKORT', 'IMMO', '20', '10490', 'Oprichtingskosten (1)', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10492, 'MAR-VERKORT', 'IMMO', '200', '10491', 'Kosten voor oprichting en kapitaalsverhoging', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10493, 'MAR-VERKORT', 'IMMO', '201', '10491', 'Kosten bij uitgifte van leningen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10494, 'MAR-VERKORT', 'IMMO', '202', '10491', 'Overige oprichtingskosten', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10495, 'MAR-VERKORT', 'IMMO', '203', '10491', '', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10496, 'MAR-VERKORT', 'IMMO', '204', '10491', 'Herstructureringskosten', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10497, 'MAR-VERKORT', 'IMMO', '21', '10490', 'Immateriële vaste activa (1)', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10498, 'MAR-VERKORT', 'IMMO', '210', '10497', 'Kosten voor onderzoek en ontwikkeling', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10499, 'MAR-VERKORT', 'IMMO', '211', '10497', 'Concessies, octrooien, licenties, know how, merken en soorgelijke rechten', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10500, 'MAR-VERKORT', 'IMMO', '212', '10497', 'Goodwill', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10501, 'MAR-VERKORT', 'IMMO', '213', '10497', 'Vooruitbetalingen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10502, 'MAR-VERKORT', 'IMMO', '214', '10497', 'Software', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10503, 'MAR-VERKORT', 'IMMO', '215', '10497', 'Databanken', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10504, 'MAR-VERKORT', 'IMMO', '216', '10497', 'Emissierechten', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10505, 'MAR-VERKORT', 'IMMO', '219', '10497', 'Overige immateriële vaste activa', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10506, 'MAR-VERKORT', 'IMMO', '22', '10490', 'Terreinen en gebouwen (1)', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10507, 'MAR-VERKORT', 'IMMO', '220', '10506', 'Terreinen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10508, 'MAR-VERKORT', 'IMMO', '221', '10506', 'Gebouwen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10509, 'MAR-VERKORT', 'IMMO', '222', '10506', 'Bebouwde terreinen (2)', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10510, 'MAR-VERKORT', 'IMMO', '223', '10506', 'Overige zakelijke rechten op onroerende goederen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10511, 'MAR-VERKORT', 'IMMO', '224', '10506', 'Autosnelwegen, wegen en fietspaden', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10512, 'MAR-VERKORT', 'IMMO', '225', '10506', 'Vliegvelden', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10513, 'MAR-VERKORT', 'IMMO', '226', '10506', 'Waterbouwkundige werken', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10514, 'MAR-VERKORT', 'IMMO', '227', '10506', 'Havens', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10515, 'MAR-VERKORT', 'IMMO', '228', '10506', 'Openbaar vervoer', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10516, 'MAR-VERKORT', 'IMMO', '229', '10506', 'Overige werken van burgelijke bouwkunde', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10517, 'MAR-VERKORT', 'IMMO', '23', '10490', 'Installaties, machines en uitrusting (1)', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10518, 'MAR-VERKORT', 'IMMO', '24', '10490', 'Meubilair en rollend materieel (1)', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10519, 'MAR-VERKORT', 'IMMO', '240', '10518', 'Rollend materieel', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10520, 'MAR-VERKORT', 'IMMO', '241', '10518', 'Varend materieel', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10521, 'MAR-VERKORT', 'IMMO', '242', '10518', 'Vliegend materieel', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10522, 'MAR-VERKORT', 'IMMO', '243', '10518', 'Informatica en telematica materieel', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10523, 'MAR-VERKORT', 'IMMO', '244', '10518', 'Kantoormeubilair', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10524, 'MAR-VERKORT', 'IMMO', '245', '10518', 'Werken van bibliotheken', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10525, 'MAR-VERKORT', 'IMMO', '246', '10518', 'Kunstvoorwerpen en -werken', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10526, 'MAR-VERKORT', 'IMMO', '25', '10490', 'Vaste activa in leasing of op grond van een soortgelijk recht (1)', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10527, 'MAR-VERKORT', 'IMMO', '250', '10526', 'Terreinen en gebouwen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10528, 'MAR-VERKORT', 'IMMO', '251', '10526', 'Installaties, machines en uitrusting', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10529, 'MAR-VERKORT', 'IMMO', '252', '10526', 'Meubilair en rollend materieel', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10530, 'MAR-VERKORT', 'IMMO', '26', '10490', 'Overige materiële vaste activa (1)', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10531, 'MAR-VERKORT', 'IMMO', '27', '10490', 'Vaste activa in aanbouw en vooruitbetalingen (1)', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10532, 'MAR-VERKORT', 'IMMO', '28', '10490', 'Financiële vaste activa', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10533, 'MAR-VERKORT', 'IMMO', '280', '10532', 'Deelnemingen in verbonden ondernemingen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10534, 'MAR-VERKORT', 'IMMO', '2800', '10533', 'Aanschaffingswaarde', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10535, 'MAR-VERKORT', 'IMMO', '2801', '10533', 'Nog te storten bedragen (-)', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10536, 'MAR-VERKORT', 'IMMO', '2808', '10533', 'Geboekte meerwaarden', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10537, 'MAR-VERKORT', 'IMMO', '2809', '10533', 'Geboekte waardeverminderingen (-)', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10538, 'MAR-VERKORT', 'IMMO', '281', '10532', 'Vorderingen op verbonden ondernemingen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10539, 'MAR-VERKORT', 'IMMO', '2810', '10538', 'Vordering op rekening', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10540, 'MAR-VERKORT', 'IMMO', '2811', '10538', 'Te innen wissels', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10541, 'MAR-VERKORT', 'IMMO', '2812', '10538', 'Vastrentende effecten', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10542, 'MAR-VERKORT', 'IMMO', '2817', '10538', 'Dubieuze debiteuren', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10543, 'MAR-VERKORT', 'IMMO', '2819', '10538', 'Geboekte waardeverminderingen (-)', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10544, 'MAR-VERKORT', 'IMMO', '282', '10532', 'Deelnemingen in ondernemingen waarmee een deelnemingsverhouding bestaat', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10545, 'MAR-VERKORT', 'IMMO', '2820', '10544', 'Aanschaffingswaarde', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10546, 'MAR-VERKORT', 'IMMO', '2821', '10544', 'Nog te storten bedragen (-)', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10547, 'MAR-VERKORT', 'IMMO', '2828', '10544', 'Geboekte meerwaarden', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10548, 'MAR-VERKORT', 'IMMO', '2829', '10544', 'Geboekte waardeverminderingen (-)', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10549, 'MAR-VERKORT', 'IMMO', '283', '10532', 'Vorderingen op ondernemingen waarmee een deelnemingsverhouding bestaat', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10550, 'MAR-VERKORT', 'IMMO', '2830', '10549', 'Vordering op rekening', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10551, 'MAR-VERKORT', 'IMMO', '2831', '10549', 'Te innen wissels', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10552, 'MAR-VERKORT', 'IMMO', '2832', '10549', 'Vastrentende effecten', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10553, 'MAR-VERKORT', 'IMMO', '2837', '10549', 'Dubieuze debiteuren', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10554, 'MAR-VERKORT', 'IMMO', '2839', '10549', 'Geboekte waardeverminderingen (-)', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10555, 'MAR-VERKORT', 'IMMO', '284', '10532', 'Andere aandelen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10556, 'MAR-VERKORT', 'IMMO', '2840', '10555', 'Aanschaffingswaarde', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10557, 'MAR-VERKORT', 'IMMO', '2841', '10555', 'Nog te storten bedragen (-)', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10558, 'MAR-VERKORT', 'IMMO', '2848', '10555', 'Geboekte meerwaarden', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10559, 'MAR-VERKORT', 'IMMO', '2849', '10555', 'Geboekte waardeverminderingen (-)', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10560, 'MAR-VERKORT', 'IMMO', '285', '10532', 'Overige vorderingen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10561, 'MAR-VERKORT', 'IMMO', '2850', '10560', 'Vordering op rekening', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10562, 'MAR-VERKORT', 'IMMO', '2851', '10560', 'Te innen wissels', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10563, 'MAR-VERKORT', 'IMMO', '2852', '10560', 'Vastrentende effecten', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10564, 'MAR-VERKORT', 'IMMO', '2857', '10560', 'Dubieuze debiteuren', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10565, 'MAR-VERKORT', 'IMMO', '2859', '10560', 'Geboekte waardeverminderingen (-)', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10566, 'MAR-VERKORT', 'IMMO', '288', '10532', 'Borgtochten betaald in contanten', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10567, 'MAR-VERKORT', 'IMMO', '29', '10490', 'Vorderingen op meer dan één jaar', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10568, 'MAR-VERKORT', 'IMMO', '290', '10567', 'Handelsvorderingen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10569, 'MAR-VERKORT', 'IMMO', '2900', '10568', 'Handelsdebiteuren', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10570, 'MAR-VERKORT', 'IMMO', '2901', '10568', 'Te innen wissels', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10571, 'MAR-VERKORT', 'IMMO', '2906', '10568', 'Vooruitbetalingen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10572, 'MAR-VERKORT', 'IMMO', '2907', '10568', 'Dubieuze debiteuren', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10573, 'MAR-VERKORT', 'IMMO', '2909', '10568', 'Geboekte waardeverminderingen (-)', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10574, 'MAR-VERKORT', 'IMMO', '291', '10567', 'Overige vorderingen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10575, 'MAR-VERKORT', 'IMMO', '2910', '10574', 'Vordering op rekening', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10576, 'MAR-VERKORT', 'IMMO', '2911', '10574', 'Te innen wissels', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10577, 'MAR-VERKORT', 'IMMO', '2917', '10574', 'Dubieuze debiteuren', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10578, 'MAR-VERKORT', 'IMMO', '2919', '10574', 'Geboekte waardeverminderingen (-)', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10579, 'MAR-VERKORT', 'STOCK', '3', '0', 'Voorraden en bestellingen in uitvoering', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10580, 'MAR-VERKORT', 'STOCK', '30', '10579', 'Grondstoffen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10581, 'MAR-VERKORT', 'STOCK', '300', '10580', 'Aanschaffingswaarde', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10582, 'MAR-VERKORT', 'STOCK', '309', '10580', 'Geboekte waardeverminderingen (-)', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10583, 'MAR-VERKORT', 'STOCK', '31', '10579', 'Hulpstoffen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10584, 'MAR-VERKORT', 'STOCK', '310', '10583', 'Aanschaffingswaarde', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10585, 'MAR-VERKORT', 'STOCK', '319', '10583', 'Geboekte waardeverminderingen (-)', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10586, 'MAR-VERKORT', 'STOCK', '32', '10579', 'Goederen in bewerking', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10587, 'MAR-VERKORT', 'STOCK', '320', '10586', 'Aanschaffingswaarde', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10588, 'MAR-VERKORT', 'STOCK', '329', '10586', 'Geboekte waardeverminderingen (-)', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10589, 'MAR-VERKORT', 'STOCK', '33', '10579', 'Gereed product', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10590, 'MAR-VERKORT', 'STOCK', '330', '10589', 'Aanschaffingswaarde', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10591, 'MAR-VERKORT', 'STOCK', '339', '10589', 'Geboekte waardeverminderingen (-)', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10592, 'MAR-VERKORT', 'STOCK', '34', '10579', 'Handelsgoederen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10593, 'MAR-VERKORT', 'STOCK', '340', '10592', 'Aanschaffingswaarde', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10594, 'MAR-VERKORT', 'STOCK', '349', '10592', 'Geboekte waardeverminderingen (-)', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10595, 'MAR-VERKORT', 'STOCK', '35', '10579', 'Onroerende goederen bestemd voor verkoop', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10596, 'MAR-VERKORT', 'STOCK', '350', '10595', 'Aanschaffingswaarde', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10597, 'MAR-VERKORT', 'STOCK', '359', '10595', 'Geboekte waardeverminderingen (-)', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10598, 'MAR-VERKORT', 'STOCK', '36', '10579', 'Vooruitbetalingen op voorraadinkopen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10599, 'MAR-VERKORT', 'STOCK', '360', '10598', 'Vooruitbetalingen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10600, 'MAR-VERKORT', 'STOCK', '369', '10598', 'Geboekte waardeverminderingen (-)', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10601, 'MAR-VERKORT', 'STOCK', '37', '10579', 'Bestellingen in uitvoering', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10602, 'MAR-VERKORT', 'STOCK', '370', '10601', 'Aanschaffingswaarde', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10603, 'MAR-VERKORT', 'STOCK', '371', '10601', 'Toegerekende winst', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10604, 'MAR-VERKORT', 'STOCK', '379', '10601', 'Geboekte waardeverminderingen (-)', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10605, 'MAR-VERKORT', 'THIRDPARTY', '4', '0', 'Vorderingen en schulden op ten hoogste een jaar', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10606, 'MAR-VERKORT', 'THIRDPARTY', '40', '10605', 'Handelsvorderingen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10607, 'MAR-VERKORT', 'THIRDPARTY', '400', '10606', 'Handelsdebiteuren', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10608, 'MAR-VERKORT', 'THIRDPARTY', '401', '10606', 'Te innen wissels', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10609, 'MAR-VERKORT', 'THIRDPARTY', '404', '10606', 'Te innen opbrengsten (3)', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10610, 'MAR-VERKORT', 'THIRDPARTY', '406', '10606', 'Vooruitbetalingen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10611, 'MAR-VERKORT', 'THIRDPARTY', '407', '10606', 'Dubieuze debiteuren', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10612, 'MAR-VERKORT', 'THIRDPARTY', '409', '10606', 'Geboekte waardeverminderingen (-)', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10613, 'MAR-VERKORT', 'THIRDPARTY', '41', '10605', 'Overige vorderingen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10614, 'MAR-VERKORT', 'THIRDPARTY', '410', '10613', 'Opgevraagd, niet-gestort kapitaal', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10615, 'MAR-VERKORT', 'THIRDPARTY', '411', '10613', 'Terug te vorderen BTW', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10616, 'MAR-VERKORT', 'THIRDPARTY', '412', '10613', 'Terug te vorderen belastingen en voorheffingen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10617, 'MAR-VERKORT', 'THIRDPARTY', '4128', '10616', 'Buitenlandse belastingen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10618, 'MAR-VERKORT', 'THIRDPARTY', '413', '10613', 'Overige vorderingen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10619, 'MAR-VERKORT', 'THIRDPARTY', '414', '10613', 'Te innen opbrengsten', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10620, 'MAR-VERKORT', 'THIRDPARTY', '416', '10613', 'Diverse vorderingen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10621, 'MAR-VERKORT', 'THIRDPARTY', '417', '10613', 'Dubieuze vorderingen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10622, 'MAR-VERKORT', 'THIRDPARTY', '418', '10613', 'Borgtochten betaald in contanten', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10623, 'MAR-VERKORT', 'THIRDPARTY', '419', '10613', 'Geboekte waardeverminderingen (-)', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10624, 'MAR-VERKORT', 'THIRDPARTY', '42', '10605', 'Schulden op meer dan één jaar die binnen het jaar vervallen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10625, 'MAR-VERKORT', 'THIRDPARTY', '420', '10624', 'Achtergestelde leningen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10626, 'MAR-VERKORT', 'THIRDPARTY', '4200', '10625', 'Converteerbaar', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10627, 'MAR-VERKORT', 'THIRDPARTY', '4201', '10625', 'Niet-converteerbaar', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10628, 'MAR-VERKORT', 'THIRDPARTY', '421', '10624', 'Niet achtergestelde obligatieleningen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10629, 'MAR-VERKORT', 'THIRDPARTY', '4210', '10628', 'Converteerbaar', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10630, 'MAR-VERKORT', 'THIRDPARTY', '4211', '10628', 'Niet-converteerbaar', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10631, 'MAR-VERKORT', 'THIRDPARTY', '422', '10624', 'Leasingschulden en soortgelijke', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10632, 'MAR-VERKORT', 'THIRDPARTY', '423', '10624', 'Kredietinstellingen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10633, 'MAR-VERKORT', 'THIRDPARTY', '4230', '10632', 'Schulden op rekening', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10634, 'MAR-VERKORT', 'THIRDPARTY', '4231', '10632', 'Promessen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10635, 'MAR-VERKORT', 'THIRDPARTY', '4232', '10632', 'Acceptkredieten', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10636, 'MAR-VERKORT', 'THIRDPARTY', '424', '10624', 'Overige leningen (+)', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10637, 'MAR-VERKORT', 'THIRDPARTY', '425', '10624', 'Handelsschulden (+)', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10638, 'MAR-VERKORT', 'THIRDPARTY', '4250', '10637', 'Leveranciers', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10639, 'MAR-VERKORT', 'THIRDPARTY', '4251', '10637', 'Te betalen wissels', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10640, 'MAR-VERKORT', 'THIRDPARTY', '426', '10624', 'Vooruitbetalingen op bestellingen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10641, 'MAR-VERKORT', 'THIRDPARTY', '428', '10624', 'Borgtochten ontvangen in contanten', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10642, 'MAR-VERKORT', 'THIRDPARTY', '429', '10624', 'Overige schulden', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10643, 'MAR-VERKORT', 'THIRDPARTY', '43', '10605', 'Financiële schulden', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10644, 'MAR-VERKORT', 'THIRDPARTY', '430', '10643', 'Kredietinstellingen – Leningen op rekeningen met vaste termijn', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10645, 'MAR-VERKORT', 'THIRDPARTY', '431', '10643', 'Kredietinstellingen – Promessen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10646, 'MAR-VERKORT', 'THIRDPARTY', '432', '10643', 'Kredietinstellingen – Acceptkrediet', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10647, 'MAR-VERKORT', 'THIRDPARTY', '433', '10643', 'Kredietinstellingen – Schulden in rekening courant (4)', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10648, 'MAR-VERKORT', 'THIRDPARTY', '439', '10643', 'Overige leningen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10649, 'MAR-VERKORT', 'THIRDPARTY', '44', '10605', 'Handelsschulden', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10650, 'MAR-VERKORT', 'THIRDPARTY', '440', '10649', 'Leveranciers', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10651, 'MAR-VERKORT', 'THIRDPARTY', '441', '10649', 'Te betalen wissels', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10652, 'MAR-VERKORT', 'THIRDPARTY', '444', '10649', 'Te ontvangen facturen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10653, 'MAR-VERKORT', 'THIRDPARTY', '45', '10605', 'Schulden met betrekking tot belastingen, bezoldigingen en sociale lasten', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10654, 'MAR-VERKORT', 'THIRDPARTY', '450', '10653', 'Geraamd bedrag van de belastingschulden', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10655, 'MAR-VERKORT', 'THIRDPARTY', '4508', '10654', 'Buitenlandse belastingen en taksen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10656, 'MAR-VERKORT', 'THIRDPARTY', '451', '10653', 'Te betalen BTW', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10657, 'MAR-VERKORT', 'THIRDPARTY', '452', '10653', 'Te betalen belastingen en taksen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10658, 'MAR-VERKORT', 'THIRDPARTY', '4528', '10657', 'Buitenlandse belastingen en taksen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10659, 'MAR-VERKORT', 'THIRDPARTY', '453', '10653', 'Ingehouden voorheffingen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10660, 'MAR-VERKORT', 'THIRDPARTY', '454', '10653', 'Rijksdienst voor Sociale Zekerheid', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10661, 'MAR-VERKORT', 'THIRDPARTY', '455', '10653', 'Bezoldigingen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10662, 'MAR-VERKORT', 'THIRDPARTY', '456', '10653', 'Vakantiegeld', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10663, 'MAR-VERKORT', 'THIRDPARTY', '459', '10653', 'Andere sociale schulden', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10664, 'MAR-VERKORT', 'THIRDPARTY', '46', '10605', 'Vooruitbetalingen op bestellingen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10665, 'MAR-VERKORT', 'THIRDPARTY', '47', '10605', 'Schulden uit de bestemming van het resultaat', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10666, 'MAR-VERKORT', 'THIRDPARTY', '470', '10665', 'Dividenden en tantièmes over vorige boekjaren', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10667, 'MAR-VERKORT', 'THIRDPARTY', '471', '10665', 'Dividenden over het boekjaar', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10668, 'MAR-VERKORT', 'THIRDPARTY', '472', '10665', 'Tantièmes over het boekjaar', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10669, 'MAR-VERKORT', 'THIRDPARTY', '473', '10665', 'Andere rechthebbenden', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10670, 'MAR-VERKORT', 'THIRDPARTY', '48', '10605', 'Diverse schulden', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10671, 'MAR-VERKORT', 'THIRDPARTY', '480', '10670', 'Vervallen obligaties en coupons', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10672, 'MAR-VERKORT', 'THIRDPARTY', '481', '10670', 'Te betalen subsidies, dotaties, toelagen en soortgelijke', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10673, 'MAR-VERKORT', 'THIRDPARTY', '488', '10670', 'Borgtochten ontvangen in contanten', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10674, 'MAR-VERKORT', 'THIRDPARTY', '489', '10670', 'Andere diverse schulden', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10675, 'MAR-VERKORT', 'THIRDPARTY', '49', '10605', 'Overlopende rekeningen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10676, 'MAR-VERKORT', 'THIRDPARTY', '490', '10675', 'Over te dragen kosten', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10677, 'MAR-VERKORT', 'THIRDPARTY', '491', '10675', 'Verkregen opbrengsten', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10678, 'MAR-VERKORT', 'THIRDPARTY', '492', '10675', 'Toe te rekenen kosten', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10679, 'MAR-VERKORT', 'THIRDPARTY', '493', '10675', 'Over te dragen opbrengsten', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10680, 'MAR-VERKORT', 'THIRDPARTY', '499', '10675', 'Wachtrekeningen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10681, 'MAR-VERKORT', 'FINAN', '5', '0', 'Geldbeleggingen en liquide middelen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10682, 'MAR-VERKORT', 'FINAN', '50', '10681', 'Eigen aandelen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10683, 'MAR-VERKORT', 'FINAN', '51', '10681', 'Aandelen en geldbeleggingen andere dan vastrentende beleggingen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10684, 'MAR-VERKORT', 'FINAN', '510', '10683', 'Aanschaffingswaarde', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10685, 'MAR-VERKORT', 'FINAN', '5100', '10684', 'Aandelen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10686, 'MAR-VERKORT', 'FINAN', '5101', '10684', 'Geldbeleggingen andere dan vastrentende effecten', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10687, 'MAR-VERKORT', 'FINAN', '511', '10683', 'Niet-opgevraagde bedragen (-)', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10688, 'MAR-VERKORT', 'FINAN', '5110', '10687', 'Aandelen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10689, 'MAR-VERKORT', 'FINAN', '519', '10683', 'Geboekte waardeverminderingen (-)', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10690, 'MAR-VERKORT', 'FINAN', '5190', '10689', 'Aandelen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10691, 'MAR-VERKORT', 'FINAN', '5191', '10689', 'Geldbeleggingen andere dan vastrentende effecten', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10692, 'MAR-VERKORT', 'FINAN', '52', '10681', 'Vastrentende effecten', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10693, 'MAR-VERKORT', 'FINAN', '520', '10692', 'Aanschaffingswaarde', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10694, 'MAR-VERKORT', 'FINAN', '529', '10692', 'Geboekte waardeverminderingen (-)', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10695, 'MAR-VERKORT', 'FINAN', '53', '10681', 'Termijndeposito’s', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10696, 'MAR-VERKORT', 'FINAN', '530', '10695', 'Op meer dan één jaar', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10697, 'MAR-VERKORT', 'FINAN', '531', '10695', 'Op meer dan een maand en op ten hoogste 1 jaar', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10698, 'MAR-VERKORT', 'FINAN', '532', '10695', 'Op ten hoogste 1 maand', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10699, 'MAR-VERKORT', 'FINAN', '539', '10695', 'Geboekte waardeverminderingen (-)', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10700, 'MAR-VERKORT', 'FINAN', '54', '10681', 'Te incasseren vervallen waarden', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10701, 'MAR-VERKORT', 'FINAN', '55', '10681', 'Kredietinstellingen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10702, 'MAR-VERKORT', 'FINAN', '57', '10681', 'Kassen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10703, 'MAR-VERKORT', 'FINAN', '578', '10702', 'Kassen-zegels', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10704, 'MAR-VERKORT', 'FINAN', '58', '10681', 'Interne overboekingen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10705, 'MAR-VERKORT', 'EXPENSE', '6', '0', 'Kosten', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10706, 'MAR-VERKORT', 'EXPENSE', '60', '10705', 'Handelsgoederen, grond- en hulpstoffen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10707, 'MAR-VERKORT', 'EXPENSE', '600', '10706', 'Aankopen van grondstoffen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10708, 'MAR-VERKORT', 'EXPENSE', '601', '10706', 'Aankopen van hulpstoffen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10709, 'MAR-VERKORT', 'EXPENSE', '602', '10706', 'Aankopen van diensten, werken en studies', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10710, 'MAR-VERKORT', 'EXPENSE', '603', '10706', 'Algemene onderaannemingen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10711, 'MAR-VERKORT', 'EXPENSE', '604', '10706', 'Aankopen van handelsgoederen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10712, 'MAR-VERKORT', 'EXPENSE', '605', '10706', 'Aankopen van onroerende goederen bestemd voor verkoop', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10713, 'MAR-VERKORT', 'EXPENSE', '609', '10706', 'Voorraadwijzigingen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10714, 'MAR-VERKORT', 'EXPENSE', '6090', '10713', 'van grondstoffen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10715, 'MAR-VERKORT', 'EXPENSE', '6091', '10713', 'van hulpstoffen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10716, 'MAR-VERKORT', 'EXPENSE', '6094', '10713', 'van handelsgoederen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10717, 'MAR-VERKORT', 'EXPENSE', '6095', '10713', 'van gekochte onroerende goederen bestemd voor verkoop', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10718, 'MAR-VERKORT', 'EXPENSE', '61', '10705', 'Diensten en diverse goederen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10719, 'MAR-VERKORT', 'EXPENSE', '617', '10718', 'Uitzendkrachten en personen ter beschikking gesteld van de onderneming', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10720, 'MAR-VERKORT', 'EXPENSE', '618', '10718', 'Bezoldigingen, premies voor buitenwettelijke verzekeringen, ouderdoms- en overlevingspensioenen van bestuurders, zaakvoerders en werkende vennoten, die niet worden toegekend uit hoofde van een arbeidsovereenkomst', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10721, 'MAR-VERKORT', 'EXPENSE', '62', '10705', 'Bezoldigingen, sociale lasten en pensioenen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10722, 'MAR-VERKORT', 'EXPENSE', '620', '10721', 'Rechtstreekse sociale voordelen en bezoldigingen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10723, 'MAR-VERKORT', 'EXPENSE', '6200', '10722', 'Bestuurders of zaakvoerders', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10724, 'MAR-VERKORT', 'EXPENSE', '6201', '10722', 'Directiepersoneel', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10725, 'MAR-VERKORT', 'EXPENSE', '6202', '10722', 'Bedienden', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10726, 'MAR-VERKORT', 'EXPENSE', '6203', '10722', 'Arbeiders', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10727, 'MAR-VERKORT', 'EXPENSE', '6204', '10722', 'Andere personeelsleden', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10728, 'MAR-VERKORT', 'EXPENSE', '621', '10721', 'Werkgeversbijdragen voor sociale verzekeringen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10729, 'MAR-VERKORT', 'EXPENSE', '622', '10721', 'Werkgeverspremies voor bovenwettelijke verzekeringen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10730, 'MAR-VERKORT', 'EXPENSE', '623', '10721', 'Andere personeelskosten', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10731, 'MAR-VERKORT', 'EXPENSE', '624', '10721', 'Ouderdoms- en overlevingspensioenen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10732, 'MAR-VERKORT', 'EXPENSE', '6240', '10731', 'Bestuurders of zaakvoerders', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10733, 'MAR-VERKORT', 'EXPENSE', '6241', '10731', 'Personeel', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10734, 'MAR-VERKORT', 'EXPENSE', '63', '10705', 'Afschrijvingen, waardeverminderingen en voorzieningen voor risico’s', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10735, 'MAR-VERKORT', 'EXPENSE', '630', '10734', 'Afschrijvingen en waardeverminderingen op vaste activa (toevoeging)', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10736, 'MAR-VERKORT', 'EXPENSE', '631', '10734', 'Waardeverminderingen op voorraden', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10737, 'MAR-VERKORT', 'EXPENSE', '6310', '10736', 'Toevoeging', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10738, 'MAR-VERKORT', 'EXPENSE', '6311', '10736', 'Terugneming (-)', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10739, 'MAR-VERKORT', 'EXPENSE', '632', '10734', 'Waardeverminderingen op bestellingen in uitvoering', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10740, 'MAR-VERKORT', 'EXPENSE', '6320', '10739', 'Toevoeging', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10741, 'MAR-VERKORT', 'EXPENSE', '6321', '10739', 'Terugneming (-)', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10742, 'MAR-VERKORT', 'EXPENSE', '633', '10734', 'Waardeverminderingen op handelsvorderingen op meer dan één jaar', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10743, 'MAR-VERKORT', 'EXPENSE', '6330', '10742', 'Toevoeging', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10744, 'MAR-VERKORT', 'EXPENSE', '6331', '10742', 'Terugneming (-)', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10745, 'MAR-VERKORT', 'EXPENSE', '634', '10734', 'Waardeverminderingen op handelsvorderingen op ten hoogste één jaar', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10746, 'MAR-VERKORT', 'EXPENSE', '6340', '10745', 'Toevoeging', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10747, 'MAR-VERKORT', 'EXPENSE', '6341', '10745', 'Terugneming (-)', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10748, 'MAR-VERKORT', 'EXPENSE', '635', '10734', 'Voorzieningen voor pensioenen en soortgelijke verplichtingen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10749, 'MAR-VERKORT', 'EXPENSE', '6350', '10748', 'Toevoeging', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10750, 'MAR-VERKORT', 'EXPENSE', '6351', '10748', 'Besteding en terugneming (-)', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10751, 'MAR-VERKORT', 'EXPENSE', '636', '10734', 'Voorzieningen voor grote herstellingswerken en grote onderhoudswerken', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10752, 'MAR-VERKORT', 'EXPENSE', '6360', '10751', 'Toevoeging', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10753, 'MAR-VERKORT', 'EXPENSE', '6361', '10751', 'Besteding en terugneming (-)', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10754, 'MAR-VERKORT', 'EXPENSE', '637', '10734', 'Voorzieningen voor milieuverplichtingen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10755, 'MAR-VERKORT', 'EXPENSE', '6370', '10754', 'Toevoeging', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10756, 'MAR-VERKORT', 'EXPENSE', '6371', '10754', 'Besteding en terugneming (-)', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10757, 'MAR-VERKORT', 'EXPENSE', '638', '10734', 'Voorzieningen voor andere risico’s en kosten', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10758, 'MAR-VERKORT', 'EXPENSE', '6380', '10757', 'Toevoeging', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10759, 'MAR-VERKORT', 'EXPENSE', '6381', '10757', 'Besteding en terugneming (-)', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10760, 'MAR-VERKORT', 'EXPENSE', '64', '10705', 'Andere bedrijfskosten', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10761, 'MAR-VERKORT', 'EXPENSE', '640', '10760', 'Bedrijfsbelastingen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10762, 'MAR-VERKORT', 'EXPENSE', '641', '10760', 'Minwaarden op de courante realisatie van vaste activa', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10763, 'MAR-VERKORT', 'EXPENSE', '642', '10760', 'Minderwaarden op de realisatie van handelsvorderingen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10764, 'MAR-VERKORT', 'EXPENSE', '649', '10760', 'Als herstructureringskosten geactiveerde bedrijfskosten (-)', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10765, 'MAR-VERKORT', 'EXPENSE', '65', '10705', 'Financiële kosten', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10766, 'MAR-VERKORT', 'EXPENSE', '650', '10765', 'Kosten van schulden', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10767, 'MAR-VERKORT', 'EXPENSE', '6500', '10766', 'Rente, commissies en kosten verbonden aan schulden', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10768, 'MAR-VERKORT', 'EXPENSE', '6501', '10766', 'Afschrijving van kosten bij uitgifte van leningen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10769, 'MAR-VERKORT', 'EXPENSE', '6502', '10766', 'Geactiveerde intercalaire intresten (-)', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10770, 'MAR-VERKORT', 'EXPENSE', '651', '10765', 'Waardeverminderingen op vlottende activa (6)', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10771, 'MAR-VERKORT', 'EXPENSE', '6510', '10770', 'Toevoeging', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10772, 'MAR-VERKORT', 'EXPENSE', '6511', '10770', 'Terugneming (-)', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10773, 'MAR-VERKORT', 'EXPENSE', '652', '10765', 'Minderwaarde op de realisatie van vlottende activa', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10774, 'MAR-VERKORT', 'EXPENSE', '653', '10765', 'Discontokost op vorderingen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10775, 'MAR-VERKORT', 'EXPENSE', '654', '10765', 'Wisselresultaten (7)', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10776, 'MAR-VERKORT', 'EXPENSE', '655', '10765', 'Resultaten uit de omrekening van vreemde valuta (7)', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10777, 'MAR-VERKORT', 'EXPENSE', '656', '10765', 'Voorzieningen met financieel karakter (+)', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10778, 'MAR-VERKORT', 'EXPENSE', '6560', '10777', 'Toevoeging', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10779, 'MAR-VERKORT', 'EXPENSE', '6561', '10777', 'Besteding en terugneming (-)', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10780, 'MAR-VERKORT', 'EXPENSE', '659', '10765', 'Als herstructureringskosten geactiveerde financiële kosten (-)', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10781, 'MAR-VERKORT', 'EXPENSE', '66', '10705', 'Niet-recurrente bedrijfs- of financiële kosten', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10782, 'MAR-VERKORT', 'EXPENSE', '660', '10781', 'Niet-recurrente afschrijvingen en waardeverminderingen (toevoeging)', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10783, 'MAR-VERKORT', 'EXPENSE', '6600', '10782', 'op oprichtingskosten', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10784, 'MAR-VERKORT', 'EXPENSE', '6601', '10782', 'op immateriële vaste activa', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10785, 'MAR-VERKORT', 'EXPENSE', '6602', '10782', 'op materiële vaste activa', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10786, 'MAR-VERKORT', 'EXPENSE', '661', '10781', 'Waardeverminderingen op financiële vaste activa (toevoeging)', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10787, 'MAR-VERKORT', 'EXPENSE', '662', '10781', 'Voorzieningen voor niet-recurrente risico’s en kosten', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10788, 'MAR-VERKORT', 'EXPENSE', '6620', '10787', 'Voorzieningen voor niet-recurrente bedrijfsrisico’s en kosten', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10789, 'MAR-VERKORT', 'EXPENSE', '6621', '10787', 'Voorzieningen voor niet-recurrente financiële risico’s en kosten', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10790, 'MAR-VERKORT', 'EXPENSE', '663', '10781', 'Minderwaarden op realisatie van vaste activa', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10791, 'MAR-VERKORT', 'EXPENSE', '668', '10781', 'Andere niet-recurrente financiële kosten', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10792, 'MAR-VERKORT', 'EXPENSE', '67', '10705', 'Belastingen op het resultaat', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10793, 'MAR-VERKORT', 'EXPENSE', '670', '10792', 'Belgische belastingen op het resultaat van het boekjaar', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10794, 'MAR-VERKORT', 'EXPENSE', '6700', '10793', 'Verschuldigde of gestorte belastingen en voorheffingen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10795, 'MAR-VERKORT', 'EXPENSE', '6701', '10793', 'Geactiveerde overschotten van betaalde belastingen en voorheffingen (-)', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10796, 'MAR-VERKORT', 'EXPENSE', '6702', '10793', 'Geraamde belastingen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10797, 'MAR-VERKORT', 'EXPENSE', '671', '10792', 'Belgische belastingen op het resultaat van vorige boekjaren', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10798, 'MAR-VERKORT', 'EXPENSE', '6710', '10797', 'Verschuldigde of gestorte belastingsupplementen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10799, 'MAR-VERKORT', 'EXPENSE', '6711', '10797', 'Geraamde belastingsupplementen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10800, 'MAR-VERKORT', 'EXPENSE', '6712', '10797', 'Gevormde fiscale voorzieningen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10801, 'MAR-VERKORT', 'EXPENSE', '672', '10792', 'Buitenlandse belastingen op het resultaat van het boekjaar', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10802, 'MAR-VERKORT', 'EXPENSE', '673', '10792', 'Buitenlandse belastingen op het resultaat van vorige boekjaren', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10803, 'MAR-VERKORT', 'EXPENSE', '68', '10705', 'Overboeking naar de uitgestelde belastingen en naar de belastingvrije reserves', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10804, 'MAR-VERKORT', 'EXPENSE', '680', '10803', 'Overboeking naar de uitgestelde belastingen (-)', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10805, 'MAR-VERKORT', 'EXPENSE', '689', '10803', 'Overboeking naar de belastingvrije reserves (-)', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10806, 'MAR-VERKORT', 'EXPENSE', '69', '10705', 'Resultaatverwerking', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10807, 'MAR-VERKORT', 'EXPENSE', '690', '10806', 'Overgedragen verlies van het vorige boekjaar', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10808, 'MAR-VERKORT', 'EXPENSE', '691', '10806', 'Toevoeging aan het kapitaal en aan de uitgiftepremie', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10809, 'MAR-VERKORT', 'EXPENSE', '692', '10806', 'Toevoeging aan de reserves', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10810, 'MAR-VERKORT', 'EXPENSE', '6920', '10809', 'Toevoeging aan de wettelijke reserves', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10811, 'MAR-VERKORT', 'EXPENSE', '6921', '10809', 'Toevoeging aan de overige reserves', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10812, 'MAR-VERKORT', 'EXPENSE', '693', '10806', 'Over te dragen winst', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10813, 'MAR-VERKORT', 'EXPENSE', '694', '10806', 'Vergoeding van het kapitaal', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10814, 'MAR-VERKORT', 'EXPENSE', '695', '10806', 'Bestuurders of zaakvoerders', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10815, 'MAR-VERKORT', 'EXPENSE', '696', '10806', 'Werknemers', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10816, 'MAR-VERKORT', 'EXPENSE', '697', '10806', 'Andere rechthebbenden', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10817, 'MAR-VERKORT', 'INCOME', '7', '0', 'Opbrengsten', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10818, 'MAR-VERKORT', 'INCOME', '70', '10817', 'Omzet', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10819, 'MAR-VERKORT', 'INCOME', '708', '10818', 'Toegekende kortingen, ristorno’s en rabatten (-) (8)', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10820, 'MAR-VERKORT', 'INCOME', '71', '10817', 'Wijzigingen in de voorraden en bestellingen in uitvoering', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10821, 'MAR-VERKORT', 'INCOME', '712', '10820', 'in de voorraad goederen in bewerking', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10822, 'MAR-VERKORT', 'INCOME', '713', '10820', 'in de voorraad gereed product', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10823, 'MAR-VERKORT', 'INCOME', '715', '10820', 'in de voorraad onroerende goederen bestemd voor verkoop', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10824, 'MAR-VERKORT', 'INCOME', '717', '10820', 'in de bestellingen in uitvoering', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10825, 'MAR-VERKORT', 'INCOME', '7170', '10824', 'Aanschaffingswaarde', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10826, 'MAR-VERKORT', 'INCOME', '7171', '10824', 'Toegerekende winst', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10827, 'MAR-VERKORT', 'INCOME', '72', '10817', 'Geproduceerde vaste activa', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10828, 'MAR-VERKORT', 'INCOME', '74', '10817', 'Andere bedrijfsopbrengsten', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10829, 'MAR-VERKORT', 'INCOME', '740', '10828', 'Bedrijfssubsidies en compenserende bedragen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10830, 'MAR-VERKORT', 'INCOME', '741', '10828', 'Meerwaarde op de courante realisatie van materiële vast activa', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10831, 'MAR-VERKORT', 'INCOME', '742', '10828', 'Meerwaarde op de realisatie van handelsvorderingen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10832, 'MAR-VERKORT', 'INCOME', '75', '10817', 'Financiële opbrengsten', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10833, 'MAR-VERKORT', 'INCOME', '750', '10832', 'Opbrengsten uit financiële vaste activa', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10834, 'MAR-VERKORT', 'INCOME', '751', '10832', 'Opbrengsten uit vlottende activa', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10835, 'MAR-VERKORT', 'INCOME', '752', '10832', 'Meerwaarde op de realisatie van vlottende activa (6)', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10836, 'MAR-VERKORT', 'INCOME', '753', '10832', 'Kapitaal – en interestsubsidies', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10837, 'MAR-VERKORT', 'INCOME', '754', '10832', 'Wisselresultaten (7)', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10838, 'MAR-VERKORT', 'INCOME', '755', '10832', 'Resultaten uit de omrekening van vreemde valuta (7)', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10839, 'MAR-VERKORT', 'INCOME', '76', '10817', 'Niet-recurrente bedrijfs- of financiële opbrengsten', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10840, 'MAR-VERKORT', 'INCOME', '760', '10839', 'Terugneming van afschrijvingen en waardeverminderingen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10841, 'MAR-VERKORT', 'INCOME', '7600', '10840', 'op immateriële vaste activa', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10842, 'MAR-VERKORT', 'INCOME', '7601', '10840', 'op materiële vaste activa', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10843, 'MAR-VERKORT', 'INCOME', '761', '10839', 'Terugneming van waardeverminderingen op financiële vaste activa', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10844, 'MAR-VERKORT', 'INCOME', '762', '10839', 'Terugneming van voorzieningen voor niet-recurrente risico’s en kosten', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10845, 'MAR-VERKORT', 'INCOME', '7620', '10844', 'Terugneming van voorzieningen voor niet-recurrente bedrijfsrisico’s en kosten', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10846, 'MAR-VERKORT', 'INCOME', '7621', '10844', 'Terugneming van voorzieningen voor niet-recurrente financiële risico’s en kosten', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10847, 'MAR-VERKORT', 'INCOME', '763', '10839', 'Meerwaarden op de realisatie van vaste activa', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10848, 'MAR-VERKORT', 'INCOME', '7630', '10847', 'Meerwaarde op de realisatie van immateriële en materiële vaste activa', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10849, 'MAR-VERKORT', 'INCOME', '7631', '10847', 'Meerwaarde op de realisatie van financiële vaste activa', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10850, 'MAR-VERKORT', 'INCOME', '769', '10839', 'Andere niet-recurrente financiële opbrengsten', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10851, 'MAR-VERKORT', 'INCOME', '77', '10817', 'Regularisering van belastingen en terugneming van fiscale voorzieningen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10852, 'MAR-VERKORT', 'INCOME', '771', '10851', 'Belgische belastingen op het resultaat', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10853, 'MAR-VERKORT', 'INCOME', '7710', '10852', 'Regularisering van verschuldigde of betaalde belastingen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10854, 'MAR-VERKORT', 'INCOME', '7711', '10852', 'Regularisering van geraamde belastingen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10855, 'MAR-VERKORT', 'INCOME', '7712', '10852', 'Terugneming van fiscale voorzieningen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10856, 'MAR-VERKORT', 'INCOME', '773', '10851', 'Buitenlandse belastingen op het resultaat', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10857, 'MAR-VERKORT', 'INCOME', '78', '10817', 'Onttrekking aan de belastingvrije reserves en de uitgestelde belastingen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10858, 'MAR-VERKORT', 'INCOME', '780', '10857', 'Onttrekkingen aan de uitgestelde belastingen', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10859, 'MAR-VERKORT', 'INCOME', '789', '10857', 'Onttrekkingen aan de belastingvrije reserves', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10860, 'MAR-VERKORT', 'INCOME', '79', '10817', 'Resultaatverwerking', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10861, 'MAR-VERKORT', 'INCOME', '790', '10860', 'Overgedragen winst van het vorige boekjaar', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10862, 'MAR-VERKORT', 'INCOME', '791', '10860', 'Onttrekking aan het kapitaal en aan de uitgiftepremies', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10863, 'MAR-VERKORT', 'INCOME', '792', '10860', 'Onttrekking aan de reserves', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10864, 'MAR-VERKORT', 'INCOME', '793', '10860', 'Over te dragen verlies', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10865, 'MAR-VERKORT', 'INCOME', '794', '10860', 'Tussenkomst van vennoten (of van de eigenaar) in het verlies', 1); + diff --git a/htdocs/install/mysql/migration/17.0.0-18.0.0.sql b/htdocs/install/mysql/migration/17.0.0-18.0.0.sql index c80229393a8..3e44428b286 100644 --- a/htdocs/install/mysql/migration/17.0.0-18.0.0.sql +++ b/htdocs/install/mysql/migration/17.0.0-18.0.0.sql @@ -60,6 +60,17 @@ ALTER TABLE llx_c_action_trigger ADD COLUMN contexts varchar(255) NULL; insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROJECT_CLOSE','Project closed','Executed when a project is closed','project',145); +insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILLREC_CREATE','Template invoices created','Executed when a Template invoices is created','facturerec',900); +insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILLREC_MODIFY','Template invoices update','Executed when a Template invoices is updated','facturerec',901); +insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILLREC_DELETE','Template invoices deleted','Executed when a Template invoices is deleted','facturerec',902); +insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILLREC_AUTOCREATEBILL','Template invoices use to create invoices with auto batch','Executed when a Template invoices is use to create invoice with auto batch','facturerec',903); + +insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PARTNERSHIP_CREATE','Partnership created','Executed when a partnership is created','partnership',58000); +insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PARTNERSHIP_MODIFY','Partnership modified','Executed when a partnership is modified','partnership',58002); +insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PARTNERSHIP_SENTBYMAIL','Mails sent from partnership file','Executed when you send email from partnership file','partnership',58004); +insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PARTNERSHIP_DELETE','Partnership deleted','Executed when a partnership is deleted','partnership',58006); + + -- amount was removed in v12 ALTER TABLE llx_facture DROP COLUMN amount; diff --git a/htdocs/install/repair.php b/htdocs/install/repair.php index e599dd336ab..8e0d3218df7 100644 --- a/htdocs/install/repair.php +++ b/htdocs/install/repair.php @@ -241,7 +241,7 @@ if ($ok && GETPOST('standard', 'alpha')) { 'fichinter'=>'fichinter', 'fichinterdet'=>'fichinterdet', 'inventory'=>'inventory', 'actioncomm'=>'actioncomm', 'bom_bom'=>'bom_bom', 'mrp_mo'=>'mrp_mo', - 'adherent_type'=>'adherent_type', 'user'=>'user', 'projet'=>'projet', 'projet_task'=>'projet_task', 'ticket'=>'ticket'); + 'adherent_type'=>'adherent_type', 'user'=>'user', 'partnershiap'=>'partnershiap', 'projet'=>'projet', 'projet_task'=>'projet_task', 'ticket'=>'ticket'); //$listofmodulesextra = array('fichinter'=>'fichinter'); print '
*** Check fields into extra table structure match table of definition. If not add column into table'; diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php index fd1f2f9bc1e..dfe1c7d9bc6 100644 --- a/htdocs/install/upgrade2.php +++ b/htdocs/install/upgrade2.php @@ -4137,6 +4137,7 @@ function migrate_delete_old_files($db, $langs, $conf) '/core/modules/mailings/poire.modules.php', '/core/modules/mailings/kiwi.modules.php', '/core/boxes/box_members.php', + '/includes/restler/framework/Luracast/Restler/Data/Object.php', '/api/class/api_generic.class.php', '/asterisk/cidlookup.php', diff --git a/htdocs/langs/en_US/partnership.lang b/htdocs/langs/en_US/partnership.lang index 105456dc719..31e2f5000bb 100644 --- a/htdocs/langs/en_US/partnership.lang +++ b/htdocs/langs/en_US/partnership.lang @@ -82,10 +82,10 @@ YourPartnershipRefusedTopic=Partnership refused YourPartnershipAcceptedTopic=Partnership accepted YourPartnershipCanceledTopic=Partnership canceled -YourPartnershipWillSoonBeCanceledContent=We inform you that your partnership will soon be canceled (Backlink not found) -YourPartnershipRefusedContent=We inform you that your partnership request has been refused. +YourPartnershipWillSoonBeCanceledContent=We would like to inform you that your partnership will soon be canceled (we did not get renewal or a prerequisite for our partnership is missing). Contact us by email if this is an error. +YourPartnershipRefusedContent=We inform you that your partnership request has been refused. May be a prerequisite is missing. Contact us if you need more information. YourPartnershipAcceptedContent=We inform you that your partnership request has been accepted. -YourPartnershipCanceledContent=We inform you that your partnership has been canceled. +YourPartnershipCanceledContent=We inform you that your partnership has been canceled. May be a prerequisite is missing. Contact us if you need more information. CountLastUrlCheckError=Number of errors for last URL check LastCheckBacklink=Date of last URL check diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php index 972a2322a23..a174dc9ffad 100644 --- a/htdocs/modulebuilder/template/myobject_list.php +++ b/htdocs/modulebuilder/template/myobject_list.php @@ -756,7 +756,7 @@ while ($i < $imaxinloop) { if (!empty($arrayfields['t.'.$key]['checked'])) { print '$key)) { + if (preg_match('/tdoverflow/', $cssforfield) && !in_array($val['type'], array('ip', 'url')) && !is_numeric($object->$key)) { print ' title="'.dol_escape_htmltag($object->$key).'"'; } print '>'; diff --git a/htdocs/partnership/class/partnership.class.php b/htdocs/partnership/class/partnership.class.php index bb71d053dfe..871ddfaff2d 100644 --- a/htdocs/partnership/class/partnership.class.php +++ b/htdocs/partnership/class/partnership.class.php @@ -120,11 +120,11 @@ class Partnership extends CommonObject 'model_pdf' => array('type'=>'varchar(255)', 'label'=>'Model pdf', 'enabled'=>'1', 'position'=>1010, 'notnull'=>-1, 'visible'=>0,), 'date_partnership_start' => array('type'=>'date', 'label'=>'DatePartnershipStart', 'enabled'=>'1', 'position'=>52, 'notnull'=>1, 'visible'=>1,), 'date_partnership_end' => array('type'=>'date', 'label'=>'DatePartnershipEnd', 'enabled'=>'1', 'position'=>53, 'notnull'=>0, 'visible'=>1,), - 'url_to_check' => array('type'=>'varchar(255)', 'label'=>'UrlToCheck', 'enabled'=>'1', 'position'=>70, 'notnull'=>0, 'visible'=>-1,), + 'url_to_check' => array('type'=>'url', 'label'=>'UrlToCheck', 'enabled'=>'1', 'position'=>70, 'notnull'=>0, 'visible'=>-1, 'csslist'=>'tdoverflowmax150'), 'count_last_url_check_error' => array('type'=>'integer', 'label'=>'CountLastUrlCheckError', 'enabled'=>'1', 'position'=>71, 'notnull'=>0, 'visible'=>-2, 'default'=>'0',), 'last_check_backlink' => array('type'=>'datetime', 'label'=>'LastCheckBacklink', 'enabled'=>'1', 'position'=>72, 'notnull'=>0, 'visible'=>-2,), 'reason_decline_or_cancel' => array('type'=>'text', 'label'=>'ReasonDeclineOrCancel', 'enabled'=>'1', 'position'=>73, 'notnull'=>0, 'visible'=>-2,), - 'ip' => array('type'=>'varchar(250)', 'label'=>'Ip', 'enabled'=>'1', 'position'=>74, 'notnull'=>0, 'visible'=>-2,), + 'ip' => array('type'=>'ip', 'label'=>'Ip', 'enabled'=>'1', 'position'=>74, 'notnull'=>0, 'visible'=>-2,), 'status' => array('type'=>'smallint', 'label'=>'Status', 'enabled'=>'1', 'position'=>2000, 'notnull'=>1, 'visible'=>2, 'default'=>'0', 'index'=>1, 'arrayofkeyval'=>array('0'=>'Draft', '1'=>'Accepted', '2'=>'Refused', '8'=>'Suspended', '9'=>'Terminated'),), ); public $rowid; diff --git a/htdocs/partnership/class/partnershiputils.class.php b/htdocs/partnership/class/partnershiputils.class.php index 86722ed1da2..c73bc4230d4 100644 --- a/htdocs/partnership/class/partnershiputils.class.php +++ b/htdocs/partnership/class/partnershiputils.class.php @@ -233,6 +233,8 @@ class PartnershipUtils $this->output = ''; $this->error = ''; $partnershipsprocessed = array(); + $emailnotfound = ''; + $websitenotfound = ''; $gracedelay = $conf->global->PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL; if ($gracedelay < 1) { @@ -251,21 +253,16 @@ class PartnershipUtils $sql = "SELECT p.rowid, p.status, p.".$fk_partner; $sql .= ", p.last_check_backlink"; - $sql .= ', partner.url, partner.email'; - $sql .= " FROM ".MAIN_DB_PREFIX."partnership as p"; - if ($managedfor == 'member') { $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."adherent as partner on (partner.rowid = p.fk_member)"; } else { $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as partner on (partner.rowid = p.fk_soc)"; } - - $sql .= " WHERE 1 = 1"; - $sql .= " AND p.".$fk_partner." > 0"; - $sql .= " AND p.status = ".((int) $partnership::STATUS_APPROVED); // Only accepted not yet canceled - $sql .= " AND (p.last_check_backlink IS NULL OR p.last_check_backlink <= '".$this->db->idate($now - 7 * 24 * 3600)."')"; // Every week, check that website contains a link to dolibarr. + $sql .= " WHERE p.".$fk_partner." > 0"; + $sql .= " AND p.status = ".((int) $partnership::STATUS_APPROVED); // Only accepted and not yet canceled + $sql .= " AND (p.last_check_backlink IS NULL OR p.last_check_backlink <= '".$this->db->idate($now - 24 * 3600)."')"; // Never more than 1 check every day to check that website contains a referal link. $sql .= $this->db->order('p.rowid', 'ASC'); // Limit is managed into loop later @@ -274,7 +271,6 @@ class PartnershipUtils $numofexpiredmembers = $this->db->num_rows($resql); $somethingdoneonpartnership = 0; $ifetchpartner = 0; - $websitenotfound = ''; while ($ifetchpartner < $numofexpiredmembers) { $ifetchpartner++; @@ -376,18 +372,16 @@ class PartnershipUtils if (!$error) { $this->db->commit(); - $this->output = $numofexpiredmembers.' partnership checked'."\n"; - if ($erroremail) $this->output .= '. Got errors when sending some email : '.$erroremail."\n"; - if ($emailnotfound) $this->output .= '. Email not found for some partner : '.$emailnotfound."\n"; - if ($websitenotfound) $this->output .= '. Website not found for some partner : '.$websitenotfound."\n"; + $this->output = ""; } else { $this->db->rollback(); $this->output = "Rollback after error\n"; - $this->output .= $numofexpiredmembers.' partnership checked'."\n"; - if ($erroremail) $this->output .= '. Got errors when sending some email : '.$erroremail."\n"; - if ($emailnotfound) $this->output .= '. Email not found for some partner : '.$emailnotfound."\n"; - if ($websitenotfound) $this->output .= '. Website not found for some partner : '.$websitenotfound."\n"; } + $this->output .= $numofexpiredmembers.' partnership checked'."\n"; + if ($erroremail) $this->output .= '. Got errors when sending some email : '.$erroremail."\n"; + if ($emailnotfound) $this->output .= '. Email not found for some partner : '.$emailnotfound."\n"; + if ($websitenotfound) $this->output .= '. Website not found for some partner : '.$websitenotfound."\n"; + $this->output .= "\nSQL used to find partnerships to scan: ".$sql; return ($error ? 1 : 0); } diff --git a/htdocs/partnership/core/modules/partnership/mod_partnership_advanced.php b/htdocs/partnership/core/modules/partnership/mod_partnership_advanced.php index 821a9e67303..c3b3a888b54 100644 --- a/htdocs/partnership/core/modules/partnership/mod_partnership_advanced.php +++ b/htdocs/partnership/core/modules/partnership/mod_partnership_advanced.php @@ -3,7 +3,7 @@ * Copyright (C) 2004-2007 Laurent Destailleur * Copyright (C) 2005-2009 Regis Houssin * Copyright (C) 2008 Raphael Bertrand (Resultic) - * Copyright (C) 2019 Frédéric France + * Copyright (C) 2019-2023 Frédéric France * * 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 @@ -26,7 +26,7 @@ * \brief File containing class for advanced numbering model of Partnership */ -dol_include_once('/partnership/core/modules/partnership/modules_partnership.php'); +require_once DOL_DOCUMENT_ROOT.'/partnership/core/modules/partnership/modules_partnership.php'; /** @@ -54,22 +54,23 @@ class mod_partnership_advanced extends ModeleNumRefPartnership /** * Returns the description of the numbering model * + * @param Translate $langs Lang object to use for output * @return string Descriptive text */ - public function info() + public function info($langs) { - global $conf, $langs, $db; + global $db; $langs->load("bills"); $form = new Form($db); - $texte = $langs->trans('GenericNumRefModelDesc')."
\n"; - $texte .= '
'; - $texte .= ''; - $texte .= ''; - $texte .= ''; - $texte .= ''; + $text = $langs->trans('GenericNumRefModelDesc')."
\n"; + $text .= ''; + $text .= ''; + $text .= ''; + $text .= ''; + $text .= '
'; $tooltip = $langs->trans("GenericMaskCodes", $langs->transnoentities("Partnership"), $langs->transnoentities("Partnership")); $tooltip .= $langs->trans("GenericMaskCodes2"); @@ -78,17 +79,17 @@ class mod_partnership_advanced extends ModeleNumRefPartnership $tooltip .= $langs->trans("GenericMaskCodes5"); // Parametrage du prefix - $texte .= ''; - $texte .= ''; + $text .= ''; + $text .= ''; - $texte .= ''; + $text .= ''; - $texte .= ''; + $text .= ''; - $texte .= '
'.$langs->trans("Mask").':'.$form->textwithpicto('', $tooltip, 1, 1).'
'.$langs->trans("Mask").':'.$form->textwithpicto('', $tooltip, 1, 1).'   
'; - $texte .= '
'; + $text .= ''; + $text .= ''; - return $texte; + return $text; } /** diff --git a/htdocs/partnership/core/modules/partnership/mod_partnership_standard.php b/htdocs/partnership/core/modules/partnership/mod_partnership_standard.php index 5de4b07f215..c7409aba85e 100644 --- a/htdocs/partnership/core/modules/partnership/mod_partnership_standard.php +++ b/htdocs/partnership/core/modules/partnership/mod_partnership_standard.php @@ -22,7 +22,7 @@ * \ingroup partnership * \brief File of class to manage Partnership numbering rules standard */ -dol_include_once('/partnership/core/modules/partnership/modules_partnership.php'); +require_once DOL_DOCUMENT_ROOT.'/partnership/core/modules/partnership/modules_partnership.php'; /** @@ -52,11 +52,11 @@ class mod_partnership_standard extends ModeleNumRefPartnership /** * Return description of numbering module * - * @return string Text with description + * @param Translate $langs Lang object to use for output + * @return string Text with description */ - public function info() + public function info($langs) { - global $langs; return $langs->trans("SimpleNumRefModelDesc", $this->prefix); } diff --git a/htdocs/partnership/core/modules/partnership/modules_partnership.php b/htdocs/partnership/core/modules/partnership/modules_partnership.php index 4d1f6c0b107..dafab0cc8ed 100644 --- a/htdocs/partnership/core/modules/partnership/modules_partnership.php +++ b/htdocs/partnership/core/modules/partnership/modules_partnership.php @@ -29,6 +29,7 @@ */ require_once DOL_DOCUMENT_ROOT.'/core/class/commondocgenerator.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/commonnumrefgenerator.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; // required for use by classes that inherit @@ -66,93 +67,7 @@ abstract class ModelePDFPartnership extends CommonDocGenerator /** * Parent class to manage numbering of Partnership */ -abstract class ModeleNumRefPartnership +abstract class ModeleNumRefPartnership extends CommonNumRefGenerator { - /** - * @var string Error code (or message) - */ - public $error = ''; - - /** - * Return if a module can be used or not - * - * @return boolean true if module can be used - */ - public function isEnabled() - { - return true; - } - - /** - * Returns the default description of the numbering template - * - * @return string Descriptive text - */ - public function info() - { - global $langs; - $langs->load("partnership"); - return $langs->trans("NoDescription"); - } - - /** - * Returns an example of numbering - * - * @return string Example - */ - public function getExample() - { - global $langs; - $langs->load("partnership"); - return $langs->trans("NoExample"); - } - - /** - * Checks if the numbers already in the database do not - * cause conflicts that would prevent this numbering working. - * - * @param Object $object Object we need next value for - * @return boolean false if conflict, true if ok - */ - public function canBeActivated($object) - { - return true; - } - - /** - * Returns next assigned value - * - * @param Object $object Object we need next value for - * @return string Valeur - */ - public function getNextValue($object) - { - global $langs; - return $langs->trans("NotAvailable"); - } - - /** - * Returns version of numbering module - * - * @return string Valeur - */ - public function getVersion() - { - global $langs; - $langs->load("admin"); - - if ($this->version == 'development') { - return $langs->trans("VersionDevelopment"); - } - if ($this->version == 'experimental') { - return $langs->trans("VersionExperimental"); - } - if ($this->version == 'dolibarr') { - return DOL_VERSION; - } - if ($this->version) { - return $this->version; - } - return $langs->trans("NotAvailable"); - } + // No overload code } diff --git a/htdocs/partnership/partnership_list.php b/htdocs/partnership/partnership_list.php index 98d78e0a2b2..27821a2b799 100644 --- a/htdocs/partnership/partnership_list.php +++ b/htdocs/partnership/partnership_list.php @@ -914,7 +914,7 @@ while ($i < $imaxinloop) { if (!empty($arrayfields['t.'.$key]['checked'])) { print '$key)) { + if (preg_match('/tdoverflow/', $cssforfield) && !in_array($val['type'], array('ip', 'url')) && !is_numeric($object->$key)) { print ' title="'.dol_escape_htmltag($object->$key).'"'; } print '>'; diff --git a/htdocs/paypal/lib/paypal.lib.php b/htdocs/paypal/lib/paypal.lib.php index 79003956f12..db949620440 100644 --- a/htdocs/paypal/lib/paypal.lib.php +++ b/htdocs/paypal/lib/paypal.lib.php @@ -145,7 +145,7 @@ function print_paypal_redirect($paymentAmount, $currencyCodeType, $paymentType, $ErrorSeverityCode = urldecode($resArray["L_SEVERITYCODE0"]); if ($ErrorCode == 10729) { - $mesg .= "PayPal can't accept payments for this thirdparty. An address is defined but is not complete (missing State).
Ask system administrator to fix address or to setup Paypal module to accept payments even on not complete addresses (remove option PAYPAL_REQUIRE_VALID_SHIPPING_ADDRESS).
\n"; + $mesg = "PayPal can't accept payments for this thirdparty. An address is defined but is not complete (missing State).
Ask system administrator to fix address or to setup Paypal module to accept payments even on not complete addresses (remove option PAYPAL_REQUIRE_VALID_SHIPPING_ADDRESS).
\n"; } else { $mesg = $langs->trans('SetExpressCheckoutAPICallFailed')."
\n"; $mesg .= $langs->trans('DetailedErrorMessage').": ".$ErrorLongMsg."
\n"; diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php index 4466138e006..99f0f375b4f 100644 --- a/htdocs/projet/class/project.class.php +++ b/htdocs/projet/class/project.class.php @@ -495,7 +495,6 @@ class Project extends CommonObject } } else { $this->error = $this->db->lasterror(); - $this->errno = $this->db->lasterrno(); $error++; } diff --git a/htdocs/public/bookcal/booking.php b/htdocs/public/bookcal/booking.php index d478046d143..74972cfc8f0 100644 --- a/htdocs/public/bookcal/booking.php +++ b/htdocs/public/bookcal/booking.php @@ -19,7 +19,7 @@ */ /** - * \file htdocs/public/onlinesign/newonlinesign.php + * \file htdocs/public/bookcal/booking.php * \ingroup core * \brief File to offer a way to make an online signature for a particular Dolibarr entity * Example of URL: https://localhost/public/bookcal/booking.php?ref=PR... @@ -44,7 +44,6 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; require_once DOL_DOCUMENT_ROOT.'/bookcal/class/calendar.class.php'; require_once DOL_DOCUMENT_ROOT.'/bookcal/class/availabilities.class.php'; -require_once DOL_DOCUMENT_ROOT.'/bookcal/class/booking.class.php'; $langs->loadLangs(array("main", "other", "dict", "agenda", "errors", "companies")); @@ -175,7 +174,7 @@ if ($action == 'add') { $user = new User($db); } - $booking = new Booking($db); + $booking = new ActionComm($db); $db->begin(); if (!GETPOST("lastname")) { diff --git a/htdocs/public/bookcal/index.php b/htdocs/public/bookcal/index.php index 530f37fc91e..cd4db57da4d 100644 --- a/htdocs/public/bookcal/index.php +++ b/htdocs/public/bookcal/index.php @@ -19,7 +19,7 @@ */ /** - * \file htdocs/public/onlinesign/newonlinesign.php + * \file htdocs/public/bookcal/index.php * \ingroup core * \brief File to offer a way to make an online signature for a particular Dolibarr entity * Example of URL: https://localhost/public/bookcal/booking.php?ref=PR... @@ -44,6 +44,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; require_once DOL_DOCUMENT_ROOT.'/bookcal/class/calendar.class.php'; require_once DOL_DOCUMENT_ROOT.'/bookcal/class/availabilities.class.php'; +require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php'; $langs->loadLangs(array("main", "other", "dict", "agenda", "errors", "bookcal")); diff --git a/htdocs/public/partnership/new.php b/htdocs/public/partnership/new.php index 174b35dc9b8..2bd0247a965 100644 --- a/htdocs/public/partnership/new.php +++ b/htdocs/public/partnership/new.php @@ -229,6 +229,7 @@ if (empty($reshook) && $action == 'add') { $partnership->date_partnership_start = dol_now(); $partnership->fk_user_creat = 0; $partnership->fk_type = GETPOST('partnershiptype', 'int'); + $partnership->url = GETPOST('url'); //$partnership->typeid = $conf->global->PARTNERSHIP_NEWFORM_FORCETYPE ? $conf->global->PARTNERSHIP_NEWFORM_FORCETYPE : GETPOST('typeid', 'int'); $partnership->ip = getUserRemoteIP(); @@ -253,16 +254,16 @@ if (empty($reshook) && $action == 'add') { } } } - // test if societe already exist + // test if thirdparty already exists $company = new Societe($db); $result = $company->fetch(0, GETPOST('societe')); - if ($result == 0) { // si il ya pas d'entree sur le nom on teste l'email + if ($result == 0) { // if entry with name not found, we search using the email $result1 = $company->fetch(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, GETPOST('email')); if ($result1 > 0) { $error++; $errmsg = $langs->trans("EmailAlreadyExistsPleaseRewriteYourCompanyName"); } else { - //create thirdparty + // create thirdparty $company = new Societe($db); $company->name = GETPOST('societe'); diff --git a/htdocs/reception/class/reception.class.php b/htdocs/reception/class/reception.class.php index c9cf763882c..9fb6a0cb6a9 100644 --- a/htdocs/reception/class/reception.class.php +++ b/htdocs/reception/class/reception.class.php @@ -93,6 +93,7 @@ class Reception extends CommonObject public $depth_units; // A denormalized value public $trueSize; + public $size_units; public $date_delivery; // Date delivery planed @@ -121,6 +122,11 @@ class Reception extends CommonObject public $meths; public $listmeths; // List of carriers + /** + * @var CommandeFournisseur + */ + public $commandeFournisseur; + /** * @var CommandeFournisseurDispatch[] */