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

This commit is contained in:
Maxime Kohlhaas 2025-01-14 09:56:45 +01:00
commit 69c8be97bf
231 changed files with 1731 additions and 791 deletions

View file

@ -12162,12 +12162,6 @@ parameters:
count: 1
path: ../../../htdocs/core/modules/asset/doc/pdf_standard_asset.modules.php
-
message: '#^Property mod_asset_standard\:\:\$prefix has no type specified\.$#'
identifier: missingType.property
count: 1
path: ../../../htdocs/core/modules/asset/mod_asset_standard.php
-
message: '#^Call to function is_object\(\) with object will always evaluate to true\.$#'
identifier: function.alreadyNarrowedType
@ -12276,24 +12270,12 @@ parameters:
count: 1
path: ../../../htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php
-
message: '#^Property mod_bom_standard\:\:\$prefix has no type specified\.$#'
identifier: missingType.property
count: 1
path: ../../../htdocs/core/modules/bom/mod_bom_standard.php
-
message: '#^Call to function is_object\(\) with object will always evaluate to true\.$#'
identifier: function.alreadyNarrowedType
count: 1
path: ../../../htdocs/core/modules/cheque/doc/pdf_blochet.class.php
-
message: '#^Property mod_chequereceipt_mint\:\:\$prefix has no type specified\.$#'
identifier: missingType.property
count: 1
path: ../../../htdocs/core/modules/cheque/mod_chequereceipt_mint.php
-
message: '#^Parameter \#1 \$object of method CommonDocGenerator\:\:get_substitutionarray_each_var_object\(\) expects array\<string, CommonObject\|float\|int\|string\>, Commande given\.$#'
identifier: argument.type
@ -12486,12 +12468,6 @@ parameters:
count: 1
path: ../../../htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
-
message: '#^Property mod_commande_marbre\:\:\$prefix has no type specified\.$#'
identifier: missingType.property
count: 1
path: ../../../htdocs/core/modules/commande/mod_commande_marbre.php
-
message: '#^Parameter \#1 \$object of method CommonDocGenerator\:\:get_substitutionarray_each_var_object\(\) expects array\<string, CommonObject\|float\|int\|string\>, Contrat given\.$#'
identifier: argument.type
@ -12630,12 +12606,6 @@ parameters:
count: 1
path: ../../../htdocs/core/modules/delivery/doc/pdf_typhon.modules.php
-
message: '#^Property mod_delivery_jade\:\:\$prefix has no type specified\.$#'
identifier: missingType.property
count: 1
path: ../../../htdocs/core/modules/delivery/mod_delivery_jade.php
-
message: '#^Call to function is_object\(\) with object will always evaluate to true\.$#'
identifier: function.alreadyNarrowedType
@ -12792,12 +12762,6 @@ parameters:
count: 1
path: ../../../htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
-
message: '#^Property mod_expedition_safor\:\:\$prefix has no type specified\.$#'
identifier: missingType.property
count: 1
path: ../../../htdocs/core/modules/expedition/mod_expedition_safor.php
-
message: '#^Parameter \#3 \$posy of method pdf_standard_expensereport\:\:tablePayments\(\) expects int, float given\.$#'
identifier: argument.type
@ -12852,12 +12816,6 @@ parameters:
count: 6
path: ../../../htdocs/core/modules/expensereport/doc/pdf_standard_expensereport.modules.php
-
message: '#^Property mod_expensereport_jade\:\:\$prefix has no type specified\.$#'
identifier: missingType.property
count: 1
path: ../../../htdocs/core/modules/expensereport/mod_expensereport_jade.php
-
message: '#^Parameter \#1 \$object of method CommonDocGenerator\:\:get_substitutionarray_each_var_object\(\) expects array\<string, CommonObject\|float\|int\|string\>, Facture given\.$#'
identifier: argument.type
@ -13344,12 +13302,6 @@ parameters:
count: 1
path: ../../../htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
-
message: '#^Property mod_pacific\:\:\$prefix has no type specified\.$#'
identifier: missingType.property
count: 1
path: ../../../htdocs/core/modules/fichinter/mod_pacific.php
-
message: '#^Variable \$max might not be defined\.$#'
identifier: variable.undefined
@ -13374,12 +13326,6 @@ parameters:
count: 1
path: ../../../htdocs/core/modules/hrm/doc/pdf_standard_evaluation.modules.php
-
message: '#^Property mod_evaluation_standard\:\:\$prefix has no type specified\.$#'
identifier: missingType.property
count: 1
path: ../../../htdocs/core/modules/hrm/mod_evaluation_standard.php
-
message: '#^Call to function is_array\(\) with non\-empty\-list\<string\|null\> will always evaluate to true\.$#'
identifier: function.alreadyNarrowedType
@ -13848,24 +13794,6 @@ parameters:
count: 1
path: ../../../htdocs/core/modules/modPrelevement.class.php
-
message: '#^Property DolibarrModules\:\:\$const \(array\<array\{0\: string, 1\: string, 2\: int\|string, 3\: string, 4\?\: int\<0, 1\>, 5\?\: string, 6\?\: int\<0, 1\>\}\>\) does not accept non\-empty\-array\<array\{''PRODUCT_CODEPRODUCT…'', ''chaine''\}\|array\{0\: string, 1\: string, 2\: int\|string, 3\: string, 4\?\: int\<0, 1\>, 5\?\: string, 6\?\: int\<0, 1\>\}\>\.$#'
identifier: assign.propertyType
count: 1
path: ../../../htdocs/core/modules/modProduct.class.php
-
message: '#^Property DolibarrModules\:\:\$const \(array\<array\{0\: string, 1\: string, 2\: int\|string, 3\: string, 4\?\: int\<0, 1\>, 5\?\: string, 6\?\: int\<0, 1\>\}\>\) does not accept non\-empty\-array\<array\{''PRODUCT_PRICE_UNIQ'', ''chaine''\}\|array\{0\: string, 1\: string, 2\: int\|string, 3\: string, 4\?\: int\<0, 1\>, 5\?\: string, 6\?\: int\<0, 1\>\}\>\.$#'
identifier: assign.propertyType
count: 1
path: ../../../htdocs/core/modules/modProduct.class.php
-
message: '#^Property DolibarrModules\:\:\$const \(array\<array\{0\: string, 1\: string, 2\: int\|string, 3\: string, 4\?\: int\<0, 1\>, 5\?\: string, 6\?\: int\<0, 1\>\}\>\) does not accept non\-empty\-array\<array\{0\: string, 1\: string, 2\: int\|string, 3\?\: string, 4\?\: int\<0, 1\>, 5\?\: string, 6\?\: int\<0, 1\>\}\>\.$#'
identifier: assign.propertyType
count: 2
path: ../../../htdocs/core/modules/modProduct.class.php
-
message: '#^Property DolibarrModules\:\:\$import_convertvalue_array \(array\<array\<array\{rule\: string, file\: string, class\: string, method\: string\}\>\>\) does not accept non\-empty\-array\<array\<array\{rule\: ''accountingaccount''\}\|array\{rule\: ''fetchidfromcodeid'', classfile\: ''/core/class…'', class\: ''Ccountry'', method\: ''fetch'', dict\: ''DictionaryCountry''\}\|array\{rule\: ''fetchidfromcodeorla…'', classfile\: ''/core/class/cunits…'', class\: ''CUnits'', method\: ''fetch'', dict\: ''DictionaryUnits''\}\|array\{rule\: ''fetchidfromcodeorla…'', classfile\: ''/core/class…'', class\: ''CProductNature'', method\: ''fetch'', dict\: ''DictionaryProductNa…''\}\|array\{rule\: ''fetchidfromref'', classfile\: ''/product/stock…'', class\: ''Entrepot'', method\: ''fetch'', element\: ''Warehouse''\}\|array\{rule\: ''fetchscalefromcodeu…'', classfile\: ''/core/class/cunits…'', class\: ''CUnits'', method\: ''fetch'', units\: ''size''\|''surface''\|''volume''\|''weight'', dict\: ''DictionaryMeasuring…''\}\|array\{rule\: string, file\: string, class\: string, method\: string\}\>\>\.$#'
identifier: assign.propertyType
@ -13890,66 +13818,6 @@ parameters:
count: 1
path: ../../../htdocs/core/modules/modProduct.class.php
-
message: '#^Property DolibarrModules\:\:\$const \(array\<array\{0\: string, 1\: string, 2\: int\|string, 3\: string, 4\?\: int\<0, 1\>, 5\?\: string, 6\?\: int\<0, 1\>\}\>\) does not accept non\-empty\-array\<array\{''PRODUCTBATCH_LOT…'', ''chaine''\}\|array\{0\: string, 1\: string, 2\: int\|string, 3\: string, 4\?\: int\<0, 1\>, 5\?\: string, 6\?\: int\<0, 1\>\}\>\.$#'
identifier: assign.propertyType
count: 1
path: ../../../htdocs/core/modules/modProductBatch.class.php
-
message: '#^Property DolibarrModules\:\:\$const \(array\<array\{0\: string, 1\: string, 2\: int\|string, 3\: string, 4\?\: int\<0, 1\>, 5\?\: string, 6\?\: int\<0, 1\>\}\>\) does not accept non\-empty\-array\<array\{''PRODUCTBATCH_SN…'', ''chaine''\}\|array\{0\: string, 1\: string, 2\: int\|string, 3\: string, 4\?\: int\<0, 1\>, 5\?\: string, 6\?\: int\<0, 1\>\}\>\.$#'
identifier: assign.propertyType
count: 1
path: ../../../htdocs/core/modules/modProductBatch.class.php
-
message: '#^Property DolibarrModules\:\:\$const \(array\<array\{0\: string, 1\: string, 2\: int\|string, 3\: string, 4\?\: int\<0, 1\>, 5\?\: string, 6\?\: int\<0, 1\>\}\>\) does not accept non\-empty\-array\<array\{0\: string, 1\: string, 2\: int\|string, 3\?\: string, 4\?\: int\<0, 1\>, 5\?\: string, 6\?\: int\<0, 1\>\}\>\.$#'
identifier: assign.propertyType
count: 2
path: ../../../htdocs/core/modules/modProductBatch.class.php
-
message: '#^Property DolibarrModules\:\:\$const \(array\<array\{0\: string, 1\: string, 2\: int\|string, 3\: string, 4\?\: int\<0, 1\>, 5\?\: string, 6\?\: int\<0, 1\>\}\>\) does not accept non\-empty\-array\<array\{''PROJECT_ADDON'', ''chaine''\}\|array\{0\: string, 1\: string, 2\: int\|string, 3\: string, 4\?\: int\<0, 1\>, 5\?\: string, 6\?\: int\<0, 1\>\}\>\.$#'
identifier: assign.propertyType
count: 1
path: ../../../htdocs/core/modules/modProjet.class.php
-
message: '#^Property DolibarrModules\:\:\$const \(array\<array\{0\: string, 1\: string, 2\: int\|string, 3\: string, 4\?\: int\<0, 1\>, 5\?\: string, 6\?\: int\<0, 1\>\}\>\) does not accept non\-empty\-array\<array\{''PROJECT_ADDON_PDF'', ''chaine''\}\|array\{0\: string, 1\: string, 2\: int\|string, 3\: string, 4\?\: int\<0, 1\>, 5\?\: string, 6\?\: int\<0, 1\>\}\>\.$#'
identifier: assign.propertyType
count: 1
path: ../../../htdocs/core/modules/modProjet.class.php
-
message: '#^Property DolibarrModules\:\:\$const \(array\<array\{0\: string, 1\: string, 2\: int\|string, 3\: string, 4\?\: int\<0, 1\>, 5\?\: string, 6\?\: int\<0, 1\>\}\>\) does not accept non\-empty\-array\<array\{''PROJECT_ADDON_PDF…'', ''chaine''\}\|array\{0\: string, 1\: string, 2\: int\|string, 3\: string, 4\?\: int\<0, 1\>, 5\?\: string, 6\?\: int\<0, 1\>\}\>\.$#'
identifier: assign.propertyType
count: 1
path: ../../../htdocs/core/modules/modProjet.class.php
-
message: '#^Property DolibarrModules\:\:\$const \(array\<array\{0\: string, 1\: string, 2\: int\|string, 3\: string, 4\?\: int\<0, 1\>, 5\?\: string, 6\?\: int\<0, 1\>\}\>\) does not accept non\-empty\-array\<array\{''PROJECT_TASK_ADDON'', ''chaine''\}\|array\{0\: string, 1\: string, 2\: int\|string, 3\: string, 4\?\: int\<0, 1\>, 5\?\: string, 6\?\: int\<0, 1\>\}\>\.$#'
identifier: assign.propertyType
count: 1
path: ../../../htdocs/core/modules/modProjet.class.php
-
message: '#^Property DolibarrModules\:\:\$const \(array\<array\{0\: string, 1\: string, 2\: int\|string, 3\: string, 4\?\: int\<0, 1\>, 5\?\: string, 6\?\: int\<0, 1\>\}\>\) does not accept non\-empty\-array\<array\{''PROJECT_TASK_ADDON…'', ''chaine''\}\|array\{0\: string, 1\: string, 2\: int\|string, 3\: string, 4\?\: int\<0, 1\>, 5\?\: string, 6\?\: int\<0, 1\>\}\>\.$#'
identifier: assign.propertyType
count: 2
path: ../../../htdocs/core/modules/modProjet.class.php
-
message: '#^Property DolibarrModules\:\:\$const \(array\<array\{0\: string, 1\: string, 2\: int\|string, 3\: string, 4\?\: int\<0, 1\>, 5\?\: string, 6\?\: int\<0, 1\>\}\>\) does not accept non\-empty\-array\<array\{''PROJECT_USE…'', ''chaine''\}\|array\{0\: string, 1\: string, 2\: int\|string, 3\: string, 4\?\: int\<0, 1\>, 5\?\: string, 6\?\: int\<0, 1\>\}\>\.$#'
identifier: assign.propertyType
count: 1
path: ../../../htdocs/core/modules/modProjet.class.php
-
message: '#^Property DolibarrModules\:\:\$const \(array\<array\{0\: string, 1\: string, 2\: int\|string, 3\: string, 4\?\: int\<0, 1\>, 5\?\: string, 6\?\: int\<0, 1\>\}\>\) does not accept non\-empty\-array\<array\{0\: string, 1\: string, 2\: int\|string, 3\?\: string, 4\?\: int\<0, 1\>, 5\?\: string, 6\?\: int\<0, 1\>\}\>\.$#'
identifier: assign.propertyType
count: 7
path: ../../../htdocs/core/modules/modProjet.class.php
-
message: '#^Property DolibarrModules\:\:\$import_convertvalue_array \(array\<array\<array\{rule\: string, file\: string, class\: string, method\: string\}\>\>\) does not accept non\-empty\-array\<array\<array\{rule\: ''fetchidfromref'', classfile\: ''/projet/class…'', class\: ''Project'', method\: ''fetch'', element\: ''Project''\}\|array\{rule\: ''getrefifauto'', class\: mixed, path\: non\-falsy\-string\}\|array\{rule\: string, file\: string, class\: string, method\: string\}\>\>\.$#'
identifier: assign.propertyType
@ -14364,12 +14232,6 @@ parameters:
count: 1
path: ../../../htdocs/core/modules/mrp/doc/pdf_vinci.modules.php
-
message: '#^Property mod_mo_standard\:\:\$prefix has no type specified\.$#'
identifier: missingType.property
count: 1
path: ../../../htdocs/core/modules/mrp/mod_mo_standard.php
-
message: '#^Negated boolean expression is always true\.$#'
identifier: booleanNot.alwaysTrue
@ -14388,12 +14250,6 @@ parameters:
count: 2
path: ../../../htdocs/core/modules/oauth/stripelive_oauthcallback.php
-
message: '#^Property mod_payment_cicada\:\:\$prefix has no type specified\.$#'
identifier: missingType.property
count: 1
path: ../../../htdocs/core/modules/payment/mod_payment_cicada.php
-
message: '#^Variable \$response might not be defined\.$#'
identifier: variable.undefined
@ -14502,18 +14358,6 @@ parameters:
count: 1
path: ../../../htdocs/core/modules/product/modules_product.class.php
-
message: '#^Property mod_lot_standard\:\:\$prefix has no type specified\.$#'
identifier: missingType.property
count: 1
path: ../../../htdocs/core/modules/product_batch/mod_lot_standard.php
-
message: '#^Property mod_sn_standard\:\:\$prefix has no type specified\.$#'
identifier: missingType.property
count: 1
path: ../../../htdocs/core/modules/product_batch/mod_sn_standard.php
-
message: '#^Call to function is_array\(\) with array will always evaluate to true\.$#'
identifier: function.alreadyNarrowedType
@ -14586,12 +14430,6 @@ parameters:
count: 1
path: ../../../htdocs/core/modules/project/doc/pdf_timespent.modules.php
-
message: '#^Property mod_project_simple\:\:\$prefix has no type specified\.$#'
identifier: missingType.property
count: 1
path: ../../../htdocs/core/modules/project/mod_project_simple.php
-
message: '#^Call to function is_array\(\) with array will always evaluate to true\.$#'
identifier: function.alreadyNarrowedType
@ -14634,12 +14472,6 @@ parameters:
count: 2
path: ../../../htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
-
message: '#^Property mod_task_simple\:\:\$prefix has no type specified\.$#'
identifier: missingType.property
count: 1
path: ../../../htdocs/core/modules/project/task/mod_task_simple.php
-
message: '#^Parameter \#1 \$object of method CommonDocGenerator\:\:get_substitutionarray_each_var_object\(\) expects array\<string, CommonObject\|float\|int\|string\>, Propal given\.$#'
identifier: argument.type
@ -14826,12 +14658,6 @@ parameters:
count: 2
path: ../../../htdocs/core/modules/propale/doc/pdf_cyan.modules.php
-
message: '#^Property mod_propale_marbre\:\:\$prefix has no type specified\.$#'
identifier: missingType.property
count: 1
path: ../../../htdocs/core/modules/propale/mod_propale_marbre.php
-
message: '#^Call to function is_object\(\) with object will always evaluate to true\.$#'
identifier: function.alreadyNarrowedType
@ -15120,12 +14946,6 @@ parameters:
count: 1
path: ../../../htdocs/core/modules/stocktransfer/doc/pdf_eagle_proforma.modules.php
-
message: '#^Property mod_stocktransfer_standard\:\:\$prefix has no type specified\.$#'
identifier: missingType.property
count: 1
path: ../../../htdocs/core/modules/stocktransfer/mod_stocktransfer_standard.php
-
message: '#^Parameter \#1 \$object of method CommonDocGenerator\:\:get_substitutionarray_each_var_object\(\) expects array\<string, CommonObject\|float\|int\|string\>, FactureFournisseur given\.$#'
identifier: argument.type
@ -15390,12 +15210,6 @@ parameters:
count: 1
path: ../../../htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
-
message: '#^Property mod_commande_fournisseur_muguet\:\:\$prefix has no type specified\.$#'
identifier: missingType.property
count: 1
path: ../../../htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php
-
message: '#^Variable \$max might not be defined\.$#'
identifier: variable.undefined
@ -15444,12 +15258,6 @@ parameters:
count: 1
path: ../../../htdocs/core/modules/supplier_payment/doc/pdf_standard_supplierpayment.modules.php
-
message: '#^Property mod_supplier_payment_bronan\:\:\$prefix has no type specified\.$#'
identifier: missingType.property
count: 1
path: ../../../htdocs/core/modules/supplier_payment/mod_supplier_payment_bronan.php
-
message: '#^Parameter \#1 \$line of method CommonDocGenerator\:\:get_substitutionarray_lines\(\) expects CommonObjectLine, CommonObject\|stdClass given\.$#'
identifier: argument.type
@ -15600,24 +15408,12 @@ parameters:
count: 1
path: ../../../htdocs/core/modules/supplier_proposal/doc/pdf_zenith.modules.php
-
message: '#^Property mod_supplier_proposal_marbre\:\:\$prefix has no type specified\.$#'
identifier: missingType.property
count: 1
path: ../../../htdocs/core/modules/supplier_proposal/mod_supplier_proposal_marbre.php
-
message: '#^Variable \$contactobject might not be defined\.$#'
identifier: variable.undefined
count: 1
path: ../../../htdocs/core/modules/ticket/doc/doc_generic_ticket_odt.modules.php
-
message: '#^Property mod_ticket_simple\:\:\$prefix has no type specified\.$#'
identifier: missingType.property
count: 1
path: ../../../htdocs/core/modules/ticket/mod_ticket_simple.php
-
message: '#^Variable \$contactobject might not be defined\.$#'
identifier: variable.undefined
@ -15654,12 +15450,6 @@ parameters:
count: 1
path: ../../../htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php
-
message: '#^Property mod_workstation_standard\:\:\$prefix has no type specified\.$#'
identifier: missingType.property
count: 1
path: ../../../htdocs/core/modules/workstation/mod_workstation_standard.php
-
message: '#^Negated boolean expression is always false\.$#'
identifier: booleanNot.alwaysFalse
@ -17113,8 +16903,8 @@ parameters:
path: ../../../htdocs/ecm/dir_add_card.php
-
message: '#^Variable \$extrafields might not be defined\.$#'
identifier: variable.undefined
message: '#^Parameter \#1 \$object of function ecm_prepare_head expects EcmDirectory, CommonObject given\.$#'
identifier: argument.type
count: 1
path: ../../../htdocs/ecm/dir_card.php
@ -21318,12 +21108,6 @@ parameters:
count: 1
path: ../../../htdocs/includes/odtphp/Segment.php
-
message: '#^Property Segment\:\:\$name has no type specified\.$#'
identifier: missingType.property
count: 1
path: ../../../htdocs/includes/odtphp/Segment.php
-
message: '#^Property Segment\:\:\$odf has no type specified\.$#'
identifier: missingType.property
@ -21336,18 +21120,6 @@ parameters:
count: 1
path: ../../../htdocs/includes/odtphp/Segment.php
-
message: '#^Property Segment\:\:\$xml has no type specified\.$#'
identifier: missingType.property
count: 1
path: ../../../htdocs/includes/odtphp/Segment.php
-
message: '#^Property Segment\:\:\$xmlParsed has no type specified\.$#'
identifier: missingType.property
count: 1
path: ../../../htdocs/includes/odtphp/Segment.php
-
message: '#^Class SegmentIterator implements generic interface RecursiveIterator but does not specify its types\: TKey, TValue$#'
identifier: missingType.generics
@ -24222,12 +23994,6 @@ parameters:
count: 2
path: ../../../htdocs/partnership/class/partnershiputils.class.php
-
message: '#^Property mod_partnership_standard\:\:\$prefix has no type specified\.$#'
identifier: missingType.property
count: 1
path: ../../../htdocs/partnership/core/modules/partnership/mod_partnership_standard.php
-
message: '#^If condition is always false\.$#'
identifier: if.alwaysFalse
@ -25134,12 +24900,6 @@ parameters:
count: 8
path: ../../../htdocs/product/price.php
-
message: '#^Variable \$db might not be defined\.$#'
identifier: variable.undefined
count: 1
path: ../../../htdocs/product/price.php
-
message: '#^Variable \$extrafield_values might not be defined\.$#'
identifier: variable.undefined
@ -25242,12 +25002,6 @@ parameters:
count: 1
path: ../../../htdocs/product/reassortlot.php
-
message: '#^Variable \$extrafields might not be defined\.$#'
identifier: variable.undefined
count: 2
path: ../../../htdocs/product/reassortlot.php
-
message: '#^Variable \$type might not be defined\.$#'
identifier: variable.undefined

View file

@ -86,6 +86,10 @@ espace
methode
datee
# Some string found because part of a text the is html entities escaped into file
tre
activ
# Translation keys
addin
amountin

View file

@ -174,3 +174,4 @@ print '<td class="right">'.$langs->trans("NbOfMembers").' <span class="opacityme
print_liste_field_titre("PeriodEndDate", $_SERVER["PHP_SELF"], "cs.periode", "", $param, '', $sortfield, $sortorder, 'center ');
select#date_startday, select#date_startmonth, select#date_endday, select#date_endmonth, select#reday, select#remonth
select#date_startday, select#date_startmonth, select#date_endday, select#date_endmonth, select#reday, select#remonth,
$sql = "SELECT id_users, nom as name, id_sondage, reponses, tms, date_creation";

View file

@ -188,7 +188,7 @@ return [
'htdocs/core/modules/facture/doc/pdf_sponge.modules.php' => ['PhanPossiblyUndeclaredVariable', 'PhanTypeMismatchArgumentProbablyReal', 'PhanTypeMismatchProperty', 'PhanUndeclaredProperty'],
'htdocs/core/modules/facture/modules_facture.php' => ['PhanPluginUnknownPropertyType'],
'htdocs/core/modules/fichinter/mod_pacific.php' => ['PhanPossiblyUndeclaredVariable'],
'htdocs/core/modules/hrm/doc/pdf_standard_evaluation.modules.php' => ['PhanPluginUnknownPropertyType', 'PhanUndeclaredProperty'],
'htdocs/core/modules/hrm/doc/pdf_standard_evaluation.modules.php' => ['PhanUndeclaredProperty'],
'htdocs/core/modules/hrm/mod_evaluation_advanced.php' => ['PhanUndeclaredProperty'],
'htdocs/core/modules/import/import_csv.modules.php' => ['PhanPossiblyUndeclaredVariable', 'PhanTypeMismatchProperty'],
'htdocs/core/modules/import/import_xlsx.modules.php' => ['PhanTypeMismatchProperty'],

View file

@ -2,6 +2,7 @@
/* Copyright (C) 2017-2022 OpenDSI <support@open-dsi.fr>
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2024 Alexandre Janniaux <alexandre.janniaux@gmail.com>
*
* 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
@ -103,6 +104,50 @@ class AccountingJournal extends CommonObject
$this->ismultientitymanaged = 0;
}
/**
* Create a new Accounting Journal.
*
* @param User $user the user that created the journal, currently unused
* @return int Return integer <0 on error, or the ID of the created object
*/
public function create($user)
{
$valid_nature = array(1, 2, 3, 4, 5, 8, 9);
if (!in_array((int) $this->nature, $valid_nature)) {
$this->error = get_class($this)."::Create Error invalid field nature '" . strval($this->nature) . "'";
dol_syslog($this->error, LOG_ERR);
return -1;
}
$sql = "INSERT INTO ".MAIN_DB_PREFIX."accounting_journal";
$sql .= " (entity, code, label, nature, active)";
$sql .= " VALUES ("
. ((int) $this->entity) .",'"
. $this->db->escape($this->code) ."','"
. $this->db->escape($this->label) ."',"
. ((int) $this->nature) .","
. ((int) $this->active) .")";
dol_syslog(get_class($this)."::create", LOG_DEBUG);
$resql = $this->db->query($sql);
if (!$resql) {
$this->error = get_class($this)."::Create Error: " . $this->db->lasterror();
dol_syslog($this->error, LOG_ERR);
return -1;
}
$id = $this->db->last_insert_id(MAIN_DB_PREFIX."accounting_journal");
if ($id <= 0) {
$this->error = get_class($this)."::Create Error " . $id . ": " . $this->db->lasterror();
dol_syslog($this->error, LOG_ERR);
return -2;
}
$this->id = $id;
$this->rowid = $id;
return $id;
}
/**
* Load an object from database
*

View file

@ -1,6 +1,7 @@
<?php
/* Copyright (C) 2019-2023 Open-DSI <support@open-dsi.fr>
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
/* Copyright (C) 2019-2023 Open-DSI <support@open-dsi.fr>
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2025 Alexandre Spangaro <alexandre@inovea-conseil.com>
*
* 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
@ -39,7 +40,7 @@ require_once DOL_DOCUMENT_ROOT.'/accountancy/class/bookkeeping.class.php';
*/
// Load translation files required by the page
$langs->loadLangs(array("compta", "bills", "other", "accountancy"));
$langs->loadLangs(array("accountancy", "bills", "compta", "exports", "other"));
$action = GETPOST('action', 'aZ09');
$confirm = GETPOST('confirm', 'aZ09');
@ -410,7 +411,7 @@ if (empty($current_fiscal_period)) {
// Step 2
$head = array();
$head[0][0] = DOL_URL_ROOT . '/accountancy/closure/index.php?fiscal_period_id=' . $current_fiscal_period['id'];
$head[0][1] = $langs->trans("Step").(getDolGlobalString("ACCOUNTANCY_DISABLE_CLOSURE_LINE_BY_LINE") ? '1' : '2').' - '.$langs->trans("AccountancyClosureStep2");
$head[0][1] = $langs->trans("Step"). ' ' . (getDolGlobalString("ACCOUNTANCY_DISABLE_CLOSURE_LINE_BY_LINE") ? '1' : '2').' - '.$langs->trans("AccountancyClosureStep2");
$head[0][2] = 'step2';
print dol_get_fiche_head($head, 'step2', '', -1, '');
@ -433,7 +434,7 @@ if (empty($current_fiscal_period)) {
// Step 3
$head = array();
$head[0][0] = DOL_URL_ROOT . '/accountancy/closure/index.php?fiscal_period_id=' . $current_fiscal_period['id'];
$head[0][1] = $langs->trans("Step").(getDolGlobalString("ACCOUNTANCY_DISABLE_CLOSURE_LINE_BY_LINE") ? '2' : '3').' - '.$langs->trans("AccountancyClosureStep3");
$head[0][1] = $langs->trans("Step"). ' ' . (getDolGlobalString("ACCOUNTANCY_DISABLE_CLOSURE_LINE_BY_LINE") ? '2' : '3').' - '.$langs->trans("AccountancyClosureStep3");
$head[0][2] = 'step3';
print dol_get_fiche_head($head, 'step3', '', -1, '');

View file

@ -323,7 +323,7 @@ class Adherent extends CommonObject
'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 10),
'ref' => array('type' => 'varchar(30)', 'label' => 'Ref', 'default' => '1', 'enabled' => 1, 'visible' => 1, 'notnull' => 1, 'position' => 12, 'index' => 1),
'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => '1', 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 15, 'index' => 1),
'ref_ext' => array('type' => 'varchar(128)', 'label' => 'Ref ext', 'enabled' => 1, 'visible' => 0, 'position' => 20),
'ref_ext' => array('type' => 'varchar(128)', 'label' => 'RefExt', 'enabled' => 1, 'visible' => 0, 'position' => 20),
'civility' => array('type' => 'varchar(6)', 'label' => 'Civility', 'enabled' => 1, 'visible' => -1, 'position' => 25),
'lastname' => array('type' => 'varchar(50)', 'label' => 'Lastname', 'enabled' => 1, 'visible' => 1, 'position' => 30, 'showoncombobox' => 1),
'firstname' => array('type' => 'varchar(50)', 'label' => 'Firstname', 'enabled' => 1, 'visible' => 1, 'position' => 35, 'showoncombobox' => 1),
@ -399,6 +399,8 @@ class Adherent extends CommonObject
$this->isextrafieldmanaged = 1;
// les champs optionnels sont vides
$this->array_options = array();
$this->fields['ref_ext']['visible'] = getDolGlobalInt('MAIN_LIST_SHOW_REF_EXT');
}

View file

@ -1272,55 +1272,57 @@ if ($mode == 'marketplace') {
if (!getDolGlobalString('MAIN_DISABLE_DOLISTORE_SEARCH') && getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 1) {
// $options is array with filter criteria
$nbmaxtoshow = $options['per_page'];
$options['per_page']++;
if (getDolGlobalInt('MAIN_ENANLE_OLD_DOLISTORE')) {
$nbmaxtoshow = $options['per_page'];
$options['per_page']++;
$remotestore->getRemoteCategories();
$remotestore->getRemoteProducts($options);
$remotestore->getRemoteCategories();
$remotestore->getRemoteProducts($options);
print '<span class="opacitymedium">'.$langs->trans('DOLISTOREdescriptionLong').'</span><br><br>';
print '<span class="opacitymedium">'.$langs->trans('DOLISTOREdescriptionLong').'</span><br><br>';
$previouslink = $remotestore->get_previous_link();
$nextlink = $remotestore->get_next_link();
$previouslink = $remotestore->get_previous_link();
$nextlink = $remotestore->get_next_link();
print '<div class="liste_titre liste_titre_bydiv centpercent"><div class="divsearchfield">';
print '<div class="liste_titre liste_titre_bydiv centpercent"><div class="divsearchfield">';
print '<form method="POST" class="centpercent" id="searchFormList" action="'.$remotestore->url.'">'; ?>
<input type="hidden" name="token" value="<?php echo newToken(); ?>">
<input type="hidden" name="mode" value="marketplace">
<div class="divsearchfield">
<input name="search_keyword" placeholder="<?php echo $langs->trans('Keyword') ?>" id="search_keyword" type="text" class="minwidth200" value="<?php echo dol_escape_htmltag($options['search']) ?>"><br>
</div>
<div class="divsearchfield">
<input class="button buttongen" value="<?php echo $langs->trans('Rechercher') ?>" type="submit">
<a class="buttonreset" href="<?php echo $_SERVER["PHP_SELF"].'?mode=marketplace'; ?>"><?php echo $langs->trans('Reset') ?></a>
print '<form method="POST" class="centpercent" id="searchFormList" action="'.$remotestore->url.'">'; ?>
<input type="hidden" name="token" value="<?php echo newToken(); ?>">
<input type="hidden" name="mode" value="marketplace">
<div class="divsearchfield">
<input name="search_keyword" placeholder="<?php echo $langs->trans('Keyword') ?>" id="search_keyword" type="text" class="minwidth200" value="<?php echo dol_escape_htmltag($options['search']) ?>"><br>
</div>
<div class="divsearchfield">
<input class="button buttongen" value="<?php echo $langs->trans('Rechercher') ?>" type="submit">
<a class="buttonreset" href="<?php echo $_SERVER["PHP_SELF"].'?mode=marketplace'; ?>"><?php echo $langs->trans('Reset') ?></a>
&nbsp;
</div>
<?php
print $previouslink;
print $nextlink;
print '</form>';
&nbsp;
</div>
<?php
print $previouslink;
print $nextlink;
print '</form>';
print '</div></div>';
print '<div class="clearboth"></div>';
?>
print '</div></div>';
print '<div class="clearboth"></div>';
?>
<div id="category-tree-left">
<ul class="tree">
<?php
echo $remotestore->get_categories(); // Do not use dol_escape_htmltag here, it is already a structured content?>
</ul>
</div>
<div id="category-tree-left">
<ul class="tree">
<?php
echo $remotestore->get_categories(); // Do not use dol_escape_htmltag here, it is already a structured content?>
</ul>
</div>
<div id="listing-content">
<table summary="list_of_modules" id="list_of_modules" class="productlist centpercent">
<tbody id="listOfModules">
<?php echo $remotestore->get_products($nbmaxtoshow); ?>
</tbody>
</table>
</div>
<?php
<div id="listing-content">
<table summary="list_of_modules" id="list_of_modules" class="productlist centpercent">
<tbody id="listOfModules">
<?php echo $remotestore->get_products($nbmaxtoshow); ?>
</tbody>
</table>
</div>
<?php
}
}
}

View file

@ -298,7 +298,7 @@ class Categorie extends CommonObject
'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'position' => 10, 'notnull' => 1, 'visible' => -1,),
'fk_parent' => array('type' => 'integer', 'label' => 'Fkparent', 'enabled' => 1, 'position' => 20, 'notnull' => 1, 'visible' => -1, 'css' => 'maxwidth500 widthcentpercentminusxx',),
'label' => array('type' => 'varchar(180)', 'label' => 'Label', 'enabled' => 1, 'position' => 25, 'notnull' => 1, 'visible' => -1, 'alwayseditable' => 1, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'csslist' => 'tdoverflowmax150',),
'ref_ext' => array('type' => 'varchar(255)', 'label' => 'Refext', 'enabled' => 1, 'position' => 30, 'notnull' => 0, 'visible' => 0, 'alwayseditable' => 1,),
'ref_ext' => array('type' => 'varchar(255)', 'label' => 'RefExt', 'enabled' => 1, 'position' => 30, 'notnull' => 0, 'visible' => 0, 'alwayseditable' => 1,),
'type' => array('type' => 'integer', 'label' => 'Type', 'enabled' => 1, 'position' => 35, 'notnull' => 1, 'visible' => -1, 'alwayseditable' => 1,),
'description' => array('type' => 'text', 'label' => 'Description', 'enabled' => 1, 'position' => 40, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => 1,),
'color' => array('type' => 'varchar(8)', 'label' => 'Color', 'enabled' => 1, 'position' => 45, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => 1,),

View file

@ -452,7 +452,9 @@ class Propal extends CommonObject
$this->socid = $socid;
$this->id = $propalid;
$this->duree_validite = getDolGlobalInt('PROPALE_VALIDITY_DURATION', 0);
$this->duree_validite = getDolGlobalInt('PROPALE_VALIDITY_DURATION');
$this->fields['ref_ext']['visible'] = getDolGlobalInt('MAIN_LIST_SHOW_REF_EXT');
}

View file

@ -426,6 +426,8 @@ class Commande extends CommonOrder
$this->ismultientitymanaged = 1;
$this->isextrafieldmanaged = 1;
$this->fields['ref_ext']['visible'] = getDolGlobalInt('MAIN_LIST_SHOW_REF_EXT');
}
/**

View file

@ -102,6 +102,7 @@ $search_all = trim(GETPOST('search_all', 'alphanohtml'));
$search_product_category = GETPOST('search_product_category', 'intcomma');
$search_id = GETPOST('search_id', 'int');
$search_ref = GETPOST('search_ref', 'alpha') != '' ? GETPOST('search_ref', 'alpha') : GETPOST('sref', 'alpha');
$search_ref_ext = GETPOST('search_ref_ext', 'alpha');
$search_ref_customer = GETPOST('search_ref_customer', 'alpha');
$search_company = GETPOST('search_company', 'alpha');
$search_company_alias = GETPOST('search_company_alias', 'alpha');
@ -201,6 +202,7 @@ $checkedtypetiers = 0;
$arrayfields = array(
'c.rowid' => array('label' => "ID", 'checked' => 1, 'enabled' => getDolGlobalInt('MAIN_SHOW_TECHNICAL_ID'), 'position' => 1),
'c.ref' => array('label' => "Ref", 'checked' => 1, 'position' => 5, 'searchall' => 1),
'c.ref_ext' => array('label' => "RefExt", 'checked' => 1, 'position' => 5, 'visible' => 0, 'searchall' => 1),
'c.ref_client' => array('label' => "RefCustomerOrder", 'checked' => -1, 'position' => 10, 'searchall' => 1),
'p.ref' => array('label' => "ProjectRef", 'checked' => -1, 'enabled' => (!isModEnabled('project') ? 0 : 1), 'position' => 20),
'p.title' => array('label' => "ProjectLabel", 'checked' => 0, 'enabled' => (!isModEnabled('project') ? 0 : 1), 'position' => 25),
@ -309,6 +311,7 @@ if (empty($reshook)) {
$search_product_category = '';
$search_id = '';
$search_ref = '';
$search_ref_ext = '';
$search_ref_customer = '';
$search_company = '';
$search_company_alias = '';
@ -715,6 +718,9 @@ if (empty($reshook)) {
if ($search_ref) {
$param .= '&search_ref='.urlencode($search_ref);
}
if ($search_ref_ext) {
$param .= '&search_ref_ext='.urlencode($search_ref_ext);
}
if ($search_company) {
$param .= '&search_company='.urlencode($search_company);
}
@ -897,7 +903,7 @@ $sql .= " s2.nom as name2,";
$sql .= " typent.code as typent_code,";
$sql .= " state.code_departement as state_code, state.nom as state_name,";
$sql .= " country.code as country_code,";
$sql .= ' c.rowid, c.ref, c.total_ht, c.total_tva, c.total_ttc, c.ref_client, c.fk_user_author,';
$sql .= ' c.rowid, c.ref, c.ref_ext, c.total_ht, c.total_tva, c.total_ttc, c.ref_client, c.fk_user_author,';
$sql .= ' c.fk_multicurrency, c.multicurrency_code, c.multicurrency_tx, c.multicurrency_total_ht, c.multicurrency_total_tva as multicurrency_total_vat, c.multicurrency_total_ttc,';
$sql .= ' c.date_valid, c.date_commande, c.note_public, c.note_private, c.date_livraison as delivery_date, c.fk_statut, c.facture as billed,';
$sql .= ' c.date_creation as date_creation, c.tms as date_modification, c.date_cloture as date_cloture,';
@ -931,7 +937,7 @@ if (!empty($extrafields->attributes[$object->table_element]['label']) && is_arra
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."commande_extrafields as ef on (c.rowid = ef.fk_object)";
}
if ($search_all) {
$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'commandedet as pd ON c.rowid=pd.fk_commande';
$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'commandedet as pd ON c.rowid = pd.fk_commande';
}
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet as p ON p.rowid = c.fk_projet";
$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'user as u ON c.fk_user_author = u.rowid';
@ -961,6 +967,9 @@ if ($search_id > 0) {
if ($search_ref) {
$sql .= natural_search('c.ref', $search_ref);
}
if ($search_ref_ext) {
$sql .= natural_search('c.ref_ext', $search_ref_ext);
}
if ($search_ref_customer) {
$sql .= natural_search('c.ref_client', $search_ref_customer);
}
@ -1316,6 +1325,9 @@ if ($search_id) {
if ($search_ref) {
$param .= '&search_ref='.urlencode($search_ref);
}
if ($search_ref_ext) {
$param .= '&search_ref_ext='.urlencode($search_ref_ext);
}
if ($search_company) {
$param .= '&search_company='.urlencode($search_company);
}
@ -1647,6 +1659,12 @@ if (!empty($arrayfields['c.ref']['checked'])) {
print '<input class="flat" size="6" type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
print '</td>';
}
// Ref ext
if (!empty($arrayfields['c.ref_ext']['checked'])) {
print '<td class="liste_titre">';
print '<input class="flat" size="6" type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref_ext).'">';
print '</td>';
}
// Ref customer
if (!empty($arrayfields['c.ref_client']['checked'])) {
print '<td class="liste_titre" align="left">';
@ -1944,6 +1962,10 @@ if (!empty($arrayfields['c.ref']['checked'])) {
print_liste_field_titre($arrayfields['c.ref']['label'], $_SERVER["PHP_SELF"], 'c.ref', '', $param, '', $sortfield, $sortorder);
$totalarray['nbfield']++;
}
if (!empty($arrayfields['c.ref_ext']['checked'])) {
print_liste_field_titre($arrayfields['c.ref_ext']['label'], $_SERVER["PHP_SELF"], 'c.ref_ext', '', $param, '', $sortfield, $sortorder);
$totalarray['nbfield']++;
}
if (!empty($arrayfields['c.ref_client']['checked'])) {
print_liste_field_titre($arrayfields['c.ref_client']['label'], $_SERVER["PHP_SELF"], 'c.ref_client', '', $param, '', $sortfield, $sortorder);
$totalarray['nbfield']++;
@ -2283,6 +2305,16 @@ while ($i < $imaxinloop) {
}
}
// Ref customer
if (!empty($arrayfields['c.ref_ext']['checked'])) {
print '<td class="nowrap tdoverflowmax75" title="'.dol_escape_htmltag($obj->ref_ext).'">';
print dol_escape_htmltag($obj->ref_ext);
print '</td>';
if (!$i) {
$totalarray['nbfield']++;
}
}
// Ref customer
if (!empty($arrayfields['c.ref_client']['checked'])) {
print '<td class="nowrap tdoverflowmax150" title="'.dol_escape_htmltag($obj->ref_client).'">';
@ -2704,7 +2736,7 @@ while ($i < $imaxinloop) {
// Date creation
if (!empty($arrayfields['c.datec']['checked'])) {
print '<td align="center" class="nowrap">';
print '<td class="center nowraponall">';
print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser');
print '</td>';
if (!$i) {
@ -2714,7 +2746,7 @@ while ($i < $imaxinloop) {
// Date modification
if (!empty($arrayfields['c.tms']['checked'])) {
print '<td align="center" class="nowrap">';
print '<td class="center nowraponall">';
print dol_print_date($db->jdate($obj->date_modification), 'dayhour', 'tzuser');
print '</td>';
if (!$i) {
@ -2724,7 +2756,7 @@ while ($i < $imaxinloop) {
// Date cloture
if (!empty($arrayfields['c.date_cloture']['checked'])) {
print '<td align="center" class="nowrap">';
print '<td class="center nowraponall">';
print dol_print_date($db->jdate($obj->date_cloture), 'dayhour', 'tzuser');
print '</td>';
if (!$i) {

View file

@ -324,7 +324,7 @@ class Facture extends CommonInvoice
'ref' => array('type' => 'varchar(30)', 'label' => 'Ref', 'enabled' => 1, 'visible' => 1, 'notnull' => 1, 'showoncombobox' => 1, 'position' => 5),
'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => '1', 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 20, 'index' => 1),
'ref_client' => array('type' => 'varchar(255)', 'label' => 'RefCustomer', 'enabled' => 1, 'visible' => -1, 'position' => 10),
'ref_ext' => array('type' => 'varchar(255)', 'label' => 'Ref ext', 'enabled' => 1, 'visible' => 0, 'position' => 12),
'ref_ext' => array('type' => 'varchar(255)', 'label' => 'RefExt', 'enabled' => 1, 'visible' => 0, 'position' => 12),
'type' => array('type' => 'smallint(6)', 'label' => 'Type', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 15),
'subtype' => array('type' => 'smallint(6)', 'label' => 'InvoiceSubtype', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 15),
//'increment' =>array('type'=>'varchar(10)', 'label'=>'Increment', 'enabled'=>1, 'visible'=>-1, 'position'=>45),

View file

@ -92,7 +92,7 @@ class Contact extends CommonObject
public $fields = array(
'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -2, 'noteditable' => 1, 'notnull' => 1, 'index' => 1, 'position' => 1, 'comment' => 'Id', 'css' => 'left'),
'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => '1', 'enabled' => 1, 'visible' => 3, 'notnull' => 1, 'position' => 30, 'index' => 1),
'ref_ext' => array('type' => 'varchar(255)', 'label' => 'Ref ext', 'enabled' => 1, 'visible' => 3, 'position' => 35),
'ref_ext' => array('type' => 'varchar(255)', 'label' => 'RefExt', 'enabled' => 1, 'visible' => 0, 'position' => 35),
'civility' => array('type' => 'varchar(6)', 'label' => 'Civility', 'enabled' => 1, 'visible' => 3, 'position' => 40),
'lastname' => array('type' => 'varchar(50)', 'label' => 'Lastname', 'enabled' => 1, 'visible' => 1, 'position' => 45, 'showoncombobox' => 1, 'searchall' => 1),
'name_alias' => array('type' => 'varchar(255)', 'label' => 'Name alias', 'enabled' => 1, 'visible' => -1, 'position' => 46, 'searchall' => 1),
@ -386,6 +386,8 @@ class Contact extends CommonObject
$this->ismultientitymanaged = 1;
$this->isextrafieldmanaged = 1;
$this->fields['ref_ext']['visible'] = getDolGlobalInt('MAIN_LIST_SHOW_REF_EXT');
if (!isModEnabled('mailing')) {
$this->fields['no_email']['enabled'] = 0;
}
@ -667,7 +669,7 @@ class Contact extends CommonObject
$sql .= ", phone = ".(isset($this->phone_pro) ? "'".$this->db->escape($this->phone_pro)."'" : "NULL");
$sql .= ", phone_perso = ".(isset($this->phone_perso) ? "'".$this->db->escape($this->phone_perso)."'" : "NULL");
$sql .= ", phone_mobile = ".(isset($this->phone_mobile) ? "'".$this->db->escape($this->phone_mobile)."'" : "NULL");
$sql .= ", priv = '".$this->db->escape($this->priv)."'";
$sql .= ", priv = ".((int) $this->priv);
$sql .= ", fk_prospectlevel = '".$this->db->escape($this->fk_prospectlevel)."'";
if (isset($this->stcomm_id)) {
$sql .= ", fk_stcommcontact = ".($this->stcomm_id > 0 || $this->stcomm_id == -1 ? $this->stcomm_id : "0");

View file

@ -12,7 +12,7 @@
* Copyright (C) 2019-2024 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2019 Josep Lluís Amador <joseplluis@lliuretic.cat>
* Copyright (C) 2020 Open-Dsi <support@open-dsi.fr>
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
* Copyright (C) 2024-2025 MDW <mdeweerd@users.noreply.github.com>
* Copyright (C) 2024 Benjamin Falière <benjamin.faliere@altairis.fr>
*
* This program is free software; you can redistribute it and/or modify
@ -79,6 +79,7 @@ $search_cti = preg_replace('/^0+/', '', preg_replace('/[^0-9]/', '', GETPOST('se
$search_phone = GETPOST("search_phone", 'alpha');
$search_id = GETPOST("search_id", "intcomma");
$search_ref_ext = GETPOST("search_ref_ext", "alpha");
$search_firstlast_only = GETPOST("search_firstlast_only", 'alpha');
$search_lastname = GETPOST("search_lastname", 'alpha');
$search_firstname = GETPOST("search_firstname", 'alpha');
@ -367,6 +368,7 @@ if (empty($reshook)) {
if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All tests are required to be compatible with all browsers
$search_all = "";
$search_id = '';
$search_ref_ext = '';
$search_firstlast_only = "";
$search_lastname = "";
$search_firstname = "";
@ -482,7 +484,7 @@ if ($resql) {
// Build and execute select
// --------------------------------------------------------------------
$sql = "SELECT s.rowid as socid, s.nom as name, s.name_alias as alias,";
$sql .= " p.rowid, p.lastname as lastname, p.statut, p.firstname, p.address, p.zip, p.town, p.poste, p.email, p.birthday,";
$sql .= " p.rowid, p.ref_ext, p.lastname as lastname, p.statut, p.firstname, p.address, p.zip, p.town, p.poste, p.email, p.birthday,";
$sql .= " p.socialnetworks, p.photo,";
$sql .= " p.phone as phone_pro, p.phone_mobile, p.phone_perso, p.fax, p.fk_pays, p.priv, p.datec as date_creation, p.tms as date_modification,";
$sql .= " p.import_key, p.fk_stcommcontact as stcomm_id, p.fk_prospectlevel,";
@ -661,6 +663,9 @@ if (strlen($search_firstlast_only)) {
if ($search_id > 0) {
$sql .= natural_search('p.rowid', $search_id, 1);
}
if ($search_ref_ext) {
$sql .= natural_search('p.ref_ext', $search_ref_ext);
}
if ($search_lastname) {
$sql .= natural_search('p.lastname', $search_lastname);
}
@ -859,7 +864,10 @@ if ($search_all != '') {
$param .= '&search_all='.urlencode($search_all);
}
if ($search_id > 0) {
$param .= "&search_id=".urlencode((string) ($search_id));
$param .= "&search_id=".((int) $search_id);
}
if ($search_ref_ext) {
$param .= "&search_ref_ext=".urlencode($search_ref_ext);
}
if ($search_lastname != '') {
$param .= '&search_lastname='.urlencode($search_lastname);
@ -1082,32 +1090,37 @@ if (!empty($arrayfields['p.rowid']['checked'])) {
}
if (!empty($arrayfields['p.lastname']['checked'])) {
print '<td class="liste_titre">';
print '<input class="flat" type="text" name="search_lastname" size="6" value="'.dol_escape_htmltag($search_lastname).'">';
print '<input class="flat width75" type="text" name="search_lastname" value="'.dol_escape_htmltag($search_lastname).'">';
print '</td>';
}
if (!empty($arrayfields['p.firstname']['checked'])) {
print '<td class="liste_titre">';
print '<input class="flat" type="text" name="search_firstname" size="6" value="'.dol_escape_htmltag($search_firstname).'">';
print '<input class="flat width75" type="text" name="search_firstname" value="'.dol_escape_htmltag($search_firstname).'">';
print '</td>';
}
if (!empty($arrayfields['p.ref_ext']['checked'])) {
print '<td class="liste_titre">';
print '<input class="flat width50" type="text" name="search_ref_ext" value="'.dol_escape_htmltag($search_ref_ext).'">';
print '</td>';
}
if (!empty($arrayfields['p.poste']['checked'])) {
print '<td class="liste_titre">';
print '<input class="flat" type="text" name="search_poste" size="5" value="'.dol_escape_htmltag($search_poste).'">';
print '<input class="flat width50" type="text" name="search_poste" value="'.dol_escape_htmltag($search_poste).'">';
print '</td>';
}
if (!empty($arrayfields['p.address']['checked'])) {
print '<td class="liste_titre">';
print '<input class="flat" type="text" name="search_address" size="6" value="'.dol_escape_htmltag($search_address).'">';
print '<input class="flat width50" type="text" name="search_address" value="'.dol_escape_htmltag($search_address).'">';
print '</td>';
}
if (!empty($arrayfields['p.zip']['checked'])) {
print '<td class="liste_titre">';
print '<input class="flat" type="text" name="search_zip" size="3" value="'.dol_escape_htmltag($search_zip).'">';
print '<input class="flat width50" type="text" name="search_zip" value="'.dol_escape_htmltag($search_zip).'">';
print '</td>';
}
if (!empty($arrayfields['p.town']['checked'])) {
print '<td class="liste_titre">';
print '<input class="flat" type="text" name="search_town" size="5" value="'.dol_escape_htmltag($search_town).'">';
print '<input class="flat width50" type="text" name="search_town" value="'.dol_escape_htmltag($search_town).'">';
print '</td>';
}
@ -1279,6 +1292,10 @@ if (!empty($arrayfields['p.firstname']['checked'])) {
print_liste_field_titre($arrayfields['p.firstname']['label'], $_SERVER["PHP_SELF"], "p.firstname", $begin, $param, '', $sortfield, $sortorder);
$totalarray['nbfield']++;
}
if (!empty($arrayfields['p.ref_ext']['checked'])) {
print_liste_field_titre($arrayfields['p.ref_ext']['label'], $_SERVER["PHP_SELF"], "p.ref_ext", $begin, $param, '', $sortfield, $sortorder);
$totalarray['nbfield']++;
}
if (!empty($arrayfields['p.poste']['checked'])) {
print_liste_field_titre($arrayfields['p.poste']['label'], $_SERVER["PHP_SELF"], "p.poste", $begin, $param, '', $sortfield, $sortorder);
$totalarray['nbfield']++;
@ -1405,9 +1422,10 @@ while ($i < $imaxinloop) {
}
$arraysocialnetworks = (array) json_decode($obj->socialnetworks, true);
$contactstatic->id = $obj->rowid;
$contactstatic->ref_ext = $obj->ref_ext;
$contactstatic->lastname = $obj->lastname;
$contactstatic->firstname = $obj->firstname;
$contactstatic->id = $obj->rowid;
$contactstatic->statut = $obj->statut;
$contactstatic->poste = $obj->poste;
$contactstatic->email = $obj->email;
@ -1483,7 +1501,7 @@ while ($i < $imaxinloop) {
// (Last) Name
if (!empty($arrayfields['p.lastname']['checked'])) {
print '<td class="middle tdoverflowmax150">';
print '<td class="middle tdoverflowmax150" title="'.dolPrintHTMLForAttribute($contactstatic->lastname).'">';
if ($contextpage == 'poslist') {
print $contactstatic->lastname;
} else {
@ -1497,7 +1515,19 @@ while ($i < $imaxinloop) {
// Firstname
if (!empty($arrayfields['p.firstname']['checked'])) {
print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($obj->firstname).'">'.dol_escape_htmltag($obj->firstname).'</td>';
print '<td class="tdoverflowmax150" title="'.dolPrintHTMLForAttribute($obj->firstname).'">';
print dolPrintHTML($obj->firstname);
print '</td>';
if (!$i) {
$totalarray['nbfield']++;
}
}
// Ref ext
if (!empty($arrayfields['p.ref_ext']['checked'])) {
print '<td class="middle tdoverflowmax100" title="'.dolPrintHTMLForAttribute($contactstatic->ref_ext).'">';
print dolPrintHTML($contactstatic->ref_ext);
print '</td>';
if (!$i) {
$totalarray['nbfield']++;
}

View file

@ -268,7 +268,7 @@ class Contrat extends CommonObject
public $fields = array(
'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 10),
'ref' => array('type' => 'varchar(50)', 'label' => 'Ref', 'enabled' => 1, 'visible' => -1, 'showoncombobox' => 1, 'position' => 15, 'searchall' => 1),
'ref_ext' => array('type' => 'varchar(255)', 'label' => 'Ref ext', 'enabled' => 1, 'visible' => 0, 'position' => 20),
'ref_ext' => array('type' => 'varchar(255)', 'label' => 'RefExt', 'enabled' => 1, 'visible' => 0, 'position' => 20),
'ref_customer' => array('type' => 'varchar(50)', 'label' => 'RefCustomer', 'enabled' => 1, 'visible' => -1, 'position' => 25, 'searchall' => 1),
'ref_supplier' => array('type' => 'varchar(50)', 'label' => 'RefSupplier', 'enabled' => 1, 'visible' => -1, 'position' => 26, 'searchall' => 1),
'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => '1', 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 30, 'index' => 1),

View file

@ -58,13 +58,13 @@ if ($action == 'update' && !empty($arrayofparameters) && is_array($arrayofparame
foreach ($arrayofparameters as $key => $val) {
// Modify constant only if key was posted (avoid resetting key to the null value)
if (GETPOSTISSET($key)) {
if (!empty($val['type']) && preg_match('/category:/', $val['type'])) {
if (isset($val['type']) && preg_match('/category:/', $val['type'])) {
if (GETPOSTINT($key) == '-1') {
$val_const = '';
} else {
$val_const = GETPOSTINT($key);
}
} elseif ($val['type'] == 'html') {
} elseif (isset($val['type']) && $val['type'] == 'html') {
$val_const = GETPOST($key, 'restricthtml');
} else {
$val_const = GETPOST($key, 'alpha');

View file

@ -10360,7 +10360,11 @@ abstract class CommonObject
}
if (array_key_exists('pass_crypted', $fieldvalues) && property_exists($this, 'pass')) {
// @phan-suppress-next-line PhanUndeclaredProperty
$fieldvalues['pass_crypted'] = dol_hash($this->pass);
$tmparray = dol_hash($this->pass, '0', 0, 1);
$fieldvalues['pass_crypted'] = $tmparray['pass_encrypted'];
if (array_key_exists('pass_encoding', $fieldvalues) && property_exists($this, 'pass_encoding')) {
$fieldvalues['pass_encoding'] = $tmparray['pass_encoding'];
}
}
if (array_key_exists('ref', $fieldvalues)) {
$fieldvalues['ref'] = dol_string_nospecial($fieldvalues['ref']); // If field is a ref, we sanitize data

View file

@ -7287,7 +7287,7 @@ class Form
// You can set MAIN_POPUP_CALENDAR to 'eldy' or 'jquery'
$usecalendar = 'combo';
if (!empty($conf->use_javascript_ajax) && (!getDolGlobalString('MAIN_POPUP_CALENDAR') || getDolGlobalString('MAIN_POPUP_CALENDAR') != "none")) {
$usecalendar = ((!getDolGlobalString('MAIN_POPUP_CALENDAR') || getDolGlobalString('MAIN_POPUP_CALENDAR') == 'eldy') ? 'jquery' : $conf->global->MAIN_POPUP_CALENDAR);
$usecalendar = ((!getDolGlobalString('MAIN_POPUP_CALENDAR') || getDolGlobalString('MAIN_POPUP_CALENDAR') == 'eldy') ? 'jquery' : getDolGlobalString("MAIN_POPUP_CALENDAR"));
}
if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
// If we use a text browser or screen reader, we use the 'combo' date selector
@ -7317,7 +7317,7 @@ class Form
if (!$disabled) {
$retstringbuttom = '<button id="' . $prefix . 'Button" type="button" class="dpInvisibleButtons"';
$base = DOL_URL_ROOT . '/core/';
$retstringbuttom .= ' onClick="showDP(\'' . $base . '\',\'' . $prefix . '\',\'' . $langs->trans("FormatDateShortJavaInput") . '\',\'' . $langs->defaultlang . '\');"';
$retstringbuttom .= ' onClick="showDP(\'' . dol_escape_js($base) . '\',\'' . dol_escape_js($prefix) . '\',\'' . dol_escape_js($langs->trans("FormatDateShortJavaInput")) . '\',\'' . dol_escape_js($langs->defaultlang) . '\');"';
$retstringbuttom .= '>' . img_object($langs->trans("SelectDate"), 'calendarday', 'class="datecallink"') . '</button>';
} else {
$retstringbuttom = '<button id="' . $prefix . 'Button" type="button" class="dpInvisibleButtons">' . img_object($langs->trans("Disabled"), 'calendarday', 'class="datecallink"') . '</button>';
@ -7364,7 +7364,7 @@ class Form
// Input area to enter date manually
$retstring .= '<div class="nowraponall inline-block divfordateinput">';
$retstring .= '<input id="'.$prefix.'" name="'.$prefix.'" type="text" class="maxwidthdate center" maxlength="11" value="'.$formated_date.'"';
$retstring .= '<input id="'.$prefix.'" name="'.$prefix.'" type="'.($usecalendar == 'html' ? "date" : "text").'" class="maxwidthdate center" maxlength="11" value="'.$formated_date.'"';
$retstring .= ($disabled ? ' disabled' : '');
$retstring .= ($placeholder ? ' placeholder="' . dol_escape_htmltag($placeholder) . '"' : '');
$retstring .= ' onChange="dpChangeDay(\'' . dol_escape_js($prefix) . '\',\'' . dol_escape_js($langs->trans("FormatDateShortJavaInput")) . '\'); "'; // FormatDateShortInput for dol_print_date / FormatDateShortJavaInput that is same for javascript

View file

@ -682,14 +682,6 @@ class Translate
}
}
// We replace some HTML tags by __xx__ to avoid having them encoded by htmlentities because
// we want to keep '"' '<b>' '</b>' '<strong' '</strong>' '<a ' '</a>' '<br>' '< ' '<span' '</span>' that are reliable HTML tags inside translation strings.
$str = str_replace(
array('"', '<b>', '</b>', '<u>', '</u>', '<i', '</i>', '<center>', '</center>', '<strong>', '</strong>', '<a ', '</a>', '<br>', '<span', '</span>', '< ', '>'), // We accept '< ' but not '<'. We can accept however '>'
array('__quot__', '__tagb__', '__tagbend__', '__tagu__', '__taguend__', '__tagi__', '__tagiend__', '__tagcenter__', '__tagcenterend__', '__tagb__', '__tagbend__', '__taga__', '__tagaend__', '__tagbr__', '__tagspan__', '__tagspanend__', '__ltspace__', '__gt__'),
$str
);
if (strpos($key, 'Format') !== 0) {
try {
// @phan-suppress-next-line PhanPluginPrintfVariableFormatString
@ -699,13 +691,21 @@ class Translate
}
}
// We replace some HTML tags by __xx__ to avoid having them encoded by htmlentities because
// we want to keep '"' '<b>' '</b>' '<u>' '</u>' '<i>' '</i>' '<center> '</center>' '<strong' '</strong>' '<a ' '</a>' '<br>' '<span' '</span>' '< ' that are reliable HTML tags inside translation strings.
$str = str_replace(
array('"', '<b>', '</b>', '<u>', '</u>', '<i>', '</i>', '<center>', '</center>', '<strong>', '</strong>', '<a ', '</a>', '<br>', '<span', '</span>', '< ', '>'), // We accept '< ' but not '<'. We can accept however '>'
array('__quot__', '__tagb__', '__tagbend__', '__tagu__', '__taguend__', '__tagi__', '__tagiend__', '__tagcenter__', '__tagcenterend__', '__tagb__', '__tagbend__', '__taga__', '__tagaend__', '__tagbr__', '__tagspan__', '__tagspanend__', '__ltspace__', '__gt__'),
$str
);
// Encode string into HTML
$str = htmlentities($str, ENT_COMPAT, $this->charset_output); // Do not convert simple quotes in translation (strings in html are embraced by "). Use dol_escape_htmltag around text in HTML content
// Restore reliable HTML tags into original translation string
$str = str_replace(
array('__quot__', '__tagb__', '__tagbend__', '__tagu__', '__taguend__', '__tagi__', '__tagiend__', '__tagcenter__', '__tagcenterend__', '__taga__', '__tagaend__', '__tagbr__', '__tagspan__', '__tagspanend__', '__ltspace__', '__gt__'),
array('"', '<b>', '</b>', '<u>', '</u>', '<i', '</i>', '<center>', '</center>', '<a ', '</a>', '<br>', '<span', '</span>', '< ', '>'),
array('"', '<b>', '</b>', '<u>', '</u>', '<i>', '</i>', '<center>', '</center>', '<a ', '</a>', '<br>', '<span', '</span>', '< ', '>'),
$str
);

View file

@ -1,8 +1,9 @@
<?php
/* Copyright (C) 2008-2021 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2008-2021 Regis Houssin <regis.houssin@inodbox.com>
* Copyright (C) 2020 Ferran Marcet <fmarcet@2byte.es>
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
* Copyright (C) 2024-2025 MDW <mdeweerd@users.noreply.github.com>
*
* 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
@ -234,21 +235,38 @@ function dolDecrypt($chain, $key = '')
* If constant MAIN_SECURITY_SALT is defined, we use it as a salt (used only if hashing algorithm is something else than 'password_hash').
*
* @param string $chain String to hash
* @param string $type Type of hash ('0':auto will use MAIN_SECURITY_HASH_ALGO else md5, '1':sha1, '2':sha1+md5, '3':md5, '4': for OpenLdap, '5':sha256, '6':password_hash).
* Use 'md5' if hash is not needed for security purpose. For security need, prefer 'auto'.
* @param 'auto'|'0'|'sha1'|'1'|'sha1md5'|'2'|'md5'|'3'|'openldap'|'4'|'sha256'|'5'|'password_hash'|'6' $type Type of hash:
* 'auto' or '0': will use MAIN_SECURITY_HASH_ALGO else md5
* 'sha1' or '1': sha1
* 'sha1md5' or '2': sha1md5
* 'md5' or '3': md5
* 'openldapxxx' or '4': for OpenLdap
* 'sha256' or '5': sha256
* 'password_hash' or '6': password_hash
* Use 'md5' if hash is not needed for security purpose. For security need, prefer 'auto'.
* @param int $nosalt Do not include any salt
* @return string Hash of string
* @param int $mode 0=Return encoded password, 1=Return array with encoding password + encoding algorithm
* @return string|array{pass_encrypted:string,pass_encoding:string} Hash of string or array with pass_encrypted and pass_encoding
* @see getRandomPassword(), dol_verifyHash()
*/
function dol_hash($chain, $type = '0', $nosalt = 0)
function dol_hash($chain, $type = '0', $nosalt = 0, $mode = 0)
{
// No need to add salt for password_hash
if (($type == '0' || $type == 'auto') && getDolGlobalString('MAIN_SECURITY_HASH_ALGO') && getDolGlobalString('MAIN_SECURITY_HASH_ALGO') == 'password_hash' && function_exists('password_hash')) {
if (($type == '0' || $type == 'auto') && getDolGlobalString('MAIN_SECURITY_HASH_ALGO') == 'password_hash' && function_exists('password_hash')) {
if (strpos($chain, "\0") !== false) {
// String contains a null character that can't be encoded. Return an error instead of fatal error.
return 'Invalid string to encrypt. Contains a null character.';
if ($mode == 1) {
return array('pass_encrypted' => 'Invalid string to encrypt. Contains a null character', 'pass_encoding' => '');
} else {
return 'Invalid string to encrypt. Contains a null character.';
}
}
if ($mode == 1) {
return array('pass_encrypted' => password_hash($chain, PASSWORD_DEFAULT), 'pass_encoding' => 'password_hash');
} else {
return password_hash($chain, PASSWORD_DEFAULT);
}
return password_hash($chain, PASSWORD_DEFAULT);
}
// Salt value
@ -257,25 +275,61 @@ function dol_hash($chain, $type = '0', $nosalt = 0)
}
if ($type == '1' || $type == 'sha1') {
return sha1($chain);
if ($mode == 1) {
return array('pass_encrypted' => sha1($chain), 'pass_encoding' => 'sha1');
} else {
return sha1($chain);
}
} elseif ($type == '2' || $type == 'sha1md5') {
return sha1(md5($chain));
if ($mode == 1) {
return array('pass_encrypted' => sha1(md5($chain)), 'pass_encoding' => 'sha1md5');
} else {
return sha1(md5($chain));
}
} elseif ($type == '3' || $type == 'md5') { // For hashing with no need of security
return md5($chain);
if ($mode == 1) {
return array('pass_encrypted' => md5($chain), 'pass_encoding' => 'md5');
} else {
return md5($chain);
}
} elseif ($type == '4' || $type == 'openldap') {
return dolGetLdapPasswordHash($chain, getDolGlobalString('LDAP_PASSWORD_HASH_TYPE', 'md5'));
if ($mode == 1) {
return array('pass_encrypted' => dolGetLdapPasswordHash($chain, getDolGlobalString('LDAP_PASSWORD_HASH_TYPE', 'md5')), 'pass_encoding' => 'ldappasswordhash'.getDolGlobalString('LDAP_PASSWORD_HASH_TYPE', 'md5'));
} else {
return dolGetLdapPasswordHash($chain, getDolGlobalString('LDAP_PASSWORD_HASH_TYPE', 'md5'));
}
} elseif ($type == '5' || $type == 'sha256') {
return hash('sha256', $chain);
if ($mode == 1) {
return array('pass_encrypted' => hash('sha256', $chain), 'pass_encoding' => 'sha256');
} else {
return hash('sha256', $chain);
}
} elseif ($type == '6' || $type == 'password_hash') {
return password_hash($chain, PASSWORD_DEFAULT);
if ($mode == 1) {
return array('pass_encrypted' => password_hash($chain, PASSWORD_DEFAULT), 'pass_encoding' => 'password_hash');
} else {
return password_hash($chain, PASSWORD_DEFAULT);
}
} elseif (getDolGlobalString('MAIN_SECURITY_HASH_ALGO') == 'sha1') {
return sha1($chain);
if ($mode == 1) {
return array('pass_encrypted' => sha1($chain), 'pass_encoding' => 'sha1');
} else {
return sha1($chain);
}
} elseif (getDolGlobalString('MAIN_SECURITY_HASH_ALGO') == 'sha1md5') {
return sha1(md5($chain));
if ($mode == 1) {
return array('pass_encrypted' => sha1(md5($chain)), 'pass_encoding' => 'sha1md5');
} else {
return sha1(md5($chain));
}
}
// No particular encoding defined, use default
return md5($chain);
if ($mode == 1) {
return array('pass_encrypted' => md5($chain), 'pass_encoding' => 'md5');
} else {
return md5($chain);
}
}
/**
@ -292,7 +346,8 @@ function dol_hash($chain, $type = '0', $nosalt = 0)
*/
function dol_verifyHash($chain, $hash, $type = '0')
{
if ($type == '0' && getDolGlobalString('MAIN_SECURITY_HASH_ALGO') && getDolGlobalString('MAIN_SECURITY_HASH_ALGO') == 'password_hash' && function_exists('password_verify')) {
if ($type == '0' && getDolGlobalString('MAIN_SECURITY_HASH_ALGO') == 'password_hash' && function_exists('password_verify')) {
// Try to autodetect which algo we used
if (! empty($hash[0]) && $hash[0] == '$') {
return password_verify($chain, $hash);
} elseif (dol_strlen($hash) == 32) {

View file

@ -33,7 +33,7 @@
*/
function dolStripPhpCode($str, $replacewith = '')
{
$str = str_replace('<?=', '<?php', $str);
$str = str_replace('<?=', '<?php echo', $str); // replace a bad practive
$newstr = '';
@ -77,9 +77,9 @@ function dolStripPhpCode($str, $replacewith = '')
*/
function dolKeepOnlyPhpCode($str)
{
$str = str_replace('<?=', '<?php', $str);
$str = str_replace('<?=', '<?php echo', $str);
$str = str_replace('<?php', '__LTINTPHP__', $str);
$str = str_replace('<?', '<?php', $str); // replace the short_open_tag. It is recommended to set this is Off in php.ini
$str = str_replace('<?', '<?php', $str); // replace the short_open_tag. It is recommended to set this to Off in php.ini
$str = str_replace('__LTINTPHP__', '<?php', $str);
$newstr = '';

View file

@ -164,6 +164,7 @@ function dolSavePageContent($filetpl, Website $object, WebsitePage $objectpage,
$shortlangcode = substr($objectpage->lang, 0, 2); // en_US or en-US -> en
}
if (empty($shortlangcode)) {
// Take the language of website
$shortlangcode = substr($object->lang, 0, 2); // en_US or en-US -> en
}
@ -186,7 +187,8 @@ function dolSavePageContent($filetpl, Website $object, WebsitePage $objectpage,
if (getDolGlobalString('WEBSITE_FORCE_DOCTYPE_HTML5')) {
$tplcontent .= "<!DOCTYPE html>\n";
}
$tplcontent .= '<html'.($shortlangcode ? ' lang="'.$shortlangcode.'"' : '').'>'."\n";
// If a language was forced on page, we use it, else we use the lang of visitor else the lang of web site
$tplcontent .= '<html'.($objectpage->lang ? ' lang="'.substr($objectpage->lang, 0, 2).'"' : '<?php echo $weblangs->shortlang ? \' lang="\'.$weblangs->shortlang.\'"\' : \'\' ?>').'>'."\n";
$tplcontent .= '<head>'."\n";
$tplcontent .= '<title>'.dol_string_nohtmltag($objectpage->title, 0, 'UTF-8').'</title>'."\n";
$tplcontent .= '<meta charset="utf-8">'."\n";
@ -200,7 +202,7 @@ function dolSavePageContent($filetpl, Website $object, WebsitePage $objectpage,
$tplcontent .= '<meta name="dolibarr:pageid" content="'.dol_string_nohtmltag((string) $objectpage->id).'" />'."\n";
// Add favicon
if ($objectpage->id == $object->fk_default_home) {
if (in_array($objectpage->type_container, array('page', 'blogpost'))) {
$tplcontent .= '<link rel="icon" type="image/png" href="/favicon.png" />'."\n";
}

View file

@ -1876,34 +1876,39 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
$val = '';
}
$sql = "SELECT count(*) as nb";
$sql .= " FROM ".MAIN_DB_PREFIX."const";
$sql .= " WHERE ".$this->db->decrypt('name')." = '".$this->db->escape($name)."'";
$sql .= " AND entity = ".((int) $entity);
if (!empty($name)) {
$sql = "SELECT count(*) as nb";
$sql .= " FROM ".MAIN_DB_PREFIX."const";
$sql .= " WHERE ".$this->db->decrypt('name')." = '".$this->db->escape($name)."'";
$sql .= " AND entity = ".((int) $entity);
$result = $this->db->query($sql);
if ($result) {
$row = $this->db->fetch_row($result);
$result = $this->db->query($sql);
if ($result) {
$row = $this->db->fetch_row($result);
if ($row[0] == 0) { // If not found
$sql = "INSERT INTO ".MAIN_DB_PREFIX."const (name,type,value,note,visible,entity)";
$sql .= " VALUES (";
$sql .= $this->db->encrypt($name);
$sql .= ",'".$this->db->escape($type)."'";
$sql .= ",".(($val != '') ? $this->db->encrypt($val) : "''");
$sql .= ",".($note ? "'".$this->db->escape($note)."'" : "null");
$sql .= ",'".$this->db->escape($visible)."'";
$sql .= ",".$entity;
$sql .= ")";
if ($row[0] == 0) { // If not found
$sql = "INSERT INTO ".MAIN_DB_PREFIX."const (name, type, value, note, visible, entity)";
$sql .= " VALUES (";
$sql .= $this->db->encrypt($name);
$sql .= ", '".$this->db->escape($type)."'";
$sql .= ", ".(($val != '') ? $this->db->encrypt($val) : "''");
$sql .= ", ".($note ? "'".$this->db->escape($note)."'" : "null");
$sql .= ", '".$this->db->escape($visible)."'";
$sql .= ", ".((int) $entity);
$sql .= ")";
if (!$this->db->query($sql)) {
$err++;
if (!$this->db->query($sql)) {
$err++;
} else {
// Set also the variable in running environment
$conf->global->$name = $val;
}
} else {
dol_syslog(__METHOD__." constant '".$name."' already exists", LOG_DEBUG);
}
} else {
dol_syslog(__METHOD__." constant '".$name."' already exists", LOG_DEBUG);
$err++;
}
} else {
$err++;
}
}
@ -2748,8 +2753,8 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
$tmpfieldsofline = explode(';', $line);
$modulekey = strtolower($tmpfieldsofline[0]);
$conf->cache['noncompliantmodules'][$modulekey]['name'] = $tmpfieldsofline[0];
$conf->cache['noncompliantmodules'][$modulekey]['id'] = $tmpfieldsofline[1];
$conf->cache['noncompliantmodules'][$modulekey]['signature'] = $tmpfieldsofline[2];
$conf->cache['noncompliantmodules'][$modulekey]['id'] = (isset($tmpfieldsofline[1]) ? $tmpfieldsofline[1] : '');
$conf->cache['noncompliantmodules'][$modulekey]['signature'] = (isset($tmpfieldsofline[2]) ? $tmpfieldsofline[2] : '');
$conf->cache['noncompliantmodules'][$modulekey]['message'] = $langs->trans(empty($tmpfieldsofline[3]) ? 'WarningModuleAffiliatedToAReportedCompany' : $tmpfieldsofline[3]);
if (!empty($tmpfieldsofline[4])) {
$message2 = $langs->trans("WarningModuleAffiliatedToAPiratPlatform", '{s}');

View file

@ -1,8 +1,7 @@
<?php
/* Copyright (C) 2005-2010 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2009 Regis Houssin <regis.houssin@inodbox.com>
* Copyright (C) 2022-2024 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2022 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2022-2025 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
*
* This program is free software; you can redistribute it and/or modify
@ -39,6 +38,9 @@ class mod_asset_standard extends ModeleNumRefAsset
*/
public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
/**
* @var string prefix
*/
public $prefix = 'ASSET';
/**

View file

@ -1,7 +1,7 @@
<?php
/* Copyright (C) 2005-2010 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2009 Regis Houssin <regis.houssin@inodbox.com>
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2024-2025 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
*
* This program is free software; you can redistribute it and/or modify
@ -37,6 +37,9 @@ class mod_bom_standard extends ModeleNumRefBoms
*/
public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
/**
* @var string prefix
*/
public $prefix = 'BOM';
/**

View file

@ -1,6 +1,6 @@
<?php
/* Copyright (C) 2015 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2024-2025 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
*
* This program is free software; you can redistribute it and/or modify
@ -37,6 +37,9 @@ class mod_chequereceipt_mint extends ModeleNumRefChequeReceipts
*/
public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
/**
* @var string prefix
*/
public $prefix = 'CHK';
/**

View file

@ -1,7 +1,7 @@
<?php
/* Copyright (C) 2005-2010 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2009 Regis Houssin <regis.houssin@inodbox.com>
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2024-2025 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
*
* This program is free software; you can redistribute it and/or modify
@ -37,6 +37,9 @@ class mod_commande_marbre extends ModeleNumRefCommandes
*/
public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
/**
* @var string prefix
*/
public $prefix = 'CO';
/**

View file

@ -2,7 +2,7 @@
/* Copyright (C) 2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2008 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2010 Regis Houssin <regis.houssin@inodbox.com>
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2024-2025 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
*
* This program is free software; you can redistribute it and/or modify
@ -59,6 +59,9 @@ class mod_delivery_jade extends ModeleNumRefDeliveryOrder
*/
public $name = 'Jade';
/**
* @var string prefix
*/
public $prefix = 'BL';

View file

@ -1,6 +1,6 @@
<?php
/* Copyright (C) 2011 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2024-2025 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
*
* This program is free software; you can redistribute it and/or modify
@ -36,6 +36,9 @@ class mod_expedition_safor extends ModelNumRefExpedition
*/
public $version = 'dolibarr';
/**
* @var string prefix
*/
public $prefix = 'SH';
/**

View file

@ -1,6 +1,6 @@
<?php
/* Copyright (C) 2017 Maxime Kohlhaas <support@atm-consulting.fr>
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2024-2025 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
*
* This program is free software; you can redistribute it and/or modify
@ -36,6 +36,9 @@ class mod_expensereport_jade extends ModeleNumRefExpenseReport
*/
public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
/**
* @var string prefix
*/
public $prefix = 'ER';
/**

View file

@ -2,7 +2,7 @@
/* Copyright (C) 2005-2008 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2009 Regis Houssin <regis.houssin@inodbox.com>
* Copyright (C) 2013 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2024-2025 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
*
* This program is free software; you can redistribute it and/or modify
@ -38,6 +38,9 @@ class mod_pacific extends ModeleNumRefFicheinter
*/
public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
/**
* @var string prefix
*/
public $prefix = 'FI';
/**

View file

@ -1,7 +1,7 @@
<?php
/* Copyright (C) 2005-2010 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2009 Regis Houssin <regis.houssin@inodbox.com>
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2024-2025 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
*
* This program is free software; you can redistribute it and/or modify
@ -38,6 +38,9 @@ class mod_evaluation_standard extends ModeleNumRefEvaluation
*/
public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
/**
* @var string prefix
*/
public $prefix = 'EVAL';
/**

View file

@ -8,7 +8,8 @@
* Copyright (C) 2014 Christophe Battarel <contact@altairis.fr>
* Copyright (C) 2014 Cedric Gross <c.gross@kreiz-it.fr>
* Copyright (C) 2020-2021 Alexandre Spangaro <aspangaro@open-dsi.fr>
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
* Copyright (C) 2025 Frédéric France <frederic.france@free.fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -78,29 +79,30 @@ class modProduct extends DolibarrModules
$this->langfiles = array("products", "companies", "stocks", "bills");
// Constants
$this->const = array();
$r = 0;
$this->const = [
[
"PRODUCT_CODEPRODUCT_ADDON",
"chaine",
"mod_codeproduct_leopard",
'Module to control product codes',
0,
],
[
$this->const[$r][0] = "PRODUCT_CODEPRODUCT_ADDON";
$this->const[$r][1] = "chaine";
$this->const[$r][2] = "mod_codeproduct_leopard";
$this->const[$r][3] = 'Module to control product codes';
$this->const[$r][4] = 0;
$r++;
$this->const[$r][0] = "PRODUCT_PRICE_UNIQ";
$this->const[$r][1] = "chaine";
$this->const[$r][2] = "1";
$this->const[$r][3] = 'pricing rule by default';
$this->const[$r][4] = 0;
$r++;
/*$this->const[$r][0] = "PRODUCT_ADDON_PDF";
$this->const[$r][1] = "chaine";
$this->const[$r][2] = "standard";
$this->const[$r][3] = 'Default module for document generation';
$this->const[$r][4] = 0;
$r++;*/
"PRODUCT_PRICE_UNIQ",
"chaine",
"1",
'pricing rule by default',
0,
],
/*[
"PRODUCT_ADDON_PDF",
"chaine",
"standard",
'Default module for document generation',
0,
],*/
];
// Boxes
$this->boxes = array(
@ -162,17 +164,25 @@ class modProduct extends DolibarrModules
$this->menu = 1; // This module adds menu entries. They are coded into menu manager.
/* We can't enable this here because it must be enabled in both product and service module and this creates duplicate inserts
$r=0;
$this->menu[$r]=array( 'fk_menu'=>'fk_mainmenu=home,fk_leftmenu=admintools', // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
'type'=>'left', // This is a Left menu entry
'titre'=>'ProductVatMassChange',
'url'=>'/product/admin/product_tools.php?mainmenu=home&leftmenu=admintools',
'langs'=>'products', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
'position'=>300,
'enabled'=>'isModEnabled("product") && preg_match(\'/^(admintools|all)/\',$leftmenu)', // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
'perms'=>'1', // Use 'perms'=>'$user->hasRight("mymodule","level1","level2")' if you want your menu with a permission rules
'target'=>'',
'user'=>0); // 0=Menu for internal users, 1=external users, 2=both
$r = 0;
$this->menu[$r] = array(
// Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
'fk_menu' => 'fk_mainmenu=home,fk_leftmenu=admintools',
// This is a Left menu entry
'type' => 'left',
'titre' => 'ProductVatMassChange',
'url' => '/product/admin/product_tools.php?mainmenu=home&leftmenu=admintools',
// Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
'langs' => 'products',
'position' => 300,
// Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
'enabled' => 'isModEnabled("product") && preg_match(\'/^(admintools|all)/\',$leftmenu)',
// Use 'perms'=>'$user->hasRight("mymodule","level1","level2")' if you want your menu with a permission rules
'perms' => '1',
'target' => '',
// 0=Menu for internal users, 1=external users, 2=both
'user' => 0
);
$r++;
*/

View file

@ -1,9 +1,10 @@
<?php
/* Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2012 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2012 Regis Houssin <regis.houssin@inodbox.com>
* Copyright (C) 2013-2014 Cedric GROSS <c.gross@kreiz-it.fr>
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
/* Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2012 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2012 Regis Houssin <regis.houssin@inodbox.com>
* Copyright (C) 2013-2014 Cedric GROSS <c.gross@kreiz-it.fr>
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
* Copyright (C) 2025 Frédéric France <frederic.france@free.fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -74,27 +75,25 @@ class modProductBatch extends DolibarrModules
$this->requiredby = array(); // List of module ids to disable if this one is disabled
$this->conflictwith = array(); // List of module class names as string this module is in conflict with
$this->phpmin = array(7, 0); // Minimum version of PHP required by module
$this->need_dolibarr_version = array(3, 0); // Minimum version of Dolibarr required by module
$this->langfiles = array("productbatch");
// Constants
// Constants
$this->const = array();
$r = 0;
$this->const[$r][0] = "PRODUCTBATCH_LOT_ADDON";
$this->const[$r][1] = "chaine";
$this->const[$r][2] = "mod_lot_free";
$this->const[$r][3] = 'Module to control lot number';
$this->const[$r][4] = 0;
$r++;
$this->const[$r][0] = "PRODUCTBATCH_SN_ADDON";
$this->const[$r][1] = "chaine";
$this->const[$r][2] = "mod_sn_free";
$this->const[$r][3] = 'Module to control serial number';
$this->const[$r][4] = 0;
$r++;
$this->const = [
[
"PRODUCTBATCH_LOT_ADDON",
"chaine",
"mod_lot_free",
"Module to control lot number",
0,
],
[
"PRODUCTBATCH_SN_ADDON",
"chaine",
"mod_sn_free",
"Module to control serial number",
0,
],
];
$this->tabs = array();

View file

@ -1,13 +1,13 @@
<?php
/* Copyright (C) 2003-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2014 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2004 Sebastien Di Cintio <sdicintio@ressource-toi.org>
* Copyright (C) 2004 Benoit Mortier <benoit.mortier@opensides.be>
* Copyright (C) 2005-2012 Regis Houssin <regis.houssin@inodbox.com>
* Copyright (C) 2013 Florian Henry <florian.henry@open-concept.pro>
* Copyright (C) 2014 Charles-Fr BENKE <charles.fr@benke.fr>
* Copyright (C) 2023 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
/* Copyright (C) 2003-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2014 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2004 Sebastien Di Cintio <sdicintio@ressource-toi.org>
* Copyright (C) 2004 Benoit Mortier <benoit.mortier@opensides.be>
* Copyright (C) 2005-2012 Regis Houssin <regis.houssin@inodbox.com>
* Copyright (C) 2013 Florian Henry <florian.henry@open-concept.pro>
* Copyright (C) 2014 Charles-Fr BENKE <charles.fr@benke.fr>
* Copyright (C) 2023 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
* Copyright (C) 2024-2025 Frédéric France <frederic.france@free.fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -74,57 +74,57 @@ class modProjet extends DolibarrModules
$this->langfiles = array('projects');
// Constants
$this->const = array();
$r = 0;
$this->const[$r][0] = "PROJECT_ADDON_PDF";
$this->const[$r][1] = "chaine";
$this->const[$r][2] = "baleine";
$this->const[$r][3] = 'Name of PDF/ODT project manager class';
$this->const[$r][4] = 0;
$r++;
$this->const[$r][0] = "PROJECT_ADDON";
$this->const[$r][1] = "chaine";
$this->const[$r][2] = "mod_project_simple";
$this->const[$r][3] = 'Name of Numbering Rule project manager class';
$this->const[$r][4] = 0;
$r++;
$this->const[$r][0] = "PROJECT_ADDON_PDF_ODT_PATH";
$this->const[$r][1] = "chaine";
$this->const[$r][2] = "DOL_DATA_ROOT/doctemplates/projects";
$this->const[$r][3] = "";
$this->const[$r][4] = 0;
$r++;
$this->const[$r][0] = "PROJECT_TASK_ADDON_PDF";
$this->const[$r][1] = "chaine";
$this->const[$r][2] = "";
$this->const[$r][3] = 'Name of PDF/ODT tasks manager class';
$this->const[$r][4] = 0;
$r++;
$this->const[$r][0] = "PROJECT_TASK_ADDON";
$this->const[$r][1] = "chaine";
$this->const[$r][2] = "mod_task_simple";
$this->const[$r][3] = 'Name of Numbering Rule task manager class';
$this->const[$r][4] = 0;
$r++;
$this->const[$r][0] = "PROJECT_TASK_ADDON_PDF_ODT_PATH";
$this->const[$r][1] = "chaine";
$this->const[$r][2] = "DOL_DATA_ROOT/doctemplates/tasks";
$this->const[$r][3] = "";
$this->const[$r][4] = 0;
$r++;
$this->const[$r][0] = "PROJECT_USE_OPPORTUNITIES";
$this->const[$r][1] = "chaine";
$this->const[$r][2] = "1";
$this->const[$r][3] = "";
$this->const[$r][4] = 0;
$r++;
$this->const = [
[
"PROJECT_ADDON_PDF",
"chaine",
"baleine",
"Name of PDF/ODT project manager class",
0,
],
[
"PROJECT_ADDON",
"chaine",
"mod_project_simple",
"Name of Numbering Rule project manager class",
0,
],
[
"PROJECT_ADDON_PDF_ODT_PATH",
"chaine",
"DOL_DATA_ROOT/doctemplates/projects",
"",
0,
],
[
"PROJECT_TASK_ADDON_PDF",
"chaine",
"",
"Name of PDF/ODT tasks manager class",
0,
],
[
"PROJECT_TASK_ADDON",
"chaine",
"mod_task_simple",
"Name of Numbering Rule task manager class",
0,
],
[
"PROJECT_TASK_ADDON_PDF_ODT_PATH",
"chaine",
"DOL_DATA_ROOT/doctemplates/tasks",
"",
0,
],
[
"PROJECT_USE_OPPORTUNITIES",
"chaine",
"1",
"",
0,
],
];
// Boxes
$this->boxes = array(

View file

@ -1,7 +1,7 @@
<?php
/* Copyright (C) 2005-2010 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2009 Regis Houssin <regis.houssin@inodbox.com>
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2024-2025 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
*
* This program is free software; you can redistribute it and/or modify
@ -37,6 +37,9 @@ class mod_mo_standard extends ModeleNumRefMos
*/
public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
/**
* @var string prefix
*/
public $prefix = 'MO';
/**

View file

@ -1,6 +1,7 @@
<?php
/* Copyright (C) 2015 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
* Copyright (C) 2025 Frédéric France <frederic.france@free.fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -36,6 +37,9 @@ class mod_payment_cicada extends ModeleNumRefPayments
*/
public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
/**
* @var string prefix
*/
public $prefix = 'PAY';
/**

View file

@ -2,7 +2,7 @@
/* Copyright (C) 2005-2010 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2009 Regis Houssin <regis.houssin@inodbox.com>
* Copyright (C) 2021 Christophe Battarel <christophe@altairis.fr>
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2024-2025 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
*
* This program is free software; you can redistribute it and/or modify
@ -38,6 +38,9 @@ class mod_lot_standard extends ModeleNumRefBatch
*/
public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
/**
* @var string prefix
*/
public $prefix = 'LOT';
/**

View file

@ -2,7 +2,7 @@
/* Copyright (C) 2005-2010 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2009 Regis Houssin <regis.houssin@inodbox.com>
* Copyright (C) 2021 Christophe Battarel <christophe@altairis.fr>
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2024-2025 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
*
* This program is free software; you can redistribute it and/or modify
@ -38,6 +38,9 @@ class mod_sn_standard extends ModeleNumRefBatch
*/
public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
/**
* @var string prefix
*/
public $prefix = 'SN';
/**

View file

@ -1,7 +1,7 @@
<?php
/* Copyright (C) 2010-2012 Regis Houssin <regis.houssin@inodbox.com>
* Copyright (C) 2010 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2024-2025 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
*
* This program is free software; you can redistribute it and/or modify
@ -39,6 +39,9 @@ class mod_project_simple extends ModeleNumRefProjects
*/
public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
/**
* @var string prefix
*/
public $prefix = 'PJ';
/**

View file

@ -1,7 +1,7 @@
<?php
/* Copyright (C) 2010-2012 Regis Houssin <regis.houssin@inodbox.com>
* Copyright (C) 2010 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2024-2025 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
*
* This program is free software; you can redistribute it and/or modify
@ -39,6 +39,9 @@ class mod_task_simple extends ModeleNumRefTask
*/
public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
/**
* @var string prefix
*/
public $prefix = 'TK';
/**

View file

@ -1,7 +1,7 @@
<?php
/* Copyright (C) 2005-2008 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2012 Regis Houssin <regis.houssin@inodbox.com>
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2024-2025 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
*
* This program is free software; you can redistribute it and/or modify
@ -39,6 +39,9 @@ class mod_propale_marbre extends ModeleNumRefPropales
*/
public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
/**
* @var string prefix
*/
public $prefix = 'PR';
/**

View file

@ -2,7 +2,7 @@
/* Copyright (C) 2005-2010 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2009 Regis Houssin <regis.houssin@inodbox.com>
* Copyright (C) 2021 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2024-2025 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
*
* This program is free software; you can redistribute it and/or modify
@ -39,6 +39,9 @@ class mod_stocktransfer_standard extends ModeleNumRefStockTransfer
*/
public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
/**
* @var string prefix
*/
public $prefix = 'ST';
/**

View file

@ -1,7 +1,7 @@
<?php
/* Copyright (C) 2005-2008 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2009 Regis Houssin <regis.houssin@inodbox.com>
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2024-2025 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
*
* This program is free software; you can redistribute it and/or modify
@ -56,6 +56,9 @@ class mod_commande_fournisseur_muguet extends ModeleNumRefSuppliersOrders
*/
public $name = 'Muguet';
/**
* @var string prefix
*/
public $prefix = 'PO'; // PO for "Purchase Order"

View file

@ -1,6 +1,6 @@
<?php
/* Copyright (C) 2015 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2024-2025 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
*
* This program is free software; you can redistribute it and/or modify
@ -37,6 +37,9 @@ class mod_supplier_payment_bronan extends ModeleNumRefSupplierPayments
*/
public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
/**
* @var string prefix
*/
public $prefix = 'SPAY';
/**

View file

@ -1,7 +1,7 @@
<?php
/* Copyright (C) 2005-2008 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2012 Regis Houssin <regis.houssin@inodbox.com>
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2024-2025 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
*
* This program is free software; you can redistribute it and/or modify
@ -39,6 +39,9 @@ class mod_supplier_proposal_marbre extends ModeleNumRefSupplierProposal
*/
public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
/**
* @var string prefix
*/
public $prefix = 'RQ'; // RQ = Request for quotation
/**

View file

@ -1,7 +1,7 @@
<?php
/* Copyright (C) 2010-2012 Regis Houssin <regis.houssin@inodbox.com>
* Copyright (C) 2010 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2024-2025 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
*
* This program is free software; you can redistribute it and/or modify
@ -38,6 +38,9 @@ class mod_ticket_simple extends ModeleNumRefTicket
*/
public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
/**
* @var string prefix
*/
public $prefix = 'TS';
/**

View file

@ -2,7 +2,7 @@
/* Copyright (C) 2005-2010 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2009 Regis Houssin <regis.houssin@inodbox.com>
* Copyright (C) 2020 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2024-2025 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
*
* This program is free software; you can redistribute it and/or modify
@ -38,6 +38,9 @@ class mod_workstation_standard extends ModeleNumRefWorkstation
*/
public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
/**
* @var string prefix
*/
public $prefix = 'WKSTATION';
/**

View file

@ -1,6 +1,6 @@
<?php
/* Copyright (C) 2008-2016 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2024-2025 Frédéric France <frederic.france@free.fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -35,6 +35,7 @@ require_once DOL_DOCUMENT_ROOT.'/ecm/class/htmlecm.form.class.php';
/**
* @var Conf $conf
* @var DoliDB $db
* @var ExtraFields $extrafields
* @var HookManager $hookmanager
* @var Translate $langs
* @var User $user

View file

@ -489,15 +489,15 @@ class ConferenceOrBoothAttendee extends CommonObject
if (count($filter) > 0) {
foreach ($filter as $key => $value) {
if ($key == 't.rowid' || $key == 't.fk_soc' || $key == 't.fk_project' || $key == 't.fk_actioncomm') {
$sqlwhere[] = $key.'='.((int) $value);
} elseif (in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
$sqlwhere[] = $this->db->sanitize($key).' = '.((int) $value);
} elseif (!empty($this->fields[$key]) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
$sqlwhere[] = $this->db->sanitize($key)." = '".$this->db->idate($value)."'";
} elseif ($key == 'customsql') {
$sqlwhere[] = $value;
} elseif (strpos($value, '%') === false) {
$sqlwhere[] = $key.' IN ('.$this->db->sanitize($this->db->escape($value)).')';
$sqlwhere[] = $this->db->sanitize($key).' IN ('.$this->db->sanitize($this->db->escape($value)).')';
} else {
$sqlwhere[] = $key." LIKE '%".$this->db->escape($value)."%'";
$sqlwhere[] = $this->db->sanitize($key)." LIKE '%".$this->db->escape($value)."%'";
}
}
}

View file

@ -296,7 +296,7 @@ class ExpenseReport extends CommonObject
'ref' => array('type' => 'varchar(50)', 'label' => 'Ref', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'showoncombobox' => 1, 'position' => 15),
'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => '1', 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 20),
'ref_number_int' => array('type' => 'integer', 'label' => 'Ref number int', 'enabled' => 1, 'visible' => -1, 'position' => 25),
'ref_ext' => array('type' => 'integer', 'label' => 'Ref ext', 'enabled' => 1, 'visible' => -1, 'position' => 30),
'ref_ext' => array('type' => 'integer', 'label' => 'RefExt', 'enabled' => 1, 'visible' => 0, 'position' => 30),
'total_ht' => array('type' => 'double(24,8)', 'label' => 'Total ht', 'enabled' => 1, 'visible' => -1, 'position' => 35),
'total_tva' => array('type' => 'double(24,8)', 'label' => 'Total tva', 'enabled' => 1, 'visible' => -1, 'position' => 40),
'localtax1' => array('type' => 'double(24,8)', 'label' => 'Localtax1', 'enabled' => 1, 'visible' => -1, 'position' => 45),
@ -357,6 +357,8 @@ class ExpenseReport extends CommonObject
// List of language codes for status
$this->labelStatusShort = array(0 => 'Draft', 2 => 'Validated', 4 => 'Canceled', 5 => 'Approved', 6 => 'Paid', 99 => 'Refused');
$this->labelStatus = array(0 => 'Draft', 2 => 'ValidatedWaitingApproval', 4 => 'Canceled', 5 => 'Approved', 6 => 'Paid', 99 => 'Refused');
$this->fields['ref_ext']['visible'] = getDolGlobalInt('MAIN_LIST_SHOW_REF_EXT');
}
/**

View file

@ -48,7 +48,7 @@ class Fichinter extends CommonObject
'fk_projet' => array('type' => 'integer:Project:projet/class/project.class.php:1:(fk_statut:=:1)', 'label' => 'Fk projet', 'enabled' => 'isModEnabled("project")', 'visible' => -1, 'position' => 20),
'fk_contrat' => array('type' => 'integer', 'label' => 'Fk contrat', 'enabled' => '$conf->contrat->enabled', 'visible' => -1, 'position' => 25),
'ref' => array('type' => 'varchar(30)', 'label' => 'Ref', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'showoncombobox' => 1, 'position' => 30),
'ref_ext' => array('type' => 'varchar(255)', 'label' => 'Ref ext', 'enabled' => 1, 'visible' => 0, 'position' => 35),
'ref_ext' => array('type' => 'varchar(255)', 'label' => 'RefExt', 'enabled' => 1, 'visible' => 0, 'position' => 35),
'ref_client' => array('type' => 'varchar(255)', 'label' => 'RefCustomer', 'enabled' => 1, 'visible' => -1, 'position' => 36),
'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => '1', 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 40, 'index' => 1),
'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 45),

View file

@ -376,7 +376,7 @@ class CommandeFournisseur extends CommonOrder
public $fields = array(
'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => 0, 'notnull' => 1, 'position' => 10),
'ref' => array('type' => 'varchar(255)', 'label' => 'Ref', 'enabled' => 1, 'visible' => 1, 'showoncombobox' => 1, 'position' => 25, 'searchall' => 1),
'ref_ext' => array('type' => 'varchar(255)', 'label' => 'Ref ext', 'enabled' => 1, 'visible' => 0, 'position' => 35),
'ref_ext' => array('type' => 'varchar(255)', 'label' => 'RefExt', 'enabled' => 1, 'visible' => 0, 'position' => 35),
'ref_supplier' => array('type' => 'varchar(255)', 'label' => 'RefOrderSupplierShort', 'enabled' => 1, 'visible' => 1, 'position' => 40, 'searchall' => 1),
'fk_projet' => array('type' => 'integer:Project:projet/class/project.class.php:1:(fk_statut:=:1)', 'label' => 'Project', 'enabled' => "isModEnabled('project')", 'visible' => -1, 'position' => 45),
'date_valid' => array('type' => 'datetime', 'label' => 'DateValidation', 'enabled' => 1, 'visible' => -1, 'position' => 710),

View file

@ -16,8 +16,24 @@ class SegmentException extends Exception
*/
class Segment implements IteratorAggregate, Countable
{
/**
* @var string
*/
protected $xml;
/**
* @var string
*/
protected $savxml;
/**
* @var string
*/
protected $xmlParsed = '';
/**
* @var string
*/
protected $name;
protected $children = array();
protected $vars = array();
@ -30,7 +46,7 @@ class Segment implements IteratorAggregate, Countable
*
* @param string $name name of the segment to construct
* @param string $xml XML tree of the segment
* @param string $odf odf
* @param Odf $odf odf
*/
public function __construct($name, $xml, $odf)
{

View file

@ -394,7 +394,12 @@ ALTER TABLE llx_facture_rec ADD COLUMN fk_societe_rib integer DEFAULT NULL;
ALTER TABLE llx_facture ADD COLUMN is_also_delivery_note tinyint DEFAULT 0 NOT NULL;
ALTER TABLE llx_user MODIFY COLUMN signature LONGTEXT;
ALTER TABLE llx_societe_rib MODIFY COLUMN label varchar(180); -- 200 is too long to allow index after
ALTER TABLE llx_societe_rib MODIFY COLUMN iban_prefix varchar(100);
-- Add entity field
ALTER TABLE llx_societe_rib DROP INDEX uk_societe_rib;
ALTER TABLE llx_societe_rib ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER rowid;
-- select entity, label, fk_soc, default_rib, MIN(iban_prefix), MAX(iban_prefix), MIN(rowid), MAX(rowid), COUNT(rowid) from llx_societe_rib GROUP BY entity, label, fk_soc, default_rib HAVING COUNT(rowid) > 1;
ALTER TABLE llx_societe_rib ADD UNIQUE INDEX uk_societe_rib(entity, label, fk_soc);

View file

@ -32,6 +32,11 @@
-- -- VPGSQL8.2 SELECT dol_util_rebuild_sequences();
-- V21 forgotten
ALTER TABLE llx_societe_rib MODIFY COLUMN label varchar(180);
ALTER TABLE llx_societe_rib MODIFY COLUMN iban_prefix varchar(100);
-- V22 migration

View file

@ -26,7 +26,7 @@ create table llx_societe_rib
rowid integer AUTO_INCREMENT PRIMARY KEY,
entity integer DEFAULT 1 NOT NULL, -- multi company id
type varchar(32) DEFAULT 'ban' NOT NULL, -- 'ban' or 'paypal' or 'card' or 'stripe'
label varchar(200),
label varchar(180),
fk_soc integer NOT NULL,
datec datetime,
tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
@ -40,7 +40,7 @@ create table llx_societe_rib
bic varchar(20), -- 11 according to ISO 9362 (we keep 20 for backward compatibility)
bic_intermediate varchar(11), -- 11 according to ISO 9362. Same as bic but for intermediate bank
iban_prefix varchar(80), -- full iban. 34 according to ISO 13616 but we set 80 to allow to store it with encryption information
iban_prefix varchar(100), -- full iban. 34 according to ISO 13616 but we set 100 to allow to store it with encryption information
domiciliation varchar(255),
proprio varchar(60),

View file

@ -0,0 +1,3 @@
# Dolibarr language file - Source file is en_US - blockedlog
KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists) or has modified checksum of the previous record.
DataOfArchivedEvent=Full data of archived event

View file

@ -0,0 +1,3 @@
# Dolibarr language file - Source file is en_US - blockedlog
KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists) or has modified checksum of the previous record.
DataOfArchivedEvent=Full data of archived event

View file

@ -0,0 +1,4 @@
# Dolibarr language file - Source file is en_US - categories
AddCustomerIntoCategory=Assign category to customer
AddSupplierIntoCategory=Assign category to supplier
AssignCategoryTo=Assign category to

View file

@ -0,0 +1,2 @@
# Dolibarr language file - Source file is en_US - datapolicy
datapolicySetupPage =Depending on the laws of your countries (Example <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Article 5</a> of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.<br>The deletion will be done automatically after a certain duration without events (the duration which you will have indicated below).

View file

@ -0,0 +1,5 @@
# Dolibarr language file - Source file is en_US - hrm
RequiredRank=Required rank for the job profile
RequiredRankShort=Required rank
EmployeeRank=Employee rank for this skill
EmployeeRankShort=Employee rank

View file

@ -0,0 +1,18 @@
# Dolibarr language file - Source file is en_US - mails
AllEMailings=All eMailings
ShowEMailing=Show emailing
ListOfEMailings=List of emailings
NewMailing=New emailing
EditMailing=Edit emailing
ResetMailing=Resend emailing
ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets statusin error
DeleteMailing=Delete emailing
PreviewMailing=Preview emailing
CreateMailing=Create emailing
ValidMailing=Valid emailing
MailingArea=EMailings area
SearchAMailing=Search mailing
SendMailing=Send emailing
LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
NbOfEMailingsReceived=Mass emailings received
NbOfEMailingsSend=Mass emailings sent

View file

@ -0,0 +1,3 @@
# Dolibarr language file - Source file is en_US - blockedlog
KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists) or has modified checksum of the previous record.
DataOfArchivedEvent=Full data of archived event

View file

@ -0,0 +1,3 @@
# Dolibarr language file - Source file is en_US - datapolicy
datapolicySetupPage =Depending on the laws of your countries (Example <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Article 5</a> of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.<br>The deletion will be done automatically after a certain duration without events (the duration which you will have indicated below).
DATAPOLICY_Tooltip_SETUP=Define the delay with no interaction after which you want the record to be automatically purged.

View file

@ -0,0 +1,3 @@
# Dolibarr language file - Source file is en_US - datapolicy
datapolicySetupPage =Depending on the laws of your countries (Example <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Article 5</a> of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.<br>The deletion will be done automatically after a certain duration without events (the duration which you will have indicated below).
DATAPOLICY_Tooltip_SETUP=Define the delay with no interaction after which you want the record to be automatically purged.

View file

@ -63,7 +63,6 @@ RecordGenerated=Datensatz erzeugt
DolibarrInHttpAuthenticationSoPasswordUseless=Der Dolibarr Authentifizierungsmodus steht auf <b>%s</b> in der Konfigurationsdatei. Das heisst, dass Änderungen in diesem Feld keine Auswirkung haben werden, weil die Passwort - Datenbank ausserhalb der Dolibarr - Umgebung liegt.
PasswordForgotten=Hast du dein Passwort vergessen?
NoAccount=Ich habe kein Benutzerkonto
HomeArea=Start
LastConnexion=Zuletzt gesehen am:
PreviousConnexion=Davor zuletzt gesehen am:
AuthenticationMode=Authentifizierungsmodus
@ -74,7 +73,6 @@ InformationLastAccessInError=Informationen zum letzten Datenbankfehler
YouCanSetOptionDolibarrMainProdToZero=Für weitere Informationen schaust du in der Logdatei nach, oder setzest in der Konfigurationsdatei die Option $dolibarr_main_prod auf '0'.
LineID=Zeilennummer
WarningYouHaveAtLeastOneTaskLate=Obacht, mindestens ein Element ist verspätet.
Home=Start
MediaBrowser=Mediabrowser
SelectedPeriod=Gewählter Zeitraum
PreviousPeriod=Vorangegangener Zeitraum
@ -125,7 +123,6 @@ UserValidationShort=Validieren
Second=Zweitens
Morning=Morgen
Afternoon=Nachmittag
MinuteShort=min
DefaultValues=Standardwerte
PriceCurrency=Währung
UnitPriceHTCurrency=Nettopreis

View file

@ -37,6 +37,7 @@ Translation=Übersetzung
Translations=Übersetzungen
CurrentTimeZone=Aktuelle Zeitzone des PHP-Servers
EmptySearchString=Keine leeren Suchkriterien eingeben
EnterNonEmptyLinesFirst=zuerst die Zeilen eingeben, die nicht leer sind
EnterADateCriteria=Geben Sie ein Datumskriterium ein
NoRecordFound=Keinen Eintrag gefunden
NoRecordDeleted=Keine Datensätze gelöscht
@ -45,6 +46,7 @@ NoError=kein Fehler
Error=Fehler
Errors=Fehler
ErrorFieldRequired=Feld '%s' ist erforderlich
CustomMandatoryFieldRule=Benutzerdefinierte Regel für „Pflichtfeld“
ErrorFieldFormat=Der Wert in Feld '%s' ist ungültig
ErrorFileDoesNotExists=Die Datei %s existiert nicht
ErrorFailedToOpenFile=Fehler beim Öffnen der Datei %s
@ -110,7 +112,7 @@ Undefined=Nicht definiert
PasswordForgotten=Passwort vergessen?
NoAccount=Kein Konto?
SeeAbove=Siehe oben
HomeArea=Startseite
HomeArea=Start
LastConnexion=Letzte Anmeldung
PreviousConnexion=Vorherige Anmeldung
PreviousValue=Vorheriger Wert
@ -141,7 +143,7 @@ Yes=Ja
no=nein
No=Nein
All=Alle
Home=Startseite
Home=Start
Help=Hilfe
OnlineHelp=Online-Hilfe
PageWiki=Wiki-Seite
@ -308,6 +310,7 @@ DateBuild=Datum der Berichterstellung
DatePayment=Zahlungsdatum
DateApprove=Genehmigungsdatum
DateApprove2=Genehmigungsdatum (zweite Genehmigung)
PendingSince=Ausstehend seit
RegistrationDate=Registrierungsdatum
UserCreation=Erzeuge Datenbank-Benutzer
UserModification=Aktualisierung Benutzer
@ -349,12 +352,12 @@ Afternoon=nachmittags
Quadri=vierfach
MonthOfDay=Tag des Monats
DaysOfWeek=Wochentage
HourShort=H
MinuteShort=mn
SecondShort=Sek
HourShort=h
MinuteShort=min
SecondShort=sek
DayShort=d
MonthShort=m
YearShort=J
YearShort=a
Rate=Rate
CurrencyRate=Wechselkurs
UseLocalTax=inkl. MwSt.
@ -384,8 +387,8 @@ UnitPriceHTCurrency=Stückpreis (netto) (Währung)
UnitPriceTTC=Stückpreis (brutto)
PriceU=Einzelpr.
PriceUHT=EP (netto)
PriceUHTCurrency=Einzelpr. (netto) (Währung)
PriceUTTC=Einzelpr. (brutto)
PriceUHTCurrency=EP (netto) (Währung)
PriceUTTC=EP (brutto)
Amount=Betrag
Amounts=Beträge
AmountInvoice=Rechnungsbetrag
@ -536,7 +539,7 @@ By=Durch
From=Von
FromDate=Von
FromLocation=von
to=An
to=Bis
To=An
ToDate=bis
ToLocation=An
@ -721,6 +724,8 @@ TextUsedInTheMessageBody=E-Mail Text
SendAcknowledgementByMail=Bestätigungsmail senden
SendMail=E-Mail versenden
Email=E-Mail
EMail=E-Mail
EMails=E-Mail
NoEMail=Keine E-Mail-Adresse(n) vorhanden
AlreadyRead=Bereits gelesen
NotRead=Ungelesen
@ -879,6 +884,7 @@ toward=zu
Access=Zugriff
SelectAction=Aktion auswählen
SelectTargetUser=Zielbenutzer/Mitarbeiter wählen
ClickToCopyToClipboard=Klicken, um in die Zwischenablage zu kopieren
HelpCopyToClipboard=Benutze Ctrl+C für Kopie in Zwischenablage
SaveUploadedFileWithMask=Datei auf dem Server unter dem Namen "<strong>%s</strong>" speichern (wenn deaktiviert wird der %s benutzt)
OriginFileName=original Dateiname
@ -925,6 +931,7 @@ ConfirmMassDeletionQuestion=Möchten Sie den/die <b>%s</b> ausgewählten Datensa
ConfirmMassClone=Bestätigung des Massen-Klonens
ConfirmMassCloneQuestion=Wählen Sie das Projekt aus, in das geklont werden soll
ConfirmMassCloneToOneProject=In Projekt %s klonen
ObjectClonedSuccessfuly=Objekt erfolgreich dupliziert
RelatedObjects=Verknüpfte Objekte
ClassifyBilled=Als 'fakturiert' markieren
ClassifyUnbilled=Als 'nicht fakturiert' markieren
@ -961,10 +968,11 @@ PrivateDownloadLinkDesc=Sie müssen eingeloggt sein und Berechtigungen zum Anzei
Download=Download
DownloadDocument=Dokument herunterladen
DownloadSignedDocument=Unterzeichnetes Dokument herunterladen
ActualizeCurrency=Wechselkurs aktualisieren
ActualizeCurrency=Letzten bekannten Wechselkurs verwenden
Fiscalyear=Fiskalisches Jahr
ModuleBuilder=Module Builder für Module und Anwendungen
SetMultiCurrencyCode=Währung festlegen
SetMultiCurrencyRate=Wechselkurs festlegen
BulkActions=Massenaktionen
ClickToShowHelp=Klicken um die Tooltiphilfe anzuzeigen
WebSite=Website
@ -1104,6 +1112,7 @@ PayedBy=Bezahlt von
PayedTo=Bezahlt
Monthly=Monatlich
Quarterly=Quartalsweise
Quarter=Quartal
Annual=Jährlich
Local=Lokal
Remote=Remote
@ -1306,3 +1315,27 @@ TranslationOfKey=Übersetzung vom Schlüssel AnyTranslationKey
SignedStatus=Status Unterschrift
NbRecordQualified=Zahl von qualifizierten Datensätzen
auto=automatisch
UploadFile=Direkter Import des Dokuments
OrClickToSelectAFile=oder klicken, um ein Datei von der Festplatte auszuwählen
NetTotal=Nettosumme
VATAmount=USt.-Betrag
TotalDiscount=Gesamtrabatt
TotalHTBeforeDiscount=Gesamtnetto vor Rabatt
Contains=Enthält
DoesNotContain=Enthält nicht
Is=Ist
IsNot=Ist nicht
StartsWith=Beginnt mit
EndsWith=Endet mit
IsBefore=Ist vor
IsAfter=Ist nach
IsOnOrBefore=Ist vor oder gleich
IsOnOrAfter=Ist nach oder gleich
IsHigherThan=Ist größer als
IsHigherThanOrEqual=Ist größer oder gleich
IsLowerThan=Ist niedriger als
IsLowerThanOrEqual=Ist kleiner oder gleich
addToFilter=Hinzufügen
FilterAssistance=Filter-Editor
Operator=Operator
AllFieldsRequired=Alle Felder sind Pflichtfelder.

View file

@ -0,0 +1,3 @@
# Dolibarr language file - Source file is en_US - blockedlog
KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists) or has modified checksum of the previous record.
DataOfArchivedEvent=Full data of archived event

View file

@ -0,0 +1,4 @@
# Dolibarr language file - Source file is en_US - categories
AddCustomerIntoCategory=Assign category to customer
AddSupplierIntoCategory=Assign category to supplier
AssignCategoryTo=Assign category to

View file

@ -0,0 +1,2 @@
# Dolibarr language file - Source file is en_US - datapolicy
datapolicySetupPage =Depending on the laws of your countries (Example <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Article 5</a> of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.<br>The deletion will be done automatically after a certain duration without events (the duration which you will have indicated below).

View file

@ -0,0 +1,2 @@
# Dolibarr language file - Source file is en_US - errors
ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a deposit. You will face problems when you will need to consume the deposit in final invoice if you do so.

View file

@ -15,7 +15,7 @@ BoxLastCustomers=Τελευταίοι τροποποιημένοι πελάτε
BoxLastSuppliers=Τελευταίοι τροποποιημένοι προμηθευτές
BoxLastCustomerOrders=Τελευταίες εντολές πωλήσεων
BoxLastActions=Τελευταίες ενέργειες
BoxLastContracts=Τελευταία συμβόλαια
BoxLastContracts=Τελευταίες συμβάσεις
BoxLastContacts=Τελευταίες επαφές/διευθύνσεις
BoxLastMembers=Τελευταία μέλη
BoxLastModifiedMembers=Τελευταία τροποποιημένα μέλη
@ -50,7 +50,7 @@ BoxLastExpiredServices=Τελευταίες %s παλαιότερες επαφέ
BoxTitleLastActionsToDo=Τελευταίες %s ενέργειες προς πραγματοποίηση
BoxTitleOldestActionsToDo=Τα παλαιότερα %s συμβάντα που πρέπει να γίνουν, μη ολοκληρωμένα
BoxTitleFutureActions=Τα επόμενα %s επερχόμενα συμβάντα
BoxTitleLastContracts=Τελευταία %s τροποποιημένα συμβόλαια
BoxTitleLastContracts=Τελευταία %s τροποποιημένες συμβάσεις
BoxTitleLastModifiedDonations=Τελευταίες %s τροποποιημένες δωρεές
BoxTitleLastModifiedExpenses=Τελευταίες %s αναφορές εξόδων που τροποποιήθηκαν
BoxTitleLatestModifiedBoms=Τελευταία %s BOM που τροποποιήθηκαν
@ -65,23 +65,24 @@ FailedToRefreshDataInfoNotUpToDate=Αποτυχία ανανέωσης ροής
LastRefreshDate=Ημερομηνία τελευταίας ανανέωσης
NoRecordedBookmarks=Δεν υπάρχουν σελιδοδείκτες που ορίζονται. Κάντε κλικ <a href="%s">εδώ</a> για να προσθέσετε σελιδοδείκτες.
ClickToAdd=Πατήστε εδώ για προσθήκη.
NoRecordedCustomers=Δεν υπάρχουν καταχωρημένοι πελάτες
NoRecordedContacts=Δεν υπάρχουν καταγεγραμμένες επαφές
NoRecordedCustomers=Δεν έχουν καταγραφεί πελάτες
NoRecordedContacts=Δεν έχουν καταγραφεί επαφές
NoActionsToDo=Δεν υπάρχουν ενέργειες που πρέπει να γίνουν
NoRecordedOrders=Δεν υπάρχουν καταγεγραμμένες εντολές πωλήσεων
NoRecordedProposals=Δεν υπάρχουν καταχωρημένες προσφορές
NoRecordedInvoices=Δεν υπάρχουν καταγεγραμμένα τιμολόγια πελατών
NoRecordedOrders=Δεν έχουν καταγραφεί εντολές πωλήσεων
NoRecordedProposals=Δεν έχουν καταγραφεί προσφορές
NoRecordedInvoices=Δεν έχουν καταγραφεί τιμολόγια πελάτων
NoUnpaidCustomerBills=Δεν υπάρχουν απλήρωτα τιμολόγια πελατών
NoUnpaidSupplierBills=Δεν υπάρχουν απλήρωτα τιμολόγια προμηθευτών
NoModifiedSupplierBills=Δεν υπάρχουν καταγεγραμμένα τιμολόγια προμηθευτή
NoRecordedProducts=Δεν υπάρχουν καταχωρημένα προϊόντα/υπηρεσίες
NoRecordedProspects=Καμία καταγεγραμμένη προοπτική
NoContractedProducts=Δεν υπάρχουν καταχωρημένα συμβόλαια με προϊόντα/υπηρεσίες
NoRecordedContracts=Δεν υπάρχουν καταχωρημένα συμβόλαια
NoModifiedSupplierBills=Δεν έχουν καταγραφεί τιμολόγια προμηθευτών
NoRecordedProducts=Δεν έχουν καταγραφεί προϊόντα/υπηρεσίες
NoRecordedProspects=Δεν έχουν καταγραφεί προοπτικές
NoContractedProducts=Δεν υπάρχουν καταχωρημένες συμβάσεις με προϊόντα/υπηρεσίες
NoRecordedContracts=Δεν έχουν καταγραφεί συμβάσεις
NoRecordedInterventions=Δεν έχουν καταγραφεί παρεμβάσεις
NoRecordedBankAccounts=Δεν έχουν καταγραφεί οικονομικοί λογαριασμοί
NoSupplierOrder=Δεν έχει καταγραφεί καμία αγορά Παραγγελία
BoxLatestSupplierOrders=Τελευταίες παραγγελίες αγοράς
BoxLatestSupplierOrdersAwaitingReception=Τελευταίες παραγγελίες αγοράς (εν αναμονή παραλαβής)
NoSupplierOrder=Καμία καταγεγραμμένη εντολή αγοράς
BoxCustomersInvoicesPerMonth=Τιμολόγιο Πελατών ανά μήνα
BoxSuppliersInvoicesPerMonth=Τιμολόγια προμηθευτή ανά μήνα
BoxCustomersOrdersPerMonth=Παραγγελίες Πωλήσεων ανά μήνα
@ -100,7 +101,7 @@ BoxTitleLatestModifiedCandidatures=Τελευταίες %s τροποποιημ
ForCustomersInvoices=Τιμολόγια Πελάτη
ForCustomersOrders=Παραγγελίες πελατών
ForProposals=Προσφορές
LastXMonthRolling=Τελευταίοι %s κυλιόμενοι μήνες
LastXMonthRolling=Τελευταίοι %s μήνες
ChooseBoxToAdd=Προσθήκη γραφικού στοιχείου στον πίνακα ελέγχου
BoxAdded=Το γραφικό στοιχείο προστέθηκε στον πίνακα ελέγχου.
BoxTitleUserBirthdaysOfMonth=Γενέθλια αυτού του μήνα (χρήστες)
@ -118,6 +119,9 @@ NoRecordedShipments=Καμία καταγεγραμμένη αποστολή π
BoxCustomersOutstandingBillReached=Πελάτες που έχουν φτάσει το όριο μέγιστου οφειλόμενου
BoxTitleLastFediverseInfos=Τελευταίες %s αναρτήσεις από %s
BoxLastFediverseInfos=Τελευταίες ενημερώσεις Fediverse: Ειδήσεις και Τάσεις
NoOpenedProjectsOpportunities=Δεν υπάρχουν ανοιχτές ευκαιρίες
NoOpenedProjects=Δεν υπάρχουν ανοιχτά έργα
NoScheduledJobs=Δεν υπάρχουν προγραμματισμένες εργασίες
# Pages
UsersHome=Χρήστες και ομάδες
MembersHome=Μέλη

View file

@ -37,8 +37,9 @@ Translation=Μετάφραση
Translations=Μεταφράσεις
CurrentTimeZone=TimeZone PHP (server)
EmptySearchString=Εισάγετε μη κενά κριτήρια αναζήτησης
EnterNonEmptyLinesFirst=εισάγετε πρώτα μη κενές γραμμές
EnterADateCriteria=Εισαγάγετε κριτήρια ημερομηνίας
NoRecordFound=Κανένα αρχείο δεν βρέθηκε
NoRecordFound=Δεν βρέθηκαν εγγραφές
NoRecordDeleted=Κανένα αρχείο δεν διαγράφηκε
NotEnoughDataYet=Τα δεδομένα δεν είναι επαρκή
NoError=Κανένα Σφάλμα
@ -309,6 +310,7 @@ DateBuild=Αναφορά ημερομηνία κατασκευής
DatePayment=Ημερομηνία πληρωμής
DateApprove=Ημερομηνία έγκρισης
DateApprove2=Ημερομηνία έγκρισης (δεύτερο έγκριση)
PendingSince=Εκκρεμεί από
RegistrationDate=Ημερομηνία Εγγραφής
UserCreation=Χρήστης δημιουργίας
UserModification=Χρήστης τροποποίησης
@ -722,6 +724,8 @@ TextUsedInTheMessageBody=Κείμενο email
SendAcknowledgementByMail=Αποστολή email επιβεβαίωσης
SendMail=Αποστολή email
Email=Email
EMail=Email
EMails=Emails
NoEMail=Χωρίς email
AlreadyRead=Διαβασμένα
NotRead=Αδιάβαστο
@ -880,6 +884,7 @@ toward=προς
Access=Πρόσβαση
SelectAction=Επιλογή ενέργειας
SelectTargetUser=Επιλέξτε χρήστη/υπάλληλο-στόχο
ClickToCopyToClipboard=Κάντε κλικ για αντιγραφή στο πρόχειρο
HelpCopyToClipboard=Χρησιμοποιήστε το Ctrl + C για να αντιγράψετε στο πρόχειρο
SaveUploadedFileWithMask=Αποθηκεύστε το αρχείο στον server με το όνομα "<strong>%s</strong>" (αλλιώς "%s")
OriginFileName=Αρχική Ονομασία
@ -926,6 +931,7 @@ ConfirmMassDeletionQuestion=Είστε σίγουροι ότι θέλετε να
ConfirmMassClone=Επιβεβαίωση μαζικής κλωνοποίησης
ConfirmMassCloneQuestion=Επιλέξτε έργο για κλωνοποίηση
ConfirmMassCloneToOneProject=Κλωνοποίηση στο έργο %s
ObjectClonedSuccessfuly=Το αντικείμενο αντιγράφηκε με επιτυχία
RelatedObjects=Σχετικά Αντικείμενα
ClassifyBilled=Ταξινόμηση ως τιμολογημένο
ClassifyUnbilled=Ταξινόμηση ως μη τιμολογημένο
@ -962,10 +968,11 @@ PrivateDownloadLinkDesc=Πρέπει να είστε συνδεδεμένοι κ
Download=Λήψη
DownloadDocument=Λήψη εγγράφου
DownloadSignedDocument=Λήψη υπογεγραμμένου εγγράφου
ActualizeCurrency=Ενημέρωση τιμής νομίσματος
ActualizeCurrency=Χρήση της τελευταίας γνωστής ισοτιμίας του νομίσματος
Fiscalyear=Οικονομικό έτος
ModuleBuilder=Εφαρμογή δημιουργίας ενοτήτων
SetMultiCurrencyCode=Ορισμός νομίσματος
SetMultiCurrencyRate=Ορισμός ισοτιμίας νομίσματος
BulkActions=Μαζικές ενέργειες
ClickToShowHelp=Κάντε κλικ για να εμφανιστεί το αναδυόμενο πλαίσιο βοήθειας
WebSite=Ιστοσελίδα
@ -1105,6 +1112,7 @@ PayedBy=Πληρώθηκε από
PayedTo=Πληρώθηκε σε
Monthly=Μηνιαία
Quarterly=Τριμηνιαία
Quarter=Τρίμηνο
Annual=Ετήσια
Local=Τοπικά
Remote=Απομακρυσμένο
@ -1177,8 +1185,8 @@ DefaultMailModel=Προεπιλεγμένο πρότυπο αλληλογραφ
PublicVendorName=Επωνυμία προμηθευτή
DateOfBirth=Ημερομηνία γέννησης
SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Το Security token έχει λήξει, επομένως η ενέργεια ακυρώθηκε. Παρακαλώ προσπαθήστε ξανά.
UpToDate=Ενημερωμένο
OutOfDate=Ξεπερασμένο
UpToDate=Ενημερωμένη
OutOfDate=Ληγμένη
EventReminder=Υπενθύμιση συμβάντος
UpdateForAllLines=Ενημέρωση για όλες τις γραμμές
OnHold=Σε Αναμονή
@ -1307,3 +1315,27 @@ TranslationOfKey=Μετάφραση του κλειδιού AnyTranslationKey
SignedStatus=Κατάσταση υπογραφής
NbRecordQualified=Αριθμός εγκεκριμένων εγγραφών
auto=αυτόματα
UploadFile=Άμεση εισαγωγή εγγράφου
OrClickToSelectAFile=ή κάντε κλικ για να επιλέξετε ένα αρχείο
NetTotal=Σύνολο καθαρού
VATAmount=Ποσό ΦΠΑ
TotalDiscount=Σύνολο έκπτωσης
TotalHTBeforeDiscount=Αξία προ έκπτωσης
Contains=Περιέχει
DoesNotContain=Δεν περιέχει
Is=Είναι
IsNot=Δεν είναι
StartsWith=Ξεκινά με
EndsWith=Τελειώνει με
IsBefore=Είναι πριν
IsAfter=Είναι μετά
IsOnOrBefore=Είναι πριν ή ίσο
IsOnOrAfter=Είναι μετά ή ίσο
IsHigherThan=Είναι μεγαλύτερο από
IsHigherThanOrEqual=Είναι μεγαλύτερο ή ίσο
IsLowerThan=Είναι μικρότερο από
IsLowerThanOrEqual=Είναι μικρότερο ή ίσο
addToFilter=Προσθήκη
FilterAssistance=Επεξεργαστής φίλτρου
Operator=Operator
AllFieldsRequired=Όλα τα πεδία είναι υποχρεωτικά.

View file

@ -0,0 +1,5 @@
# Dolibarr language file - Source file is en_US - blockedlog
KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists) or has modified checksum of the previous record.
DataOfArchivedEvent=Full data of archived event
DataOfArchivedEventHelp=This field contains the unalterable and structured data that was archived on real time. Even if some parent business event could have been purged or modified, the data archived here is the original data, and it can't be modified.
DataOfArchivedEventHelp2=Its integrity is guaranteed if the status of the line is OK

View file

@ -0,0 +1,5 @@
# Dolibarr language file - Source file is en_US - categories
AddCustomerIntoCategory=Assign category to customer
AddSupplierIntoCategory=Assign category to supplier
AddFichinterIntoCategory=Assign category to interventional
AssignCategoryTo=Assign category to

View file

@ -0,0 +1,3 @@
# Dolibarr language file - Source file is en_US - datapolicy
datapolicySetupPage =Depending on the laws of your countries (Example <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Article 5</a> of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.<br>The deletion will be done automatically after a certain duration without events (the duration which you will have indicated below).
DATAPOLICY_Tooltip_SETUP=Define the delay with no interaction after which you want the record to be automatically purged.

View file

@ -0,0 +1,5 @@
# Dolibarr language file - Source file is en_US - blockedlog
KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists) or has modified checksum of the previous record.
DataOfArchivedEvent=Full data of archived event
DataOfArchivedEventHelp=This field contains the unalterable and structured data that was archived on real time. Even if some parent business event could have been purged or modified, the data archived here is the original data, and it can't be modified.
DataOfArchivedEventHelp2=Its integrity is guaranteed if the status of the line is OK

View file

@ -0,0 +1,5 @@
# Dolibarr language file - Source file is en_US - categories
AddCustomerIntoCategory=Assign category to customer
AddSupplierIntoCategory=Assign category to supplier
AddFichinterIntoCategory=Assign category to interventional
AssignCategoryTo=Assign category to

View file

@ -0,0 +1,3 @@
# Dolibarr language file - Source file is en_US - datapolicy
datapolicySetupPage =Depending on the laws of your countries (Example <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Article 5</a> of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.<br>The deletion will be done automatically after a certain duration without events (the duration which you will have indicated below).
DATAPOLICY_Tooltip_SETUP=Define the delay with no interaction after which you want the record to be automatically purged.

View file

@ -0,0 +1,5 @@
# Dolibarr language file - Source file is en_US - blockedlog
KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists) or has modified checksum of the previous record.
DataOfArchivedEvent=Full data of archived event
DataOfArchivedEventHelp=This field contains the unalterable and structured data that was archived on real time. Even if some parent business event could have been purged or modified, the data archived here is the original data, and it can't be modified.
DataOfArchivedEventHelp2=Its integrity is guaranteed if the status of the line is OK

View file

@ -0,0 +1,5 @@
# Dolibarr language file - Source file is en_US - categories
AddCustomerIntoCategory=Assign category to customer
AddSupplierIntoCategory=Assign category to supplier
AddFichinterIntoCategory=Assign category to interventional
AssignCategoryTo=Assign category to

View file

@ -0,0 +1,3 @@
# Dolibarr language file - Source file is en_US - datapolicy
datapolicySetupPage =Depending on the laws of your countries (Example <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Article 5</a> of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.<br>The deletion will be done automatically after a certain duration without events (the duration which you will have indicated below).
DATAPOLICY_Tooltip_SETUP=Define the delay with no interaction after which you want the record to be automatically purged.

View file

@ -0,0 +1,5 @@
# Dolibarr language file - Source file is en_US - blockedlog
KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists) or has modified checksum of the previous record.
DataOfArchivedEvent=Full data of archived event
DataOfArchivedEventHelp=This field contains the unalterable and structured data that was archived on real time. Even if some parent business event could have been purged or modified, the data archived here is the original data, and it can't be modified.
DataOfArchivedEventHelp2=Its integrity is guaranteed if the status of the line is OK

View file

@ -0,0 +1,5 @@
# Dolibarr language file - Source file is en_US - categories
AddCustomerIntoCategory=Assign category to customer
AddSupplierIntoCategory=Assign category to supplier
AddFichinterIntoCategory=Assign category to interventional
AssignCategoryTo=Assign category to

View file

@ -0,0 +1,3 @@
# Dolibarr language file - Source file is en_US - datapolicy
datapolicySetupPage =Depending on the laws of your countries (Example <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Article 5</a> of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.<br>The deletion will be done automatically after a certain duration without events (the duration which you will have indicated below).
DATAPOLICY_Tooltip_SETUP=Define the delay with no interaction after which you want the record to be automatically purged.

View file

@ -0,0 +1,5 @@
# Dolibarr language file - Source file is en_US - blockedlog
KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists) or has modified checksum of the previous record.
DataOfArchivedEvent=Full data of archived event
DataOfArchivedEventHelp=This field contains the unalterable and structured data that was archived on real time. Even if some parent business event could have been purged or modified, the data archived here is the original data, and it can't be modified.
DataOfArchivedEventHelp2=Its integrity is guaranteed if the status of the line is OK

View file

@ -0,0 +1,5 @@
# Dolibarr language file - Source file is en_US - categories
AddCustomerIntoCategory=Assign category to customer
AddSupplierIntoCategory=Assign category to supplier
AddFichinterIntoCategory=Assign category to interventional
AssignCategoryTo=Assign category to

View file

@ -0,0 +1,3 @@
# Dolibarr language file - Source file is en_US - datapolicy
datapolicySetupPage =Depending on the laws of your countries (Example <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Article 5</a> of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.<br>The deletion will be done automatically after a certain duration without events (the duration which you will have indicated below).
DATAPOLICY_Tooltip_SETUP=Define the delay with no interaction after which you want the record to be automatically purged.

View file

@ -0,0 +1,5 @@
# Dolibarr language file - Source file is en_US - blockedlog
KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists) or has modified checksum of the previous record.
DataOfArchivedEvent=Full data of archived event
DataOfArchivedEventHelp=This field contains the unalterable and structured data that was archived on real time. Even if some parent business event could have been purged or modified, the data archived here is the original data, and it can't be modified.
DataOfArchivedEventHelp2=Its integrity is guaranteed if the status of the line is OK

View file

@ -0,0 +1,5 @@
# Dolibarr language file - Source file is en_US - categories
AddCustomerIntoCategory=Assign category to customer
AddSupplierIntoCategory=Assign category to supplier
AddFichinterIntoCategory=Assign category to interventional
AssignCategoryTo=Assign category to

View file

@ -0,0 +1,3 @@
# Dolibarr language file - Source file is en_US - datapolicy
datapolicySetupPage =Depending on the laws of your countries (Example <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Article 5</a> of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.<br>The deletion will be done automatically after a certain duration without events (the duration which you will have indicated below).
DATAPOLICY_Tooltip_SETUP=Define the delay with no interaction after which you want the record to be automatically purged.

View file

@ -0,0 +1,2 @@
# Dolibarr language file - Source file is en_US - members
MembersByCountryDesc=This screen shows you the statistics of members by countries. Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.

View file

@ -257,6 +257,7 @@ logOutFromYourCustomerAccount=Log out from your customer account
filteredByVersion=Filtered by version
removeFilter=Remove filter
viewMyCart=View my shopping cart
Shipping=Shipping
freeShipping=Free shipping!
noProducts=No products
nbrItemsInCart=There are <span class="ajax_cart_quantity">0</span> items in your cart.
@ -359,3 +360,6 @@ LoginCheckout=Login & Proceed to checkout
paymentSuccessProcessed=Your payment has been successfully processed.
youWillBeRedirectedToOrderPage=You will be redirected to the order details page shortly.
WebPortalSetupNotComplete=Web portal setup is not complete
DeleteWebsiteaccount=Delete website account
ConfirmDeleteWebsiteAccount=Are you sure you want to delete this account.
ConfirmDeleteWebsiteAccount2=If this account was used to login on the public portal or any otherweb site powered by Dolibarr, the login may be no more possible.

View file

@ -0,0 +1,5 @@
# Dolibarr language file - Source file is en_US - blockedlog
KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists) or has modified checksum of the previous record.
DataOfArchivedEvent=Full data of archived event
DataOfArchivedEventHelp=This field contains the unalterable and structured data that was archived on real time. Even if some parent business event could have been purged or modified, the data archived here is the original data, and it can't be modified.
DataOfArchivedEventHelp2=Its integrity is guaranteed if the status of the line is OK

View file

@ -0,0 +1,5 @@
# Dolibarr language file - Source file is en_US - categories
AddCustomerIntoCategory=Assign category to customer
AddSupplierIntoCategory=Assign category to supplier
AddFichinterIntoCategory=Assign category to interventional
AssignCategoryTo=Assign category to

View file

@ -0,0 +1,3 @@
# Dolibarr language file - Source file is en_US - datapolicy
datapolicySetupPage =Depending on the laws of your countries (Example <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Article 5</a> of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.<br>The deletion will be done automatically after a certain duration without events (the duration which you will have indicated below).
DATAPOLICY_Tooltip_SETUP=Define the delay with no interaction after which you want the record to be automatically purged.

View file

@ -0,0 +1,3 @@
# Dolibarr language file - Source file is en_US - blockedlog
KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists) or has modified checksum of the previous record.
DataOfArchivedEvent=Full data of archived event

View file

@ -0,0 +1,4 @@
# Dolibarr language file - Source file is en_US - categories
AddCustomerIntoCategory=Assign category to customer
AddSupplierIntoCategory=Assign category to supplier
AssignCategoryTo=Assign category to

Some files were not shown because too many files have changed in this diff Show more