Commit Graph

7230 Commits

Author SHA1 Message Date
Laurent Destailleur
539937b69a Merge pull request #21743 from dolibit-ut/patch-412
Update llx_20_c_departements.sql
2022-08-13 15:28:39 +02:00
UT from dolibit
63164df08a Update llx_20_c_departements.sql 2022-08-13 14:02:33 +02:00
UT from dolibit
98e69a5476 Update llx_00_c_country.sql
Cambodge / Cambodia
Central African Republic (CAR/RCA)
Chile
DR Congo (RDC)
Croatia
Vatican City (Saint-Siège)
Indonesia
Jamaica
Japan (Nippon)
North Macedonia
2022-08-13 13:39:15 +02:00
Laurent Destailleur
5b74f1d3dc Fix duplicate string
Conflicts:
	htdocs/public/members/new.php
2022-08-13 12:35:07 +02:00
Laurent Destailleur
d510e3ffcc Fix duplicate string 2022-08-13 12:33:00 +02:00
Laurent Destailleur
2d29568231 Merge pull request #21584 from Quatadah/template1
NEW: Adding template 01
2022-08-11 23:24:33 +02:00
atm-lena
2fbba30e2a Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_NEW_Service_DefaultWorkstation 2022-08-11 12:11:41 +02:00
lvessiller
8a910e6cef FIX resolve conflicts 2022-08-10 18:10:17 +02:00
lvessiller
d6494ae484 NEW make sell or eat by mandatory in product lot (SQL) 2022-08-10 17:35:39 +02:00
Laurent Destailleur
8db8914a41 Merge pull request #21678 from ptibogxiv/patch-34
NEW default_lang for members
2022-08-10 05:10:03 +02:00
ptibogxiv
d7e114aa60 Update 16.0.0-17.0.0.sql 2022-08-07 13:00:48 +02:00
ptibogxiv
6aedbc5445 Update llx_adherent.sql 2022-08-07 12:59:58 +02:00
ptibogxiv
1ffbf1e56b Update llx_adherent.sql 2022-08-06 18:49:18 +02:00
ptibogxiv
ed9cadac7e NEW default_lang for members 2022-08-06 18:47:41 +02:00
Quatadah Nasdami
4090ce9227 changing the zip folder of the template style 02 2022-08-04 11:51:47 +02:00
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
5f5c26f3a6 Merge branch 'develop' into template1 2022-08-03 19:26:38 +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
atm-lena
462352b957 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_NEW_Service_DefaultWorkstation 2022-07-29 12:06:43 +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
Quatadah Nasdami
36bae800ce website template 01 2022-07-27 00:27:24 +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