2
0
forked from Wavyzz/dolibarr
Commit Graph

2930 Commits

Author SHA1 Message Date
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
thomas-Ngr
ac6b230a86 Fix : modules templates were not fetched for linkedobjectblock (#28084) 2024-02-09 14:10:37 +01:00
Laurent Destailleur
b224d959e2 Doc 2024-01-23 15:56:31 +01:00
Laurent Destailleur
28b3e656a9 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-01-23 10:44:10 +01:00
Laurent Destailleur
916c017aa6 Debug v19 2024-01-19 20:04:11 +01:00
Laurent Destailleur
6c91d3d8b7 Fix typo english 2024-01-18 15:15:05 +01:00
Laurent Destailleur
5d3c775b69 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2024-01-18 12:19:08 +01:00
Laurent Destailleur
31d8600811 Merge pull request #27568 from comaiteseb/19.0
FIX #27536 VAT of the buyer's country not applied while SERVICE_ARE_ECOMMERCE_200238EC option is activated
2024-01-18 11:05:14 +01:00
Laurent Destailleur
8ca7f0c989 Fix var_dump 2024-01-17 20:38:22 +01:00
Laurent Destailleur
fc67947834 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-01-17 20:23:46 +01:00
Laurent Destailleur
af3bb1d144 Merge 2024-01-17 20:23:38 +01:00
Sébastien NASSIET
ec23bc3c90 Syntax error crrected 2024-01-17 16:03:14 +01:00
Sébastien NASSIET
b70faf9132 oubli correction de la logique pour la TVA Intraco vers un particulier 2024-01-17 11:04:26 +01:00
Sébastien NASSIET
efdaa0c9ec phpcs correction 2024-01-16 13:49:15 +01:00
Sébastien NASSIET
f53aa7c505 phpcs correction 2024-01-16 13:45:38 +01:00
Sébastien NASSIET
da099c1c0e FIX #27536 2024-01-16 12:42:45 +01:00
Laurent Destailleur
1d00d90872 Merge pull request #25740 from atm-thibaultf/NEW_hide_external_user_in_combobox
NEW : hide external user in combobox
2024-01-15 21:59:30 +01:00
Laurent Destailleur
ee2ed963e8 FIX #22506 2024-01-15 21:32:17 +01:00
Laurent Destailleur
55067371ca Doc 2024-01-15 18:06:11 +01:00
Laurent Destailleur
936be12f44 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-01-15 17:21:26 +01:00
Laurent Destailleur
21efad237a Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-01-15 17:19:41 +01:00
Laurent Destailleur
e6c3c5993d Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2024-01-15 17:14:27 +01:00
Laurent Destailleur
0cc66bbed6 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2024-01-15 14:35:18 +01:00
William Mead
19f7fa0030 Fixed selected default value 2024-01-15 09:18:18 +01:00
Laurent Destailleur
2de0c09e8e Try a better fix for #27477 2024-01-13 15:44:37 +01:00
Laurent Destailleur
b534c40f13 Use id in index 2024-01-11 12:46:05 +01:00
Laurent Destailleur
1647e4f133 Debug the filter on VAT type 2024-01-11 12:38:01 +01:00
Laurent Destailleur
52dfdbc7ad Merge branch 'develop' into 18a3 2024-01-11 11:27:10 +01:00
MDW
b09f379bd6 Qual: spelling in html.form (#27407)
# Qual: Fix spelling in htdocs/core/class/html.form.class.php .

Most changes are in the text, and some translations made of comments.

 is changed to , and var was unused.
'clas=tagd is changed to class=tagd', slight possibility of visual impact.
 is changed to , but used locally in foreach loops.
2024-01-11 10:03:08 +01:00
Laurent Destailleur
910a541c60 Clean code 2024-01-09 13:08:22 +01:00
Laurent Destailleur
7cbc1c98fc Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-01-07 13:40:36 +01:00
Laurent Destailleur
bf17b8767c Debug v19 2024-01-07 11:15:48 +01:00
Laurent Destailleur
27fc5a2f84 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-01-06 16:56:28 +01:00
Laurent Destailleur
76ee9e506d Debug v19 2024-01-06 16:43:01 +01:00
Laurent Destailleur
4501872f17 Clean code with rector 2 2024-01-05 04:33:58 +01:00
Laurent Destailleur
0ea29a9252 Doxygen 2024-01-04 15:00:56 +01:00
Laurent Destailleur
1b660bddf0 Fix parameter type 2024-01-04 14:48:02 +01:00
Laurent Destailleur
1d751e9838 Merge pull request #27106 from altairisfr/noprint
add noprint parameter to select_conditions_paiements
2024-01-04 00:32:51 +01:00
Laurent Destailleur
f36d31f5f9 Merge pull request #27275 from frederic34/patch-3
undefined variable $user
2024-01-02 12:28:01 +01:00
Frédéric FRANCE
041de86b68 undefined variable $user 2024-01-02 12:21:44 +01:00
Christophe Battarel
d994a55b88 fix params 2024-01-02 11:13:57 +01:00
Laurent Destailleur
cbe860f88f Update html.form.class.php 2023-12-29 18:55:07 +01:00
Hystepik
5eef510a8e Fix html.form warnings 2023-12-29 16:18:20 +01:00
Laurent Destailleur
163a09d6fd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2023-12-28 12:37:34 +01:00
Laurent Destailleur
61c5c6f88d Fix regression 2023-12-27 13:09:25 +01:00
Laurent Destailleur
b28ae5d8d3 Clean code 2023-12-27 12:12:20 +01:00
Laurent Destailleur
4c7c456e8a css 2023-12-21 10:40:22 +01:00
Laurent Destailleur
0db281a919 FIX SEC we must not propagate SQL requests as parameters. 2023-12-20 21:35:04 +01:00
Laurent Destailleur
af610ea9f8 Fix warning 2023-12-19 18:47:42 +01:00
Laurent Destailleur
91e53f9434 FIX #yogosha19474 2023-12-16 17:05:32 +01:00