2
0
forked from Wavyzz/dolibarr
Commit Graph

1956 Commits

Author SHA1 Message Date
Laurent Destailleur
e0d8bf04b5 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-02-09 19:07:24 +01:00
Laurent Destailleur
c261b84667 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-02-09 19:06:52 +01:00
MDW
7b54824d49 Fix #28071 - New branch to fix bad merge (#28083)
* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

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

* Qual: Introduce getDataToShowPhoto to prepare generic code

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

* Fix missing trans

* Fix langs

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

* Remove useless files in web templates

* Clean code

* Fix duplicate translation key

* Fix duplicate translation key

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

* Fix duplicate key

* Fix $object

* Debug v19

* WIP SMSing

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

* WIP EMAILINGS_SUPPORT_ALSO_SMS

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

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

* WIP SMSing

* Debug the "validate" feature

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

* Clean code

* Move rights->x->y into hasRight('x', 'y')

* Move rights->x->y into hasRight('x', 'y')

* Move rights->x->y into hasRight('x', 'y')

* Move rights->x->y into hasRight('x', 'y')

* Move rights->x->y into hasRight('x', 'y')

* Move rights->x->y into hasRight('x', 'y')

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

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

* Enhance rector to fix empty($user->rights->modulex->perm1)

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

* Fix template to use v19 dev rules

* Fix use v19 dev rules

* Fix phpunit

* Debug v19

* Clean code

* Use rector to convert user->rights into user->hasRight

* Clean code

* Use rector to convert user->rights into user->hasRight

* Use rector to convert user->rights into user->hasRight

* Clean code

* Fix phpcs

* add editorconfig for sql files (#27999)

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>

* add model_pdf field in llx_ticket-ticket.sql (#27996)

* add model_pdf field in llx_ticket-ticket.sql

* Update 19.0.0-20.0.0.sql

* Update 19.0.0-20.0.0.sql

* Improve wording in README (#27994)

* fix phpstan (#27989)

* fix phpstan

* Update UserRightsToFunction.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>

* Qual: Fix spelling/working in datapolicy translations (#28006)

# Qual: Fix spelling/wording in datapolicy translations

Fixed some spelling and wording in datapolicy translations.

* qual: phpstan for htdocs/ticket/class/ticketstats.class.php (#27986)

htdocs/ticket/class/ticketstats.class.php	98	Parameter #1 $year (string) of method TicketStats::getNbByMonth() should be compatible with parameter $year (int) of method Stats::getNbByMonth()

* Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop

* Fix user with readonly perm on email template must be able to read.

* Fix doc

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

* Better message

* Add missing fields in merge of thirdparty

* Debug v19 selection of ticket printer per terminal

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

* Use constant

* NEW: Adding a recipient on emails sent, change status to sent partialy.

* fix travis (#28052)

* fix travis

* Update partnership.class.php

* fix php doc (#28047)

* fix undefined array key (#28048)

* Add region and departament for Cuba (#28046)

* Update llx_10_c_regions.sql

Add Cuba Regions (id_country=77)

* Update llx_20_c_departements.sql

Add Provinces Cuba (id country=77)

* Find the typo (#28050)

* Find the typo

* clean code

* add last_main_doc field to product (#28045)

* add las_main_doc field to product

* add field fetch

* NEW Add Categorie filter for ActionComm (#28041)

* New Add Categorie filter for ActionComm

New Add Categorie filter for ActionComm

* Fix space errors

Fix space errors

* Fix space errors 2

Fix space errors 2

* Update cunits.class.php (#28056)

FIX: error SQL when creating a Cunit

* Update codespell-lines-ignore.txt to avoid PR merge conflict

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
Co-authored-by: Frédéric FRANCE <frederic34@users.noreply.github.com>
Co-authored-by: thibdrev <thibault.drevet@gmail.com>
Co-authored-by: sonikf <93765174+sonikf@users.noreply.github.com>
Co-authored-by: Ikarus <44511582+LeKarSol@users.noreply.github.com>
Co-authored-by: Anthony Damhet <73399671+EchoLoGeek@users.noreply.github.com>
Co-authored-by: Quentin-Seekness <72733832+Quentin-Seekness@users.noreply.github.com>
2024-02-09 15:58:49 +01:00
HENRY Florian
897475f186 fix: fix restrictedAera on agenda tab for intervention (#28038) 2024-02-07 18:49:16 +01:00
Laurent Destailleur
1d6cbe1fda Fix GETPOST use should be avoid in classes 2024-02-02 23:46:12 +01:00
Laurent Destailleur
c9823f2b8d Move 401 to 403 2024-02-01 19:34:13 +01:00
William Mead
5a5e8926c4 Refactored code 2024-01-30 16:06:31 +01:00
William Mead
9171051268 Added contributor details 2024-01-30 15:14:15 +01:00
William Mead
a28af6f5ca Added date filter 2024-01-30 15:13:12 +01:00
Laurent Destailleur
9e7980296f Merge branch 'develop' into qual-fichinterrec-phpstan-lvl3 2024-01-23 19:02:19 +01:00
Laurent Destailleur
1740640e45 Merge pull request #27731 from W1W1-M/qual-fichinter-phpstan-lvl3
Qual phpstan fichinter class
2024-01-23 17:34:53 +01:00
Laurent Destailleur
b52e8fbf2c Merge pull request #27725 from W1W1-M/fix-fichinter-card-rec-phpstan-lvl3
Qual phpstan fichinter card rec
2024-01-23 17:32:39 +01:00
William Mead
1a10c2bd17 Renamed addline method to fix PHP overloading limit. Updated PHPDoc. Cleaned code. Added contributor details. 2024-01-23 17:08:07 +01:00
William Mead
559e932f9c Fixed types. Updated contributor details. 2024-01-22 17:50:52 +01:00
William Mead
108454c4f3 Fixed originid type. Updated contributor details. 2024-01-22 17:27:50 +01:00
William Mead
2751fedfde Added contributor details 2024-01-22 15:10:01 +01:00
William Mead
e3985368db Fixed types 2024-01-22 15:09:19 +01:00
Frédéric France
03e29c6960 fix param 2024-01-20 09:22:38 +01:00
Frédéric France
b3bcdeafe5 rename method 2024-01-18 18:55:53 +01:00
Frédéric FRANCE
18861291a0 fix phpstan 2024-01-14 22:05:43 +01:00
MDW
bd002480ce Qual: Spelling htdocs/[d-k]* (#27427)
Highlights:

- htdocs/install/doctemplates/websites/website_template-restaurant/containers/page249.tpl.php

  Potential functional change (fix) because toekn was changed to token:
   `<input type=hidden name=toekn`

- htdocs/install/upgrade2.php
  $filles changed to $children

- htdocs/intracommreport/class/intracommreport.class.php
  Local $enveloppe changed to $envelope.

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-01-13 19:48:41 +01:00
Laurent Destailleur
2a4578ef68 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-01-11 13:48:15 +01:00
Laurent Destailleur
34f5c1e293 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-01-11 13:47:14 +01:00
Laurent Destailleur
a3a62570a9 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2024-01-11 13:45:26 +01:00
Laurent Destailleur
64fb9d0db7 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2024-01-11 13:45:16 +01:00
Laurent Destailleur
d7651e971c Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-01-10 17:44:31 +01:00
Frédéric FRANCE
d55fb7837c fix #27313 (#27323)
* fix #27313

* Update fichinter.class.php
2024-01-10 17:03:09 +01:00
Frédéric FRANCE
893538d851 fix #27313 (#27325)
* fix #27313

* Update fichinter.class.php
2024-01-10 16:57:30 +01:00
Laurent Destailleur
b418bc9e1e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2024-01-10 15:14:11 +01:00
Frédéric FRANCE
7cf895b411 Update card.php 2024-01-09 20:52:43 +01:00
William Mead
1964a3e595 Added notification information on intervention done confirmation message 2024-01-09 15:09:07 +01:00
William Mead
8f7a4800ee Added notification information on intervention validated confirmation message 2024-01-09 14:49:20 +01:00
Laurent Destailleur
910a541c60 Clean code 2024-01-09 13:08:22 +01:00
Laurent Destailleur
e2f49c407f Clean sql request to use exist instead of left join 2024-01-09 10:44:50 +01:00
Laurent Destailleur
4501872f17 Clean code with rector 2 2024-01-05 04:33:58 +01:00
Laurent Destailleur
ccaae7ab24 Clean code 2024-01-05 03:41:22 +01:00
Fabian Heinz
b78632a20e api fixes
According to [RFC2616](https://www.rfc-editor.org/rfc/rfc2616#section-10.2), APIs should return 2xx status codes if the request was correct.
The response should be status 200 with an empty result array.
2023-12-31 14:11:05 +01:00
routmoute
1d38a3b7b8 fix conflict with develop branch 2023-12-29 20:19:17 +01:00
routmoute
48f4e52a22 fix: Display of the list of merged pdf 2023-12-29 02:30:32 +01:00
Laurent Destailleur
b28ae5d8d3 Clean code 2023-12-27 12:12:20 +01:00
Laurent Destailleur
63c38da901 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-12-21 19:44:25 +01:00
Laurent Destailleur
7f5df80efd Debug v19 2023-12-19 11:51:48 +01:00
Regis Houssin
70e01178a9 FIX uniformization to use "intervention" 2023-12-18 09:27:52 +01:00
Frédéric FRANCE
93de531f37 fix default value 2023-12-16 11:09:26 +01:00
Laurent Destailleur
d92c65ad91 FIX infinite loop in API call/trigger by adding a caller 2023-12-15 12:15:33 +01:00
Laurent Destailleur
fb083a6cfc Fix warning with rector 2023-12-13 16:33:17 +01:00
Laurent Destailleur
60af6843fd Clean code 2023-12-08 02:05:51 +01:00
Laurent Destailleur
89e1e1b859 Merge pull request #26980 from atm-jonathan/FIX_in_array()_list.php
FIX in_array() on key
2023-12-08 01:59:32 +01:00
Frédéric FRANCE
61b79fda17 avoid phpstan error with phpdoc 2023-12-06 15:46:39 +01:00
Laurent Destailleur
e0d2ba1afd Merge pull request #26990 from defrance/patch-290
php v8 warning
2023-12-06 14:57:29 +01:00