Commit Graph

461 Commits

Author SHA1 Message Date
Laurent Destailleur
269a8a2fa1 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2024-08-01 13:36:59 +02:00
Laurent Destailleur
faac9602f8 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-08-01 13:31:51 +02:00
Francis Appels
dc58a90a48 Fix modulebuilder MAIN_ODT_AS_PDF (#30496) 2024-07-31 15:35:15 +02:00
Laurent Destailleur
871e01d955 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-07-31 14:32:55 +02:00
Laurent Destailleur
09eaf38bd1 Fix phpstan 2024-07-31 14:31:29 +02:00
Laurent Destailleur
d2bd6a03ec Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-07-31 13:21:02 +02:00
Laurent Destailleur
2f7a252244 Fix warnings 2024-07-31 13:09:10 +02:00
Laurent Destailleur
038ce032e0 Fix tooltip on numbering modules 2024-07-31 12:40:24 +02:00
Laurent Destailleur
a701f84543 Fix tooltip on numbering modules 2024-07-31 12:14:39 +02:00
Laurent Destailleur
c9b92bb32d Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-07-25 18:21:47 +02:00
Laurent Destailleur
6b076821e3 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2024-07-25 18:20:01 +02:00
Laurent Destailleur
f4611fcec9 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-07-25 18:06:37 +02:00
Thibault Fiacre
7c9e6b1fb9 FIX lang output for sales representative on PDF (#30469) 2024-07-25 17:56:13 +02:00
Laurent Destailleur
74cbae2579 Code comment 2024-07-25 14:28:18 +02:00
Frédéric FRANCE
2707475a12 fix phpstan (#30319)
* fix phpstan

* fix phpstan expects int, false given ...

* fix phpstan expects int, true given ...
2024-07-08 21:45:35 +02:00
Frédéric FRANCE
29f223fd3c fix checkFunctionArgumentTypes (#30249)
* fix checkFunctionArgumentTypes

* fix checkFunctionArgumentTypes

* fix checkFunctionArgumentTypes

* fix checkFunctionArgumentTypes

* fix checkFunctionArgumentTypes

* fix checkFunctionArgumentTypes

* fix checkFunctionArgumentTypes

* fix checkFunctionArgumentTypes

* fix checkFunctionArgumentTypes
2024-07-04 17:47:31 +02:00
Frédéric FRANCE
74806473ab fix cti (#29842)
* fix cti odt asset

* comment unused code in template

* phpdoc

* fix unreachable code

* fix unreachable code

* fix not falsy
2024-06-05 14:55:07 +02:00
Frédéric FRANCE
d7a88a40a2 fix cti in odt template (#29840)
* fix cti in odt template

* fix cti in odt recruitment
2024-06-04 19:29:25 +02:00
Kusco
8e8fdccec7 #29103 Fix error in export part of the builder module (#29835)
In the builder module, suggestions are offered by default.
Just remove the comments for this to work.

Except for this line:
//$this->export_sql_end[$r] =' LEFT JOIN '.MAIN_DB_PREFIX.'competence_line as tl ON tl.fk_competence = t.rowid';

A "point" is missing before the "equal":
//$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'competence_line as tl ON tl.fk_competence = t.rowid';

The problem is the overwriting of part of the query, if we want to couple other tables.
2024-06-04 14:49:25 +02:00
Laurent Destailleur
48c5d9b0bc Debug v20 2024-05-29 12:26:04 +02:00
sonikf
df6312d9db fix: path and add missing comma (#29651)
* fix: add missing comma

* fix path
2024-05-11 20:45:52 +02:00
Vaadasch
5865151eb3 NEW : Add option position['find'] to DolEditor (#29546)
* Add option position['find'] to DolEditor

* Add option position['find'] to DolEditor - fix spaces

* Add option position['find'] to DolEditor - fix spaces

* Add option position['find'] to DolEditor - fix semi-colon

* Add option position['find'] to DolEditor - exemples -> examples...

* Add option position['find'] to DolEditor - reviews

* Add option position['find'] to DolEditor - empty indent

---------

Co-authored-by: Vaadasch <me@local.here>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-05-01 18:04:18 +02:00
Laurent Destailleur
57bb4cd7e4 Debug v20 2024-04-18 02:21:42 +02:00
sonikf
a9bfe73e1a Add recurring invoice triggers in module builder template (#29208)
* Add recurring invoice triggers

* Update interface_99_modMyModule_MyModuleTriggers.class.php

* remove BILLREC_CREATE
2024-04-05 16:34:39 +02:00
Laurent Destailleur
f03eb260de Nicer combo of companies for external modules 2024-04-03 13:20:26 +02:00
MDW
baaa7c721e Fix PHPdoc typing ($cols, $phpmin) 2024-03-24 14:19:09 +01:00
Laurent Destailleur
3b17fceadb Update modMyModule.class.php 2024-03-23 19:38:35 +01:00
Florian HENRY
b4f04dbaee new: upgrade minimum version of dolibarr for module builder 2024-03-21 20:58:59 +01:00
Laurent Destailleur
e92d6230df Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/ticket/class/ticket.class.php
	htdocs/ticket/list.php
	htdocs/ticket/stats/index.php
2024-03-20 02:31:33 +01:00
Laurent Destailleur
607bc16351 Fix menu postion 2024-03-19 22:05:55 +01:00
Laurent Destailleur
f9346a8022 Fix restore declaration to avoid to many uncompatibility problems. 2024-03-18 15:15:35 +01:00
Laurent Destailleur
b72b38f5d1 Doc 2024-03-18 15:03:41 +01:00
Laurent Destailleur
72d758e054 Doc 2024-03-18 14:56:54 +01:00
Laurent Destailleur
de58435ef1 FIX: if we stop for security purpose, we must exit a non zero value. 2024-03-16 23:08:15 +01:00
MDW
5067a8bee9 Fix Dolibarr spellings 2024-03-16 18:11:10 +01:00
Laurent Destailleur
45a68ba612 Better error management 2024-03-13 20:17:26 +01:00
Frédéric FRANCE
bc2f527e41 add phpdoc (#28639)
* add phpdoc

* add phpdoc

* add phpdoc

* add phpdoc

* add phpdoc

* add phpdoc
2024-03-05 17:11:46 +01:00
Laurent Destailleur
637ffa837f Clean code 2024-02-22 13:28:18 +01:00
William Mead
640774d554 Qual clean dolibarrtriggers (#27968)
* Moved property init to constructor

* Added VERSIONS constant

* Updated code comments

* Refactor to use switch statement

* Added contributor details

* Refactored to use VERSIONS constant

* Added method return & parameter types

* Added getter methods

* Clean code

* Remove runTrigger return type

* Refactored & cleaned code. Added contributor details.

* Refactored modulebuilder trigger interface

* Cleaned code

* Fixed runTrigger types

* Added changelog warning

* Fixed return type

* Fixed return type

* Fixed PHP 7.0 compatibility

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-02-18 23:54:01 +01:00
Laurent Destailleur
c8777a94b0 Fix table for export profile in modulebuilder 2024-02-15 13:13:24 +01:00
Laurent Destailleur
7bb21e7ff6 Fix picto 2024-02-15 13:10:28 +01:00
Laurent Destailleur
e9a0905fba Use same return 2024-02-13 11:14:11 +01:00
Laurent Destailleur
0920d6e08f Enhance modulebuilder 2024-02-12 07:10:49 +01:00
Laurent Destailleur
d4296c2ffd Work on website templates from external modules 2024-02-09 17:54:57 +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
Laurent Destailleur
eb4f53665d Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	.github/workflows/pre-commit.yml
	ChangeLog
	dev/tools/codespell/codespell-lines-ignore.txt
	htdocs/comm/mailing/card.php
	htdocs/contact/card.php
	htdocs/langs/en_US/admin.lang
	htdocs/modulebuilder/template/core/modules/mailings/mailinglist_mymodule_myobject.modules.php
2024-02-07 18:30:10 +01:00
Laurent Destailleur
7c88705f14 Fix template to use v19 dev rules 2024-02-04 16:05:02 +01:00
Laurent Destailleur
d8a3508cbe Debug v19 2024-02-03 17:26:10 +01:00
Laurent Destailleur
62e25855e5 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-01-28 00:40:53 +01:00
Laurent Destailleur
c084c76405 Enhance email selector 2024-01-27 23:29:21 +01:00