Commit Graph

4287 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
Lucas Marcouiller
14090f3515 New make replyto as origin_email email collector ticket part (#28040)
* New make replyto as origin_email email collector ticket part

* fix by adding a field

---------

Co-authored-by: Hystepik <lmarcouiller@nltechno.com>
2024-02-08 13:58:40 +01:00
Laurent Destailleur
66beccf6ae Fix sql error 2024-02-07 22:59:22 +01:00
Christophe Battarel
a2ae40e62a Merge branch 'develop' into rdb 2024-02-01 11:34:08 +01:00
Laurent Destailleur
dc961b46ca Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-01-31 03:51:47 +01:00
Alexandre SPANGARO
15004cb256 Fix SQL migration 2024-01-30 06:52:10 +01:00
Laurent Destailleur
0eb0608b6c Merge pull request #27832 from Easya-Solutions/new-migration-rename-const
NEW rename const on third-party card
2024-01-28 12:54:52 +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
2a7a47d3ad Debug v19 - missing migration line 2024-01-28 00:14:19 +01:00
VESSILLER
7a1e42a627 NEW rename const on third-party card 2024-01-26 13:38:30 +01:00
Laurent Destailleur
b081652c4b Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-01-25 12:51:55 +01:00
Christophe Battarel
c2345a48c3 use alter table rename instead of rename table 2024-01-25 10:29:18 +01:00
Christophe Battarel
3f8bbebb7d Merge branch 'develop' into rdb 2024-01-25 10:22:04 +01:00
Laurent Destailleur
7a4128b8b6 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-01-25 01:38:49 +01:00
Laurent Destailleur
d873cc43ed Fix missing migration 2024-01-25 01:38:28 +01:00
Laurent Destailleur
c6d13d98e9 Fix missing column in migration 2024-01-25 01:37:57 +01:00
Laurent Destailleur
8f4c1f344c Exemple of code to remove duplicate entry in extrafield table 2024-01-24 15:17:14 +01:00
Florian HENRY
c477a723e4 feat: knowledgemanagement change answer column to longtext 2024-01-19 09:00:53 +01:00
Christophe Battarel
c3c7c1f742 Merge branch 'develop' into rdb 2024-01-19 08:54:06 +01:00
Laurent Destailleur
859ab08d35 Update 18.0.0-19.0.0.sql 2024-01-18 14:16:28 +01:00
Laurent Destailleur
eb505f9b6e Merge branch 'develop' into addColumnInwebsiteTable 2024-01-18 14:15:58 +01:00
Mathieu "rid" Soula
c7557671e1 Fix add tms field into llx_bom_bomline 2024-01-18 00:45:12 +01:00
Mathieu "rid" Soula
e1dc6d5140 Fix add tms field into llx_bom_bomline 2024-01-17 16:07:56 +01:00
Christophe Battarel
3670ba75ba rename tables 2024-01-15 09:52:54 +01:00
Christophe Battarel
268024d424 change to receptiondet_batch into sql 2024-01-15 09:49:33 +01:00
Mohamed DAOUD
1e01321294 NEW: add position column in category table (#27425)
* add position column in category table

* Update 19.0.0-20.0.0.sql

* Update llx_categorie.sql

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-01-12 19:55:23 +01:00
Laurent Destailleur
aba9afe9f1 NEW Add method getPublicImageOfObject() for website module 2024-01-12 13:05:28 +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
HENRY Florian
f00c80f33e NEW: add column to store a label for the price (#27238)
* NEW: add column to store a label for the price

* review
2024-01-11 10:51:49 +01:00
Florian HENRY
a6adeade58 reveiw 2024-01-08 21:15:57 +01:00
Florian HENRY
16569a157a Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into dev_product_rel_thirdparty 2024-01-08 21:15:15 +01:00
Laurent Destailleur
4e0d5dd590 Fix date creation of categori is empty 2024-01-08 11:39:27 +01:00
Lamrani Abdel
133b2a43ce add in migration file 2024-01-06 19:24:46 +01:00
Lamrani Abdel
7187e199fd Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into addColumnInwebsiteTable 2024-01-06 19:24:01 +01:00
Roger Dueck
bd83990585 Use unique keys to link extrafields tables, fixes #22117 and #22467 2024-01-03 08:50:01 -07:00
Laurent Destailleur
f8375a5262 Add 19.0.0 to 20.0.0 2024-01-03 16:02:08 +01:00
Florian HENRY
bb4d33a454 NEW: add table to store product relation with thirdparty 2023-12-28 13:12:03 +01:00
Florian HENRY
1a499172f5 NEW: add table to store product relation with thirdparty 2023-12-28 13:10:50 +01:00
Florian HENRY
72beb3b7d6 NEW: add table to store product relation with thirdparty 2023-12-28 13:06:45 +01:00
lamrani abdelwadoud
20b1917bdb Merge branch 'develop' into addColumnInwebsiteTable 2023-12-18 18:40:05 +01:00
Laurent Destailleur
1a7f674bd5 Fix add tms field to help debug v19 and sepa payment pbs 2023-12-14 14:01:28 +01:00
Lamrani Abdel
98bf06c5fc New column in website table for stock name of template imported 2023-12-11 17:55:20 +01:00
Laurent Destailleur
fad47c8d9e Debug v19 2023-11-21 23:16:17 +01:00
Lucas Marcouiller
7ac162ed91 Fix bookcal data structure (#26791)
Co-authored-by: Hystepik <lucas.marcouiller@gmail.com>
2023-11-21 23:12:44 +01:00
evarisk-micka
5f67a182b8 NEW #26668 [SQL] add SPL in dict form_juridique (#26669) 2023-11-17 16:40:40 +01:00
Pascal Hubrecht
13f2ae60ef fix duplicate index in llx_expensereport (#26614) 2023-11-16 15:00:42 +01:00
Maxime Kohlhaas
6d749046a1 Fix SQL migration 18-19 (#26626) 2023-11-16 14:56:09 +01:00
Laurent Destailleur
599632c671 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2023-11-15 11:47:58 +01:00
Laurent Destailleur
0cc541bb4a Standardize fields 2023-11-15 11:47:15 +01:00