2
0
forked from Wavyzz/dolibarr
Commit Graph

333 Commits

Author SHA1 Message Date
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
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
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
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
Laurent Destailleur
bf80809a96 Debug v19 2024-01-27 01:34:53 +01:00
MDW
39769482b1 Qual: Fix typing hints for DoliDB (#27484)
# Qual: Fix typing hints for DoliDB

This should help the static tools for type and method checking.
2024-01-13 15:50:02 +01:00
MDW
591306d7b1 Qual: Spelling htdocs/[l-o]* & htdocs/pa* (#27435)
# Qual: Fix spelling htdocs/[l-o]* & htdocs/pa*

Mostly comments, some local variables changed and translations to avoid
automatic fixes.

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-01-12 18:06:50 +01:00
Laurent Destailleur
866b44e34e Debug v20 2024-01-11 14:37:32 +01:00
Laurent Destailleur
6b42b48d20 NEW Can generate the email selector file 2024-01-11 02:47:42 +01:00
Charlène Benke
d5c7d8dcdf Update mod_myobject_standard.php 2023-12-30 08:26:04 +01:00
Laurent Destailleur
b28ae5d8d3 Clean code 2023-12-27 12:12:20 +01:00
Frédéric FRANCE
61b79fda17 avoid phpstan error with phpdoc 2023-12-06 15:46:39 +01:00
Laurent Destailleur
1c9429643a Fix php-cs 2023-12-04 13:46:42 +01:00
Laurent Destailleur
240869f2f2 Fix warnings 2023-11-30 21:45:58 +01:00
Laurent Destailleur
e8dc651877 Fix php8.2 warnings 2023-11-27 11:56:32 +01:00
Laurent Destailleur
6cdb7c929a Debug v19 2023-11-10 15:10:41 +01:00
Laurent Destailleur
d285f03120 Debug v19 2023-10-29 14:54:27 +01:00
Laurent Destailleur
cad186aed5 css 2023-10-20 16:36:28 +02:00
Laurent Destailleur
c507adeef7 NEW Top menu support picto of modules that are font awesome picto. 2023-10-13 15:00:51 +02:00
Laurent Destailleur
bc89f535b1 Qual: Clean code 2023-09-13 11:36:44 +02:00
Frédéric FRANCE
98388e3bd4 phpstan 2023-09-12 12:28:53 +02:00
Laurent Destailleur
150de687bf Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-05 20:13:38 +02:00
Laurent Destailleur
f43ef55b26 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0
Conflicts:
	htdocs/modulebuilder/template/class/myobject.class.php
	htdocs/modulebuilder/template/core/boxes/mymodulewidget1.php
	htdocs/modulebuilder/template/core/modules/modMyModule.class.php
	htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php
	htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php
	htdocs/modulebuilder/template/myobject_agenda.php
	htdocs/modulebuilder/template/myobject_list.php
2023-09-05 19:38:45 +02:00
Florian HENRY
3db024e6b5 fix travis 2023-08-28 14:33:02 +02:00
Laurent Destailleur
5d4f53046a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2023-08-27 18:18:34 +02:00
Laurent Destailleur
8fa06ccfa7 Fix empty and getDolGlobal... 2023-08-27 17:11:28 +02:00
Florian HENRY
5deaaa08a2 fix review 2023-08-25 09:10:47 +02:00