Commit Graph

1577 Commits

Author SHA1 Message Date
Laurent Destailleur
21b7d68f49 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
Conflicts:
	htdocs/comm/action/list.php
	htdocs/compta/facture/list.php
	htdocs/modulebuilder/template/myobject_list.php
	htdocs/product/stock/movement_list.php
	htdocs/product/stock/productlot_list.php
2023-12-17 21:49:08 +01:00
Marc de Lima Lucio
786ea1029e FIX: more correctly parse the select part to be replaced in sql queries, part 2 2023-11-18 12:40:10 +01:00
Marc de Lima Lucio
a3fa8b82fa FIX: more correctly parse the select part to be replaced in sql queries 2023-11-09 17:04:13 +01:00
Laurent Destailleur
2a299068ad Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-01-18 20:45:44 +01:00
Laurent Destailleur
aa273d2155
Update index.php 2023-01-18 20:11:12 +01:00
Florian HENRY
6d8f80d46e fix: module builder, backport workgin solution form 15.0 2023-01-18 16:10:21 +01:00
Laurent Destailleur
17efd55af4
Merge branch '16.0' into FIX#23087 2022-12-22 13:46:36 +01:00
IC-Florian
471260738a
FIX : Product list in setup.php in new Module 2022-12-21 12:03:32 +01:00
Florian
2f64eaff05 FIX : CI 2022-12-20 12:25:20 +01:00
Florian
ec32d284eb FIX : Product list in setup.php in new Module 2022-12-20 11:31:44 +01:00
javieralapps4up
00d162c235 Update myobject_list.php
Better code now
2022-09-25 18:59:57 +02:00
Laurent Destailleur
1888d561d6 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-09-02 11:06:34 +02:00
Laurent Destailleur
2c46410675 FIX list of email in public ticket interface 2022-09-01 11:47:46 +02:00
Laurent Destailleur
059d0073ff FIX Maxi debug v16 2022-08-12 15:54:50 +02:00
Laurent Destailleur
ab2afd772b
Merge pull request #21600 from ymollard/eventorg-fixes
FIX: EventOrganization Missing databases entries and labels
2022-07-29 15:40:21 +02:00
Yoan Mollard
ae70dc11c6 Fixed labels 2022-07-25 22:28:07 +02:00
Laurent Destailleur
f024dcdb1a Doc 2022-07-24 22:13:36 +02:00
Laurent Destailleur
e465c0f34b Debug v16 2022-07-24 19:05:55 +02:00
Laurent Destailleur
58923ec3d7 Merge 2022-07-24 11:21:02 +02:00
Laurent Destailleur
3761c920eb Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
Conflicts:
	htdocs/core/modules/modPartnership.class.php
	htdocs/modulebuilder/template/core/modules/modMyModule.class.php
2022-07-22 17:43:35 +02:00
Laurent Destailleur
d9f7a3efd1 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/product/inventory/inventory.php
2022-07-22 17:38:24 +02:00
Laurent Destailleur
50af2747a2 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-07-22 17:35:03 +02:00
Noé Courtier
276168ef6f Fix: tabhelp must be present in every module 2022-07-19 17:14:57 +02:00
Laurent Destailleur
6d7a45ddf4 Fix reposition 2022-07-15 15:53:05 +02:00
Laurent Destailleur
a864771974 Debug 2022-07-15 15:51:55 +02:00
Laurent Destailleur
4140cc084a Debug 2022-07-15 15:51:46 +02:00
Laurent Destailleur
af90eb0d02 Debug 2022-07-15 15:51:31 +02:00
Francis Appels
490944baac Fix php 8 warning 2022-07-11 17:29:26 +02:00
Laurent Destailleur
24dc936000 Revert "default to create on card.php if $action is empty"
This reverts commit e0b664066b.
2022-07-11 00:05:50 +02:00
Christian Foellmann
e0b664066b default to create on card.php if $action is empty 2022-07-11 00:01:42 +02:00
Laurent Destailleur
9036ab94ab Fix contextpage 2022-07-07 17:14:21 +02:00
Laurent Destailleur
ad9c91fc25 Debug v16 2022-06-30 14:40:03 +02:00
Laurent Destailleur
8594bd9528 Debug v16 2022-06-30 13:46:07 +02:00
Laurent Destailleur
8f7ec29ccc Clean code 2022-06-30 04:36:25 +02:00
Laurent Destailleur
4c4e081997 Debug v16 2022-06-28 13:09:53 +02:00
Laurent Destailleur
8ee30e067f Rename var 2022-06-20 02:23:37 +02:00
Laurent Destailleur
eeff8fdc0d Debug v16 2022-06-20 02:10:27 +02:00
Laurent Destailleur
e97f021380 Fix #yogosha11295 2022-06-19 19:02:16 +02:00
Laurent Destailleur
08a942dca8 # WARNING: head commit changed in the meantime
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2022-06-17 14:52:51 +02:00
Laurent Destailleur
a4fe40027a Fix missing var 2022-06-16 08:53:31 +02:00
Francis Appels
8da6d4b637 Fix modulebuilder for object sharing. 2022-06-15 14:53:44 +02:00
Laurent Destailleur
dd392143e1 Fix conf->projet conf->project 2022-06-14 17:53:17 +02:00
Laurent Destailleur
bc11cf62f8 FIX #hunterdev2acfc8fe-247c-4f88-aeaa-042b6b8690a0 2022-06-13 10:44:20 +02:00
Faustin
ef959ecddd FIX#21093 2022-06-11 00:18:38 +02:00
Frédéric FRANCE
38b18a68d7
Merge branch 'develop' into useismodenabled 2022-06-10 10:07:41 +02:00
Laurent Destailleur
4040f65a33 Debug v16 2022-06-10 09:17:48 +02:00
Frédéric France
e060e31e5b use isModEnabled function 2022-06-09 22:54:22 +02:00
Frédéric France
400afc937f use isModEnabled function 2022-06-09 22:16:48 +02:00
Laurent Destailleur
1838baaa5c Debug v16 2022-06-08 21:20:12 +02:00
Laurent Destailleur
cd041c9ea1 Clean code 2022-06-03 02:41:00 +02:00