Commit Graph

8419 Commits

Author SHA1 Message Date
Laurent Destailleur
685995cf01 Debug v17 2023-05-12 13:06:36 +02:00
Laurent Destailleur
c6cb29381e Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-05-11 19:09:19 +02:00
Laurent Destailleur
5dd3f57a1e Debug v18 2023-05-11 13:11:21 +02:00
stickler-ci
d25b226796 Fixing style errors. 2023-05-11 09:50:17 +00:00
Noé Courtier
4ad585facc FIX: Add Missing rights check on holiday calendar 2023-05-11 11:41:58 +02:00
Laurent Destailleur
9674d234ba FIX On company change, we must reuse the company parameters 2023-05-10 22:05:43 +02:00
Laurent Destailleur
a3a9d1ac9f Fix SQL error 2023-05-10 18:56:17 +02:00
Laurent Destailleur
2d784f3008 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-05-10 05:01:15 +02:00
Florian HENRY
77e52007e4 fix: add field in sql the is use in line 1463 and remove undeclare varible 2023-05-05 19:09:28 +02:00
stickler-ci
13348ede59 Fixing style errors. 2023-05-05 16:22:49 +00:00
NextGestion
e8acd50626 Object line : Prevent adding Free line when the option "MAIN_DISABLE_FREE_LINES" is activated (Proposal, invoice, order, contract) 2023-05-05 17:15:49 +01:00
Laurent Destailleur
91f5971b01 Fix alignment 2023-05-01 18:46:22 +02:00
Laurent Destailleur
72f96cc16c Merge pull request #24437 from FliyFly/editpropalattributes
Edit attributes on propal card
2023-05-01 18:15:06 +02:00
Laurent Destailleur
cfff62c2fa Clean code 2023-04-29 15:46:44 +02:00
Laurent Destailleur
4028b5d568 Clean code 2023-04-29 13:13:12 +02:00
Laurent Destailleur
be835d63ed Merge pull request #24635 from VMR-Global-Solutions/develop
API add / fix filter on extrafields in index()
2023-04-28 20:02:09 +02:00
Laurent Destailleur
e74c50aa8a Clean code 2023-04-28 16:05:25 +02:00
VMR Global Solutions
926aa6fec7 API add / fix filter on extrafields in index()
Add / change in api_xxx.class.php files the ability to filter on extrafields when missing in the public functions index()
by changing the SQL query with the pattern 
" FROM ".MAIN_DB_PREFIX"xxxx AS t LEFT JOIN ".MAIN_DB_PREFIX."xxxx_extrafields AS ef ON (ef.fk_object = t.rowid)
2023-04-28 09:31:33 +02:00
Laurent Destailleur
f44c97d3c6 Code is using the Universal Filter Syntax 2023-04-27 22:12:23 +02:00
Laurent Destailleur
3065b9ca6a Clean code 2023-04-27 21:15:27 +02:00
Laurent Destailleur
2f3cefcc09 Clean code 2023-04-26 11:41:02 +02:00
Laurent Destailleur
586d9f5ba7 Look and feel v18 2023-04-24 01:59:39 +02:00
Laurent Destailleur
a03358fa46 Debug v18 2023-04-24 01:03:43 +02:00
Laurent Destailleur
8a400f0e6f Trans 2023-04-23 21:45:47 +02:00
Laurent Destailleur
73539162ff Show sending mode on emailing file 2023-04-23 21:42:05 +02:00
Frédéric FRANCE
057407554a use isModEnabled 2023-04-19 14:06:16 +02:00
Frédéric FRANCE
fa849696fb use isModEnabled 2023-04-18 20:16:02 +02:00
Laurent Destailleur
9a420b8f41 Clean code 2023-04-18 16:15:27 +02:00
Laurent Destailleur
16809e557f Fix column balance 2023-04-13 22:31:38 +02:00
FLIO
cbff9a6642 Merge branch 'develop' into editpropalattributes 2023-04-12 15:43:53 +02:00
FLIO
74c1bcf4e8 Fix to correspond to the requested table 2023-04-11 12:58:00 +02:00
FLIO
5e34099363 Fix to correspond to the requested table 2023-04-11 12:48:44 +02:00
Laurent Destailleur
3d11afc4e5 Look and feel v18 2023-04-09 14:52:36 +02:00
Laurent Destailleur
4c9e6e1997 Fix opt-out email 2023-04-09 14:33:23 +02:00
Laurent Destailleur
b9e08dafab css 2023-04-09 13:09:39 +02:00
Laurent Destailleur
8f3bd5ab07 Add info for opt out email 2023-04-09 13:00:34 +02:00
Laurent Destailleur
516232a190 Add info for opt out email 2023-04-08 19:17:14 +02:00
Laurent Destailleur
038fcd69a0 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-04-08 15:13:44 +02:00
Laurent Destailleur
3af71d5ded Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-04-08 14:44:01 +02:00
Laurent Destailleur
7e200e4506 WIP Add field include opt-outed emails into email screen 2023-04-08 13:29:30 +02:00
Laurent Destailleur
0fb03fdc2d Clean code 2023-04-08 01:43:21 +02:00
Laurent Destailleur
6dfb3978f2 Update dao to support evenunsubscribe. 2023-04-07 19:44:11 +02:00
Laurent Destailleur
52ad0edd2d Fix link to remove a target 2023-04-07 19:05:37 +02:00
FLIO
8463bce9f5 fix. the </td> were 3 lines down after the additional amount 2023-04-05 16:02:50 +02:00
FLIO
c7657ed3fd fix the missing condition and missing price total_ttc 2023-04-05 02:40:39 +02:00
FLIO
1ea251d813 new attributes on propal card 2023-04-04 16:10:02 +02:00
Laurent Destailleur
8898a1a432 Debug ajax tooltip 2023-04-03 19:51:40 +02:00
Adrien Raze
1d59cdc41b FIX : Add the possibility to events oxwner to check their events from the list when the perm "Read the actions (events or tasks) of others" is not active 2023-04-03 10:13:11 +02:00
Laurent Destailleur
f1898e5ac0 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-03-31 02:54:22 +02:00
Laurent Destailleur
ec61e638a9 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-03-31 02:50:22 +02:00