Commit Graph

7053 Commits

Author SHA1 Message Date
Laurent Destailleur
f731fcc7d1 Use good format for image templates 2022-08-03 21:30:59 +02:00
Laurent Destailleur
661bf6a131 Merge pull request #21585 from Quatadah/qnasdami-dolicloud-template03
NEW: Adding template 03
2022-08-03 20:09:45 +02:00
Laurent Destailleur
a509ec2c22 Removed bad fields 2022-08-03 18:31:55 +02:00
Laurent Destailleur
b63197fe4a Merge pull request #21646 from Hystepik/develop#2
New : Add DoS security on GETPOST with img Yogosha report 11963
2022-08-03 17:54:13 +02:00
Laurent Destailleur
60fb538bb1 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-08-03 14:58:31 +02:00
Laurent Destailleur
e0b196f3c2 Fix migration 2022-08-03 14:57:47 +02:00
lmarcouiller
c7652af3bc New : Add DoS security on GETPOST with img 2022-08-03 14:24:27 +02:00
Laurent Destailleur
3f5b3020b0 Add email_date for job applications and tickets 2022-08-02 20:56:48 +02:00
Laurent Destailleur
528d54ba79 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-08-02 20:28:07 +02:00
Laurent Destailleur
a57c96f6d9 Merge branch 'develop' into dev_add_IMAPport_email_collector 2022-08-02 19:12:44 +02:00
Christophe Battarel
9e963ef0ef fix reappro was very long to display 2022-08-02 18:33:06 +02:00
Laurent Destailleur
628a368686 Add column position for llx_bank 2022-07-31 21:25:24 +02:00
Florian HENRY
454fb6b0f5 new: Add IMAP port setting on email collector module 2022-07-31 13:10:38 +02:00
Laurent Destailleur
51d022914b Fix missing auto increment key. Fix error duplicate of type of contact. 2022-07-29 16:03:21 +02:00
Anthony Berton
df727f3b5d FIX - Add colone last_main_doc in societe for migration Error to generate doc 2022-07-28 17:22:21 +02:00
Laurent Destailleur
ceaec6c581 Merge pull request #21586 from korabocintake/JP-coa-etc
NEW: Adding JAPAN Chart-of-Account and regions/departments
2022-07-28 14:13:44 +02:00
Laurent Destailleur
fc9b3e3d70 Factorize code into a function dolJSToSetRandomPassword() 2022-07-27 13:42:43 +02:00
OPEN\s.takeuchi
1706dfad3c Merge branch 'develop' of https://github.com/korabocintake/dolibarr into develop 2022-07-27 15:55:23 +09:00
Quatadah Nasdami
0c0c4844c6 Adding template 03 2022-07-27 01:13:53 +02:00
Laurent Destailleur
60dd3577ec Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-26 13:15:37 +02:00
Laurent Destailleur
da2641bcb2 Clean code 2022-07-26 12:54:19 +02:00
OPEN\s.takeuchi
6ff83be2df Rev: add 'tncc' value 2022-07-26 19:24:52 +09:00
Laurent Destailleur
5903a9f87f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2022-07-26 12:24:24 +02:00
Laurent Destailleur
3eedf18344 Debug v16 2022-07-26 11:53:00 +02:00
OPEN\s.takeuchi
e62c54c627 Merge branch 'develop' of https://github.com/korabocintake/dolibarr into develop 2022-07-26 11:30:34 +09:00
OPEN\s.takeuchi
984c125720 Rev+Add: Japan departments, accountings 2022-07-26 11:30:23 +09:00
Laurent Destailleur
c4eccd262d Add ip into ticket table 2022-07-25 13:15:22 +02:00
Laurent Destailleur
ab81492fa4 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/html.formwebsite.class.php
	htdocs/core/lib/cron.lib.php
2022-07-24 22:17:25 +02:00
Laurent Destailleur
da8a9e6082 Merge pull request #20625 from Easya-Solutions/new-inventory-category-field
NEW Can use products categories to make inventory
2022-07-24 22:06:55 +02:00
Laurent Destailleur
60117bbaee Debug v16 2022-07-24 19:45:37 +02:00
Laurent Destailleur
cf0a1d1e14 Merge 2022-07-24 11:26:10 +02:00
Laurent Destailleur
252c581ea6 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-07-24 11:23:52 +02:00
Laurent Destailleur
58923ec3d7 Merge 2022-07-24 11:21:02 +02:00
Laurent Destailleur
c7fd9f5a3a Trans 2022-07-24 10:57:46 +02:00
Chl
b4d4c42cfb FIX #20476 discrepancy between MySQL & PostgreSQL default value 2022-07-22 21:10:23 +02:00
Chl
50e1597ef1 FIX #20476 migration postgresql 13.0.x to 14.0.x packaging type 2022-07-22 21:09:19 +02:00
Chl
1dec64e320 FIX #20476 migration postgresql 13.0.x to 14.0.x packaging type
Taken from ff35bf8d47
2022-07-22 19:17:03 +02:00
Laurent Destailleur
24f8e9c401 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-22 18:09:38 +02:00
lvessiller
1f28734a83 FIX resolve conflicts 2022-07-22 08:50:50 +02:00
Laurent Destailleur
0c524f17f1 Merge pull request #21546 from Quatadah/template01
#NEW template
2022-07-21 16:18:56 +02:00
Quatadah Nasdami
82eaf4524a adding second template 2022-07-21 15:01:53 +02:00
Quatadah Nasdami
1701982ab5 pushing first tempalte 2022-07-21 14:36:18 +02:00
Laurent Destailleur
f6176b6b61 Doc 2022-07-19 02:08:49 +02:00
Laurent Destailleur
618184deed Merge pull request #21519 from aspangaro/16p1
Move old link on data
2022-07-19 00:53:29 +02:00
Laurent Destailleur
36226c7b4b FIX Picto google plus 2022-07-18 13:17:37 +02:00
Laurent Destailleur
95ee25660e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-18 13:16:25 +02:00
Laurent Destailleur
311d69da4e FIX Picto google plus 2022-07-18 11:07:48 +02:00
Alexandre SPANGARO
576c185e0c Move old link on data 2022-07-18 09:20:54 +02:00
Laurent Destailleur
c759b56622 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-16 09:39:40 +02:00
Laurent Destailleur
14eb6c24b8 Fix php version max 2022-07-16 02:34:37 +02:00