Commit Graph

372 Commits

Author SHA1 Message Date
routmoute
1d38a3b7b8 fix conflict with develop branch 2023-12-29 20:19:17 +01:00
routmoute
48f4e52a22 fix: Display of the list of merged pdf 2023-12-29 02:30:32 +01:00
Laurent Destailleur
64b9414271 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0
Conflicts:
	htdocs/modulebuilder/template/myobject_list.php
2023-12-17 22:08:40 +01:00
Laurent Destailleur
8cb9bdd852 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.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
	htdocs/ticket/list.php
2023-12-17 22:06:48 +01:00
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
2391a5da6f FIX Filter on partnership status
FIX Kanban view
2023-09-15 15:58:43 +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
e387e009bf fix: use of getDolGlobal in module builder template 2023-08-16 11:59:14 +02:00
Laurent Destailleur
054cb4a6d1 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-07-21 14:44:22 +02:00
Laurent Destailleur
dbe9cc45f9 Debug v18 2023-07-19 02:51:51 +02:00
Laurent Destailleur
e8ad953e12 Debug v18 2023-07-12 15:23:14 +02:00
Laurent Destailleur
37beb399d5 Debug v18 2023-07-12 15:02:34 +02:00
Laurent Destailleur
cb40e2ebd2 Fix warnings 2023-06-28 14:52:44 +02:00
Laurent Destailleur
ef64e1dcfc Debug v18 2023-06-28 11:50:28 +02:00
Laurent Destailleur
f90483cc09 FIX #25095 2023-06-16 03:50:24 +02:00
Florian HENRY
ce10c68d31 getDol rather than ->global 2023-06-08 22:38:11 +02:00
Lamrani Abdel
0f4feec3ff fix some problems 2023-06-05 16:15:52 +02:00
Laurent Destailleur
476f95c4f6 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/adherents/subscription/list.php
	htdocs/comm/action/index.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/core/modules/propale/doc/pdf_cyan.modules.php
	htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
	htdocs/cron/class/cronjob.class.php
	htdocs/eventorganization/class/conferenceorbooth.class.php
	htdocs/modulebuilder/template/myobject_list.php
	htdocs/public/ticket/list.php
	htdocs/supplier_proposal/list.php
	htdocs/ticket/class/ticket.class.php
2023-05-17 00:57:17 +02:00
Laurent Destailleur
342ff65837 Fix code template 2023-05-16 12:56:03 +02:00
Laurent Destailleur
5dd3f57a1e Debug v18 2023-05-11 13:11:21 +02:00
Laurent Destailleur
09120d3fa9 Debug v18 2023-05-09 16:08:43 +02:00
Laurent Destailleur
4028b5d568 Clean code 2023-04-29 13:13:12 +02:00
Laurent Destailleur
e74c50aa8a Clean code 2023-04-28 16:05:25 +02:00
Laurent Destailleur
06f8291e07 Dolibarrize v18 2023-04-24 18:09:18 +02:00
Laurent Destailleur
c510b7d4df Add hidden search parameter search_current_entity 2023-04-12 18:16:14 +02:00
Laurent Destailleur
931c9fa7ca Look and feel v18 2023-04-08 00:30:21 +02:00
Laurent Destailleur
6a470dbcf7 Kanban on inventory list. Look and feel v18 2023-04-01 12:05:29 +02:00
Jyhere
ecfa7f1676 FIX: remove obsolete preg_replace for removing commat at the beginning... needed to work 2023-03-16 14:58:44 +01:00
Laurent Destailleur
10be924888 Look and feel v18 2023-03-14 10:58:35 +01:00
Laurent Destailleur
8208884af4 Work on kanban views 2023-03-13 09:45:47 +01:00
Laurent Destailleur
8bde9ce270 Look and feel v18 2023-03-07 20:03:04 +01:00
Laurent Destailleur
c9d869f837 Debug kanban view 2023-03-07 13:41:01 +01:00
Laurent Destailleur
3c96c42f32 Look and feel v18 2023-03-05 19:14:57 +01:00
Laurent Destailleur
1833bfc9d3 Fix kanban view 2023-03-05 15:29:41 +01:00
Laurent Destailleur
b0b1e8d327 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-02-27 03:40:12 +01:00
Laurent Destailleur
bf544bef63 css 2023-02-26 13:13:58 +01:00
Laurent Destailleur
40d9d7481b Debug v18 2023-02-21 02:12:20 +01:00
Laurent Destailleur
75cddd8c09 Debug kanban 2023-02-21 00:54:00 +01:00
Laurent Destailleur
870ac42082 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-02-20 16:20:49 +01:00
Laurent Destailleur
767b1d60d9 Debug v17 2023-02-20 00:16:02 +01:00
Laurent Destailleur
eaa0e5eb3e CSS 2023-02-19 02:39:39 +01:00
Laurent Destailleur
438c7b93f2 Debug v18 2023-02-19 02:18:46 +01:00
Laurent Destailleur
fd3dffc892 Add kanban view for partnership object 2023-02-18 19:20:54 +01:00
Laurent Destailleur
a59716e69f Debug kanban on thirdparty 2023-02-18 15:45:07 +01:00
Laurent Destailleur
67bf4a3ec0 Debug v17 2023-01-31 20:45:32 +01:00
Laurent Destailleur
583891a8e5 Fix template for line total 2023-01-31 01:14:49 +01:00
Laurent Destailleur
a628852a32 Fix template for line total 2023-01-31 01:13:57 +01:00
Laurent Destailleur
dd70552374 Fix css 2023-01-30 15:54:19 +01:00