diff --git a/dev/build/docker-dev/mariadb.yml b/dev/build/docker-dev/mariadb.yml index c9b2e78ac18..a358cfe98f6 100644 --- a/dev/build/docker-dev/mariadb.yml +++ b/dev/build/docker-dev/mariadb.yml @@ -30,5 +30,3 @@ services: networks: - internal-pod - external-pod - - diff --git a/dev/build/perl/virtualmin/dolibarr.pl b/dev/build/perl/virtualmin/dolibarr.pl index d17a3614778..19bb054780b 100644 --- a/dev/build/perl/virtualmin/dolibarr.pl +++ b/dev/build/perl/virtualmin/dolibarr.pl @@ -250,7 +250,7 @@ if ($upgrade) { ©_source_dest_as_domain_user($d, $oldcfile, $cfile); ©_source_dest_as_domain_user($d, $olddocdir, $docdir); ©_source_dest_as_domain_user($d, $oldaltdir, $altdir); - + # First page (Update database schema) local @params = ( [ "action", "upgrade" ], [ "versionfrom", $upgrade->{'version'} ], @@ -258,7 +258,7 @@ if ($upgrade) { ); local $err = &call_dolibarr_wizard_page(\@params, "upgrade", $d, $opts); return (-1, "Dolibarr wizard failed : $err") if ($err); - + # Second page (Migrate some data) local @params = ( [ "action", "upgrade" ], [ "versionfrom", $upgrade->{'version'} ], @@ -266,7 +266,7 @@ if ($upgrade) { ); local $err = &call_dolibarr_wizard_page(\@params, "upgrade2", $d, $opts); return (-1, "Dolibarr wizard failed : $err") if ($err); - + # Third page (Update version number) local @params = ( [ "action", "upgrade" ], [ "versionfrom", $upgrade->{'version'} ], @@ -276,12 +276,12 @@ if ($upgrade) { local $p = $ver >= 3.8 ? "step5" : "etape5"; local $err = &call_dolibarr_wizard_page(\@params, $p, $d, $opts); return (-1, "Dolibarr wizard failed : $err") if ($err); - + # Remove the installation directory. (deprecated) # local $dinstall = "$opts->{'dir'}/install"; # $dinstall =~ s/\/$//; # $out = &run_as_domain_user($d, "rm -rf ".quotemeta($dinstall)); - + } else { # First page (Db connection and config file creation) @@ -306,13 +306,13 @@ else { local $p = $ver >= 3.8 ? "step1" : "etape1"; local $err = &call_dolibarr_wizard_page(\@params, $p, $d, $opts); return (-1, "Dolibarr wizard failed : $err") if ($err); - + # Second page (Populate database) local @params = ( [ "action", "set" ] ); local $p = $ver >= 3.8 ? "step2" : "etape2"; local $err = &call_dolibarr_wizard_page(\@params, $p, $d, $opts); return (-1, "Dolibarr wizard failed : $err") if ($err); - + # Third page (Add administrator account) local @params = ( [ "action", "set" ], [ "login", "admin" ], @@ -323,17 +323,17 @@ else { local $p = $ver >= 3.8 ? "step5" : "etape5"; local $err = &call_dolibarr_wizard_page(\@params, $p, $d, $opts); return (-1, "Dolibarr wizard failed : $err") if ($err); - + # Remove the installation directory (deprecated) # local $dinstall = "$opts->{'dir'}/install"; # $dinstall =~ s/\/$//; # $out = &run_as_domain_user($d, "rm -rf ".quotemeta($dinstall)); - + # Protect config file &set_permissions_as_domain_user($d, 0644, $cfile); &set_permissions_as_domain_user($d, 0755, $cfiledir); } - + # Return a URL for the user local $rp = $opts->{'dir'}; $rp =~ s/^$d->{'home'}\///; @@ -443,7 +443,7 @@ return 2; sub script_dolibarr_db_conn_desc { -my $db_conn_desc = +my $db_conn_desc = { 'conf/conf.php' => { 'dbpass' => diff --git a/dev/examples/ldap/README b/dev/examples/ldap/README index 11ab3031335..b27276f347a 100644 --- a/dev/examples/ldap/README +++ b/dev/examples/ldap/README @@ -1,4 +1,4 @@ README (english) -------------------------------- This directory contains some sample files to test ldap command on command line. -They are used to help developmement and debugging of Dolibarr LDAP features. \ No newline at end of file +They are used to help developmement and debugging of Dolibarr LDAP features. diff --git a/dev/examples/ldap/ldapadd_sample2.txt b/dev/examples/ldap/ldapadd_sample2.txt index 8b4f2469899..d206ad37edf 100644 --- a/dev/examples/ldap/ldapadd_sample2.txt +++ b/dev/examples/ldap/ldapadd_sample2.txt @@ -8,4 +8,4 @@ dn: ou=contacts,dc=my-domain,dc=com objectClass: organizationalUnit -ou: contacts \ No newline at end of file +ou: contacts diff --git a/dev/examples/ldap/ldapsearch_sample1.txt b/dev/examples/ldap/ldapsearch_sample1.txt index 2a30f19ab22..101c8f3ff80 100644 --- a/dev/examples/ldap/ldapsearch_sample1.txt +++ b/dev/examples/ldap/ldapsearch_sample1.txt @@ -24,6 +24,5 @@ # ldapsearch -h hostname -p 389 -x -D "cn=manager,o=somecompany.com" -w password -b "ou=people,dc=teclib,dc=infra" # ldapsearch -h hostname -p 389 -x -D "cn=manager,o=somecompany.com" -w password -b "o=somecompany.com" "(objectclass=*)" # -# Example to test a ldap search: +# Example to test a ldap search: # ldapsearch -h hostname -p 389 -x -z 5 -b 'OU=Collaborateurs,OU=Utilisateurs,OU=MyCompany,DC=bocal,DC=lan' -D 'CN=UserAdmin,OU=Informatique,OU=Utilisateurs,OU=MyCompany,DC=bocal,DC=lan' -w password - diff --git a/dev/examples/mail/dolibarr_mail_attachementwithimageHTML.txt b/dev/examples/mail/dolibarr_mail_attachementwithimageHTML.txt index 98515ff604d..55ad0257187 100644 --- a/dev/examples/mail/dolibarr_mail_attachementwithimageHTML.txt +++ b/dev/examples/mail/dolibarr_mail_attachementwithimageHTML.txt @@ -65,4 +65,4 @@ o9CFUO94RUiiEpmahN6IfgQXpQJUft9yuDseAluyCkKif5QkQA3IvwVYD2mv0R1uc9gY fZt0uru+Tc93cnQQ82A5KVrVVvvahsyxtQFRMOgFLl8ct3wu6NVPyQPby9YUk2J4dpQr R5X+bCaMew5mDNsdjMV95GesdhT3n3y32Az+XZsuecMoxePVX5S+GRSu/9XVL9Z+w7Ki ---468358388441498ebb24096bfda88a45-- \ No newline at end of file +--468358388441498ebb24096bfda88a45-- diff --git a/dev/examples/mail/dolibarr_mail_universal.txt b/dev/examples/mail/dolibarr_mail_universal.txt index b6d5d2e53a7..93e65d88a82 100644 --- a/dev/examples/mail/dolibarr_mail_universal.txt +++ b/dev/examples/mail/dolibarr_mail_universal.txt @@ -46,4 +46,4 @@ Content-Transfer-Encoding: quoted-printable ... attach-file ... ---------------090104020208060008040809-- (end multipart/mixed) \ No newline at end of file +--------------090104020208060008040809-- (end multipart/mixed) diff --git a/dev/examples/mail/source_email_from_thirdparty.txt b/dev/examples/mail/source_email_from_thirdparty.txt index e17afa19414..48eed663041 100644 --- a/dev/examples/mail/source_email_from_thirdparty.txt +++ b/dev/examples/mail/source_email_from_thirdparty.txt @@ -45,4 +45,4 @@ VEImZGI9b2Rvb192OCc+UGFydG5lciBBZ3JvbGFpdDwvYT48L3NtYWxsPjwvc3Bhbj4K --===============8764907306434163361==-- ---===============4543832834454763172==-- \ No newline at end of file +--===============4543832834454763172==-- diff --git a/dev/examples/mail/source_email_ticket_1_to_create.txt b/dev/examples/mail/source_email_ticket_1_to_create.txt index 94d4cb620b9..bff7dfb1df1 100644 --- a/dev/examples/mail/source_email_ticket_1_to_create.txt +++ b/dev/examples/mail/source_email_ticket_1_to_create.txt @@ -71,7 +71,7 @@ Content-Type: text/plain; charset="UTF-8" adfsdfsdfds --- +-- Laurent. ------------------------------------------------------------------------------------ Twitter: https://www.twitter.com/eldy10 diff --git a/dev/examples/zapier/README.md b/dev/examples/zapier/README.md index e452cc2aa6b..4f8fec7b8d0 100644 --- a/dev/examples/zapier/README.md +++ b/dev/examples/zapier/README.md @@ -3,4 +3,3 @@ Take a look at the dolibarr wiki page of Zapier module: https://wiki.dolibarr.org/index.php?title=Module_Zapier - diff --git a/dev/examples/zapier/action.json b/dev/examples/zapier/action.json index e3aa4e69881..30cbb7fb61b 100644 --- a/dev/examples/zapier/action.json +++ b/dev/examples/zapier/action.json @@ -1,56 +1,25 @@ { - "table_rowid": "id", - "id": 6764, - "ref": null, - "type_id": "5", - "type_code": "AC_RDV", - "type": null, - "type_color": null, - "code": null, - "label": "azerty", - "datec": null, - "datem": null, - "authorid": null, - "usermodid": null, - "datep": 1555365600, - "datef": 1555538399, - "durationp": 172799, - "fulldayevent": 1, - "punctual": 1, - "percentage": "-1", - "location": "", - "transparency": 1, - "priority": 0, - "userassigned": { - "1": { - "id": "1", - "transparency": 1 - } - }, - "userownerid": "1", - "userdoneid": null, - "usertodo": null, - "userdone": null, - "socid": null, - "contactid": null, - "elementtype": "", - "icalname": null, - "icalcolor": null, - "actions": [], - "email_msgid": null, - "email_from": null, - "email_sender": null, - "email_to": null, - "email_tocc": null, - "email_tobcc": null, - "email_subject": null, - "errors_to": null, - "import_key": null, - "linkedObjectsIds": null, - "fk_project": 0, - "modelpdf": null, - "note_public": null, - "note_private": null, - "note": "wxcvbn", - "duree": 0 -} \ No newline at end of file + "table_rowid" : "id", + "id" : 6764, + "type_id" : "5", + "type_code" : "AC_RDV", + "label" : "azerty", + "datep" : 1555365600, + "datef" : 1555538399, + "durationp" : 172799, + "fulldayevent" : 1, + "punctual" : 1, + "percentage" : "-1", + "transparency" : 1, + "priority" : 0, + "userassigned" : { + "1" : { + "id" : "1", + "transparency" : 1 + } + }, + "userownerid" : "1", + "fk_project" : 0, + "note" : "wxcvbn", + "duree" : 0 +} diff --git a/dev/resources/dbmodel/README b/dev/resources/dbmodel/README index 74233624a6d..cca412f98b1 100644 --- a/dev/resources/dbmodel/README +++ b/dev/resources/dbmodel/README @@ -1,2 +1,2 @@ This directory contains the file with the graphical database structure. -It can be read with MySQL Workbench software. \ No newline at end of file +It can be read with MySQL Workbench software. diff --git a/dev/resources/iso-normes/EORI.txt b/dev/resources/iso-normes/EORI.txt index 13ff095c693..15d97aa47b9 100644 --- a/dev/resources/iso-normes/EORI.txt +++ b/dev/resources/iso-normes/EORI.txt @@ -2,5 +2,5 @@ EORI https://en.wikipedia.org/wiki/EORI_number -in Dolibarr avaiable since v13 +in Dolibarr avaiable since v13 - it is set to field 'profid5' diff --git a/dev/resources/iso-normes/accountancy/accountancy_rules.txt b/dev/resources/iso-normes/accountancy/accountancy_rules.txt index 918d0f01d3c..ddfec12505b 100644 --- a/dev/resources/iso-normes/accountancy/accountancy_rules.txt +++ b/dev/resources/iso-normes/accountancy/accountancy_rules.txt @@ -18,5 +18,3 @@ Et ça marche à l’inverse avec un fournisseur sauf que l’on est en 775000 a Un compte comptable de Tiers vente = Acount Receivable Un compte comptable de Tiers achat = Acount Payable - - \ No newline at end of file diff --git a/dev/resources/iso-normes/address_format.txt b/dev/resources/iso-normes/address_format.txt index 18069cd89fa..58eea0fa02c 100644 --- a/dev/resources/iso-normes/address_format.txt +++ b/dev/resources/iso-normes/address_format.txt @@ -3,4 +3,3 @@ Address format https://bitboost.com/ref/international-address-formats.html#Formats https://www.upu.int/en/Postal-Solutions/Programmes-Services/Addressing-Solutions - diff --git a/dev/resources/iso-normes/banking/iban_iso-13616_fr.txt b/dev/resources/iso-normes/banking/iban_iso-13616_fr.txt index 1487abed8c4..fe0c4d868ed 100644 --- a/dev/resources/iso-normes/banking/iban_iso-13616_fr.txt +++ b/dev/resources/iso-normes/banking/iban_iso-13616_fr.txt @@ -117,5 +117,3 @@ IBAN : FR54 3000 4031 2800 032T 56H9 125 Division : 3000403128000322956179125152754 / 97 = 3000403128000322956179125152753 reste 1. - - diff --git a/dev/resources/iso-normes/code_nace.txt b/dev/resources/iso-normes/code_nace.txt index a07e3a76b31..8c1ba06ead5 100644 --- a/dev/resources/iso-normes/code_nace.txt +++ b/dev/resources/iso-normes/code_nace.txt @@ -1,4 +1,4 @@ -NACE +NACE https://ec.europa.eu/eurostat/ramon/nomenclatures/index.cfm?TargetUrl=LST_CLS_DLD&StrNom=NACE_REV2&StrLanguageCode=EN&StrLayoutCode= diff --git a/dev/resources/iso-normes/countries_iso-3166_en.txt b/dev/resources/iso-normes/countries_iso-3166_en.txt index d6624026963..f8ed69375b0 100644 --- a/dev/resources/iso-normes/countries_iso-3166_en.txt +++ b/dev/resources/iso-normes/countries_iso-3166_en.txt @@ -3,7 +3,7 @@ # The list is updated whenever a change to the official code list in ISO 3166-1 is effected by the ISO 3166/MA. # It lists 240 official short names and code elements. One line of text contains one entry. # A country name and its code element are separated by a semicolon (;). -# https://www.iso.org/iso-3166-country-codes.html +# https://www.iso.org/iso-3166-country-codes.html # https://en.wikipedia.org/wiki/List_of_ISO_3166_country_codes # ISO-3166: https://en.wikipedia.org/wiki/ISO_3166-1 diff --git a/dev/resources/iso-normes/intracommreport/schema_deb.xsd b/dev/resources/iso-normes/intracommreport/schema_deb.xsd index 5379932fa29..7bef163b150 100644 --- a/dev/resources/iso-normes/intracommreport/schema_deb.xsd +++ b/dev/resources/iso-normes/intracommreport/schema_deb.xsd @@ -136,4 +136,4 @@ - \ No newline at end of file + diff --git a/dev/resources/iso-normes/languages_iso-639.txt b/dev/resources/iso-normes/languages_iso-639.txt index 7567a50487b..93d0884326c 100644 --- a/dev/resources/iso-normes/languages_iso-639.txt +++ b/dev/resources/iso-normes/languages_iso-639.txt @@ -52,12 +52,12 @@ GUARANI GN AMERINDIAN GUJARATI GU INDIAN HAUSA HA NEGRO-AFRICAN -HEBREW HE SEMITIC [*Changed 1989 from original ISO 639:1988, IW] +HEBREW HE SEMITIC [*Changed 1989 from original ISO 639:1988, IW] HINDI HI INDIAN HUNGARIAN HU FINNO-UGRIC ICELANDIC IS GERMANIC -INDONESIAN ID OCEANIC/INDONESIAN [*Changed 1989 from original ISO 639:1988, IN] +INDONESIAN ID OCEANIC/INDONESIAN [*Changed 1989 from original ISO 639:1988, IN] INTERLINGUA IA INTERNATIONAL AUX. INTERLINGUE IE INTERNATIONAL AUX. INUKTITUT IU [ ] @@ -159,7 +159,7 @@ WOLOF WO NEGRO-AFRICAN XHOSA XH NEGRO-AFRICAN -YIDDISH YI GERMANIC [*Changed 1989 from original ISO 639:1988, JI] +YIDDISH YI GERMANIC [*Changed 1989 from original ISO 639:1988, JI] YORUBA YO NEGRO-AFRICAN ZHUANG ZA [ ] @@ -211,7 +211,7 @@ GALICIAN GL ROMANCE GUARANI GN AMERINDIAN GUJARATI GU INDIAN HAUSA HA NEGRO-AFRICAN -HEBREW HE SEMITIC [*Changed 1989 from original ISO 639:1988, IW] +HEBREW HE SEMITIC [*Changed 1989 from original ISO 639:1988, IW] HINDI HI INDIAN CROATIAN HR SLAVIC HUNGARIAN HU FINNO-UGRIC @@ -219,7 +219,7 @@ ARMENIAN HY INDO-EUROPEAN (OTHER) INTERLINGUA IA INTERNATIONAL AUX. INTERLINGUE IE INTERNATIONAL AUX. INUPIAK IK ESKIMO -INDONESIAN ID OCEANIC/INDONESIAN [*Changed 1989 from original ISO 639:1988, IN] +INDONESIAN ID OCEANIC/INDONESIAN [*Changed 1989 from original ISO 639:1988, IN] ICELANDIC IS GERMANIC ITALIAN IT ROMANCE INUKTITUT IU [ ] @@ -304,7 +304,7 @@ VIETNAMESE VI ASIAN VOLAPUK VO INTERNATIONAL AUX. WOLOF WO NEGRO-AFRICAN XHOSA XH NEGRO-AFRICAN -YIDDISH YI GERMANIC [*Changed 1989 from original ISO 639:1988, JI] +YIDDISH YI GERMANIC [*Changed 1989 from original ISO 639:1988, JI] YORUBA YO NEGRO-AFRICAN ZHUANG ZA [ ] CHINESE ZH ASIAN @@ -362,7 +362,7 @@ GERMAN DE GERMANIC ICELANDIC IS GERMANIC NORWEGIAN NO GERMANIC SWEDISH SV GERMANIC -YIDDISH YI GERMANIC [*Changed 1989 from original ISO 639:1988, JI] +YIDDISH YI GERMANIC [*Changed 1989 from original ISO 639:1988, JI] AFAN (OROMO) OM HAMITIC AFAR AA HAMITIC @@ -420,7 +420,7 @@ YORUBA YO NEGRO-AFRICAN ZULU ZU NEGRO-AFRICAN FIJI FJ OCEANIC/INDONESIAN -INDONESIAN ID OCEANIC/INDONESIAN [*Changed 1989 from original ISO 639:1988, IN] +INDONESIAN ID OCEANIC/INDONESIAN [*Changed 1989 from original ISO 639:1988, IN] JAVANESE JV OCEANIC/INDONESIAN MALAGASY MG OCEANIC/INDONESIAN MALAY MS OCEANIC/INDONESIAN @@ -444,7 +444,7 @@ SPANISH ES ROMANCE AMHARIC AM SEMITIC ARABIC AR SEMITIC -HEBREW HE SEMITIC [*Changed 1989 from original ISO 639:1988, IW] +HEBREW HE SEMITIC [*Changed 1989 from original ISO 639:1988, IW] MALTESE MT SEMITIC TIGRINYA TI SEMITIC diff --git a/dev/resources/iso-normes/tax/vat_number_names.txt b/dev/resources/iso-normes/tax/vat_number_names.txt index 77adda72e0d..f7a4779c314 100644 --- a/dev/resources/iso-normes/tax/vat_number_names.txt +++ b/dev/resources/iso-normes/tax/vat_number_names.txt @@ -5,4 +5,4 @@ terms (fr) TVA = Taxe sur la Valeur Ajouté (es) NIF / CIF (de) USt / MwSt = UmsatzSteuer / Mehrwertsteuer -(it) IVA +(it) IVA diff --git a/dev/resources/iso-normes/tax/world_tax_rates.txt b/dev/resources/iso-normes/tax/world_tax_rates.txt index 0b3bc3f41e5..1b0c6b74151 100644 --- a/dev/resources/iso-normes/tax/world_tax_rates.txt +++ b/dev/resources/iso-normes/tax/world_tax_rates.txt @@ -5,6 +5,6 @@ https://www.taxrates.cc/index.html https://en.wikipedia.org/wiki/List_of_countries_by_tax_rates For India: VAT=IGST / CGST=Localtax1 / SGST=Localtax2 -see: +see: https://cleartax.in/s/what-is-sgst-cgst-igst https://www.mastersindia.co/blog/what-is-cgst-sgst-igst-and-ugst/ diff --git a/dev/setup/apache/README b/dev/setup/apache/README index 1f521283df8..296ae778265 100644 --- a/dev/setup/apache/README +++ b/dev/setup/apache/README @@ -3,4 +3,4 @@ README (English) If your web hosting does not allow you to place the folder "documents" outside the site root, add the htaccess.txt in the root directory of -folder "documents" by renaming it into .htaccess \ No newline at end of file +folder "documents" by renaming it into .htaccess diff --git a/dev/setup/codesniffer/php.ini b/dev/setup/codesniffer/php.ini index 6a5fa9b6292..a77d9af540d 100644 --- a/dev/setup/codesniffer/php.ini +++ b/dev/setup/codesniffer/php.ini @@ -1,7 +1,7 @@ [PHP] ; ************************ -: Need a special php.ini to allow usage of +: Need a special php.ini to allow usage of ; ************************ ;;;;;;;;;;;;;;;;;;; diff --git a/dev/setup/codetemplates/codetemplates.xml b/dev/setup/codetemplates/codetemplates.xml index c7f3dad6965..b57db779eb2 100644 --- a/dev/setup/codetemplates/codetemplates.xml +++ b/dev/setup/codetemplates/codetemplates.xml @@ -7,7 +7,7 @@ */