Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
123,917 Commits 36 Branches 189 Tags
c6a30bcf9eda0f7f420ac07b256b51dde3ccd00f
Commit Graph

12374 Commits

Author SHA1 Message Date
Lucas Marcouiller
ab6c05f4db New : can overwrite email_from on mail templates (#25086) 
Co-authored-by: Hystepik <lucas.marcouiller@gmail.com>
 2023-08-02 12:05:44 +02:00
Laurent Destailleur
a127dd2d15 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2023-08-02 00:41:43 +02:00
Laurent Destailleur
dfe00afd40 Exclude warning 2023-08-02 00:41:21 +02:00
onhairech
84243dc5e4 Fix #25416 :the email subject is not replaced when an email template… (#25534) 
* Fix #25416 :the email subject is not replaced when an email template is applied in tickets

* Update html.formticket.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2023-08-02 00:02:53 +02:00
Laurent Destailleur
b52f426518 Remove hardcoded value 2023-08-01 18:52:35 +02:00
Laurent Destailleur
83cbe02403 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-08-01 17:55:14 +02:00
Laurent Destailleur
c76a244b27 Close #25502 2023-08-01 17:25:28 +02:00
Laurent Destailleur
3d8f14e78d Debug v19 2023-08-01 14:14:54 +02:00
Laurent Destailleur
332f8ad95c Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-08-01 13:15:48 +02:00
Laurent Destailleur
5ac5dce4cb Look and feel v19 2023-07-31 21:44:03 +02:00
Laurent Destailleur
d040f5c8a9 Experiment color type 2023-07-31 20:16:49 +02:00
Laurent Destailleur
e374ebf26b Debug v18 2023-07-31 14:17:38 +02:00
Laurent Destailleur
40ebf86eab Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-07-31 13:51:32 +02:00
Laurent Destailleur
66c1ba9ae9 Debug v18 2023-07-31 03:47:37 +02:00
Florent Poinsaut
e2915d2979 NEW Add picto in product/service list in object lines (#25511) 2023-07-31 01:41:24 +02:00
Laurent Destailleur
9fd651ee5c FIX warnings 2023-07-30 19:46:23 +02:00
Laurent Destailleur
7cbc8728a5 FIX warnings 2023-07-30 19:44:04 +02:00
Laurent Destailleur
19f5622c8b Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-07-30 04:16:13 +02:00
Laurent Destailleur
71abe871ef Debug v18 2023-07-30 03:12:16 +02:00
Laurent Destailleur
e12bfb3e3c Can re-enable a default disabled stream with conf.php 2023-07-29 17:31:27 +02:00
Laurent Destailleur
31082fbea0 Log 2023-07-27 15:51:32 +02:00
Laurent Destailleur
b1b2736116 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-07-24 23:21:50 +02:00
Laurent Destailleur
ffa2f40a41 Fix for sql int comparison on rowid 2023-07-23 23:47:01 +02:00
Laurent Destailleur
75ff4da37c Doc 2023-07-23 21:44:40 +02:00
mc2contributor
1f6100d897 Fix undefined array key warnings on $this->datacolor[$i] (#25404) 2023-07-23 19:58:42 +02:00
Laurent Destailleur
d8815660c7 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-07-22 16:28:32 +02:00
Laurent Destailleur
1e443e060c Debug v18 2023-07-22 16:17:06 +02:00
Laurent Destailleur
5375b169cd FIX generating substitution array was corrupting the array_option 2023-07-22 13:45:35 +02:00
Laurent Destailleur
9552346a47 FIX generating substitution array was corrupting the array_option 2023-07-22 13:29:00 +02:00
Laurent Destailleur
09c6c06ecd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2023-07-21 14:48:50 +02:00
Laurent Destailleur
e4ce4d5576 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-07-21 14:46:07 +02:00
Laurent Destailleur
e9273d6183 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/takepos/receipt.php
 2023-07-19 04:19:15 +02:00
Jakub Stříbrný
e76641c491 Add emptyObjectVars() to CommonObject (#25357) 
To be able ti unset all vars when looping and fetching in each loop.
 2023-07-13 17:18:10 +02:00
lvessiller-opendsi
dee4e5d823 FIX extrafield on update card when visibility is list or read only (#25355) 
* FIX extrafield on update card when visibility is list or read only

* Add comment
 2023-07-13 17:10:42 +02:00
Laurent Destailleur
42fea0090d Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-07-12 16:41:11 +02:00
Laurent Destailleur
1998248e96 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-07-12 16:36:23 +02:00
onhairech
e5e9f914e5 qodana fix 3 : missing returns (#25332) 
* qodana fix 3 : missing returns

* removing a duplicated line
 2023-07-12 16:32:50 +02:00
Regis Houssin
76d6a30d48 FIX to avoid wrong path of file (#25320) 2023-07-12 16:30:34 +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
onhairech
303393e3dd qodana fix 2: missing returns (#25331) 2023-07-12 12:57:17 +02:00
Laurent Destailleur
570ff85433 Debug v18 2023-07-10 22:45:15 +02:00
Laurent Destailleur
9b4b7983fa Debug v18 2023-07-10 22:20:26 +02:00
Laurent Destailleur
091d7990ad Debug v18 2023-07-10 22:14:07 +02:00
Laurent Destailleur
700dd5d3f0 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-07-10 02:31:48 +02:00
Laurent Destailleur
d4cda09794 Debug v18 2023-07-10 02:25:33 +02:00
Laurent Destailleur
470cad6335 Debug v18 2023-07-10 01:27:21 +02:00
Laurent Destailleur
7a8f845baa Merge pull request #25203 from frederic34/fix/getSelectConditionsPaiements 
NEW do not add default value in list
 2023-07-09 14:46:12 +02:00
Laurent Destailleur
f18fae5271 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-07-06 22:24:35 +02:00
Laurent Destailleur
86864b4d53 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-07-06 22:22:26 +02:00