Commit Graph

103596 Commits

Author SHA1 Message Date
Benjamin Chantalat
95342777d9
Merge branch 'Dolibarr:develop' into develop 2021-09-24 14:09:14 +02:00
Laurent Destailleur
dc36724a10 FIX #18805 2021-09-24 13:51:52 +02:00
Laurent Destailleur
14728e385e Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-09-24 13:36:40 +02:00
Laurent Destailleur
8b7c677121
Merge pull request #18702 from Hystepik/develop#2
Close #18692 : Possibility to move directories in ecm
2021-09-24 13:36:25 +02:00
Laurent Destailleur
9a3d6679f0
Merge pull request #18778 from Hystepik/develop#1
Fix : KM articles in public/ticket/create_ticket.php
2021-09-24 13:35:17 +02:00
Laurent Destailleur
a3c8f2ed56
Merge pull request #18771 from laudeco/hotfix/receipt_html
Allow to edit the header of receipt by using HTML
2021-09-24 13:33:08 +02:00
Laurent Destailleur
128bba1d9b Fix GETPOST 2021-09-24 13:29:03 +02:00
Laurent Destailleur
fd817ed015
Merge pull request #18800 from hregis/fix_wrong_request_sql
FIX check if greater 0
2021-09-24 13:10:24 +02:00
Laurent Destailleur
42a71e9303
Merge pull request #18812 from Hystepik/develop_v14#1
Fix #18809 : error on client tooltip
2021-09-24 13:10:00 +02:00
Laurent Destailleur
f85f81c2ee
Merge pull request #18811 from aspangaro/14p20
FIX Accountancy - Option of export popup are inverted
2021-09-24 13:09:04 +02:00
Laurent Destailleur
00120109fb
Merge pull request #18813 from aspangaro/14p21
FIX Accountancy - Error on ValidDate for FEC/FEC2 export
2021-09-24 13:07:17 +02:00
Alexandre SPANGARO
a1bd07d1a3 FIX Accountancy - Error on ValidDate for FEC/FEC2 export 2021-09-24 12:04:25 +02:00
Laurent Destailleur
dbf7a9a0d0 FIX payment using wrong type in takepos when too many payment mode 2021-09-24 11:48:43 +02:00
lmarcouiller
f88d12f55d Fix #18809 : error on client tooltip 2021-09-24 11:16:34 +02:00
lmarcouiller
68c9f4064b Fix sql in fetchKnowledgeRecord 2021-09-24 10:43:52 +02:00
Alexandre SPANGARO
3e485dcb41 FIX Accountancy - Option of export popup are inverted 2021-09-24 06:38:43 +02:00
Alexandre SPANGARO
15313b8d37 FIX Accountancy - Missing specific filename for export on format FEC2 2021-09-24 06:03:01 +02:00
Laurent Destailleur
4706ebe004 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2021-09-24 02:34:59 +02:00
Laurent Destailleur
70d255740b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/projet/class/task.class.php
2021-09-24 02:33:48 +02:00
Laurent Destailleur
cd46ccdb66 Code comment 2021-09-24 02:31:15 +02:00
Laurent Destailleur
b09c4166b3 Fix set position of lines in tasks of a project 2021-09-24 02:24:04 +02:00
Laurent Destailleur
3d22cbe4da Fix look and feel 2021-09-24 02:16:40 +02:00
Laurent Destailleur
4c80e0425b Fix date for tasks created during project creation 2021-09-24 02:10:42 +02:00
Laurent Destailleur
8fb5286260 FIX #18797 2021-09-24 02:02:12 +02:00
Laurent Destailleur
38b8ed9092
Merge pull request #18792 from cfoellmann/PR/minor-button-fixes
another set of cleanup for action buttons
2021-09-24 01:55:25 +02:00
Laurent Destailleur
9b58c498ee
Merge pull request #18807 from elsp1991/Link-to-MO
add MO to the list of possible object to link
2021-09-24 01:54:55 +02:00
Laurent Destailleur
f98d425064
Merge branch 'develop' into Link-to-MO 2021-09-24 01:54:21 +02:00
DevIntact
36a902167f Translation of event title for incoming email
Event title for incoming email is not translated while collected by cronjob. 
i.e : ActionAC_EMAIL_IN
2021-09-24 01:49:16 +02:00
Laurent Destailleur
07d48cbd61
Merge pull request #18808 from DevIntact/develop
Translation of event title for incoming email
2021-09-24 01:48:33 +02:00
Laurent Destailleur
a2a4a74964 Fix trans 2021-09-23 16:18:21 +02:00
lmarcouiller
ef70cd680c fix to match sql syntax 2021-09-23 15:00:55 +02:00
DevIntact
d357715538
Translation of event title for incoming email
Event title for incoming email is not translated while collected by cronjob. 
i.e : ActionAC_EMAIL_IN
2021-09-23 14:54:38 +02:00
Laurent Destailleur
9d5f6fbc1b Code comment 2021-09-23 13:39:48 +02:00
Laurent Destailleur
5c4922682c Trans 2021-09-23 13:29:18 +02:00
Benjamin Chantalat
c1e1a53503 Update Explicit date_creation instead of date 2021-09-23 13:23:16 +02:00
Laurent Destailleur
b08b7d2f68 NEW Can show progression of task into combo list of tasks 2021-09-23 13:20:42 +02:00
Laurent Destailleur
c39c823b66 Debug Date of line of services mandatory 2021-09-23 13:01:04 +02:00
Laurent Destailleur
545b4c56d5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-23 12:14:54 +02:00
Laurent Destailleur
d39ab4c288 Clean code 2021-09-23 12:14:32 +02:00
Laurent Destailleur
27c41946b7
Merge pull request #18182 from atm-jpb/NEW_field_in_service_object
NEW : field and behavior in product object
2021-09-23 12:14:09 +02:00
Laurent Destailleur
4a43ed2852 Fix scrutinizer 2021-09-23 12:05:55 +02:00
Laurent Destailleur
0a28bf4d30 Trans 2021-09-23 11:44:16 +02:00
Laurent Destailleur
2538ebec03 Better test 2021-09-23 11:40:29 +02:00
Ilias Patsiaouras
977db0a2ba add MO to the list of possible object to link 2021-09-23 11:38:50 +02:00
Laurent Destailleur
a48a8231a1 Fix scrutinizer 2021-09-23 11:33:58 +02:00
Laurent Destailleur
31de16d305 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-23 03:21:54 +02:00
Laurent Destailleur
3467faab6b Fix property 2021-09-23 03:20:15 +02:00
Laurent Destailleur
31d9eb192f Clean code 2021-09-23 02:51:36 +02:00
Laurent Destailleur
d38c3028eb Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/expensereport/class/expensereport.class.php
2021-09-23 02:41:53 +02:00
Laurent Destailleur
128f6d9a5c Fix combo box for thirdparties in invoice stats used bad component 2021-09-23 02:38:53 +02:00