lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
121,269 Commits 43 Branches 150 Tags 886 MiB
add_rest_api_region
Commit Graph

7469 Commits

Author SHA1 Message Date
Laurent Destailleur
d0e08818e1
Merge pull request #21931 from grandoc/new_branch_27_08_2022 
FIX php8 compatibility
 2022-08-29 01:09:49 +02:00
Laurent Destailleur
11b9314023 Split fk_user_valid that was used for 2 purpose in fk_user_valid/approve 2022-08-29 00:04:12 +02:00
Laurent Destailleur
ec5af6cd23 Doc 2022-08-28 23:32:36 +02:00
Philippe GRAND
f943ea4ccc FIX php8 compatibility 2022-08-28 14:18:51 +02:00
Laurent Destailleur
eeba47b933 Add ip on table llx_adherent (for public submission page) 2022-08-25 12:09:56 +02:00
Laurent Destailleur
4a8b7dbecf Add ip on table of partnership 2022-08-25 12:07:44 +02:00
Laurent Destailleur
d6cc6f2576 Change sql creation of a partnership from a public page 2022-08-25 11:46:44 +02:00
UT from dolibit
845c20e5f7
Update llx_user.sql 2022-08-24 21:49:33 +02:00
Laurent Destailleur
33361e7948
Merge pull request #21852 from frederic34/useismodenabled 
use isModEnabled
 2022-08-24 18:12:02 +02:00
Frédéric FRANCE
a76092707f Merge remote-tracking branch 'upstream/develop' into companybankaccount 2022-08-24 16:22:55 +02:00
Frédéric FRANCE
c53fc449ee add fields for user bank accounts 2022-08-24 16:19:39 +02:00
Frédéric FRANCE
778d245407 add fields for company bank accounts 2022-08-24 16:01:27 +02:00
Laurent Destailleur
03d086f741 NEW Encrypt all sensitive constants in llx_const 2022-08-24 12:22:11 +02:00
atm-lena
6e5d395ac8 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_NEW_Service_DefaultWorkstation 2022-08-24 11:38:19 +02:00
Laurent Destailleur
e73f44e2aa Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-08-23 22:42:35 +02:00
Laurent Destailleur
b15a4e504e Merge IMAP with phpimap 2022-08-23 22:34:24 +02:00
Frédéric France
4bef0f5745 use isModEnabled 2022-08-23 20:01:34 +02:00
Laurent Destailleur
1ded74972a
Merge pull request #21847 from Quatadah/dolicloud-qnasdami-template04 
NEW : Template 04 improved according to #21775
 2022-08-23 15:42:45 +02:00
Quatadah Nasdami
f2dd9904ea template 04 improved 2022-08-23 13:19:10 +02:00
Laurent Destailleur
36b5195da9 Doc 2022-08-23 01:03:39 +02:00
Laurent Destailleur
2e11813952 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-08-23 01:02:31 +02:00
Laurent Destailleur
5cb3191ecd Doc 2022-08-23 00:46:03 +02:00
Laurent Destailleur
b0ccccdc27
Merge pull request #21835 from Quatadah/dolicloud-template03 
NEW #21775 : Template 03 manages send mails
 2022-08-22 23:24:42 +02:00
Laurent Destailleur
c9cd908ad2 Close #21775 2022-08-22 23:23:43 +02:00
Laurent Destailleur
4c13b08258 Move state into llx_oauth_token 2022-08-22 22:12:13 +02:00
Quatadah Nasdami
7b5cdbc3a2 template 03 now manages sending mails 2022-08-22 16:04:45 +02:00
Laurent Destailleur
6e800fe342 Close #21786 Merged manually to solve conflict on binary file 2022-08-22 12:17:26 +02:00
ptibogxiv
808d5a50f3
Update 16.0.0-17.0.0.sql 2022-08-21 12:58:20 +02:00
ptibogxiv
97faf603b1
ADD belgium public holiday 2022-08-21 12:57:45 +02:00
Laurent Destailleur
8dafaf4695
Merge pull request #21789 from Quatadah/dolicloud-template03 
FIX Template 01 in #21775
 2022-08-18 22:18:12 +02:00
Florian Charlaix
c5b43fc7df Add pid integer column to llx_cronjob 
Store the PID of the cronjob to allow cleanup if the process is no longer present in the system
 2022-08-18 15:17:59 +02:00
Quatadah Nasdami
0b4a6f07f4 reexporting template 03 2022-08-18 14:48:45 +02:00
Laurent Destailleur
4d313978fb
Merge pull request #21763 from Quatadah/dolicloud-qnasdami-template04 
#NEW Template 04
 2022-08-16 20:37:48 +02:00
Faustin
3bf8730c55 New imap by oauth2 works, but somes features left 2022-08-16 17:23:57 +02:00
Quatadah Nasdami
f992b2de5b template 04 2022-08-16 16:30:06 +02:00
Laurent Destailleur
d9afdc5846 Missing migration line 2022-08-15 02:27:18 +02:00
Laurent Destailleur
a0a38a7fec
Merge pull request #21752 from dolibit-ut/patch-414 
Update 16.0.0-17.0.0.sql
 2022-08-14 15:11:06 +02:00
UT from dolibit
9a358f43ea
Update 16.0.0-17.0.0.sql 
sort alphabetical
 2022-08-14 13:48:12 +02:00
UT from dolibit
6278c1e001
Update llx_20_c_departements.sql 
Greece
 2022-08-14 13:40:57 +02:00
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
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
atm-lena
7f1a17bcc9 Change fk_unit service lines management 2022-07-20 15:38:37 +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
lvessiller
8f338d84b0 FIX resolve conflicts 2022-07-15 17:35:19 +02:00
Laurent Destailleur
a55ab27c67 Fix http header 2022-07-14 15:01:16 +02:00
Laurent Destailleur
add38d0d04 Fix http header 2022-07-14 14:59:28 +02:00
Laurent Destailleur
4f54fb4f00 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-14 11:54:30 +02:00
Laurent Destailleur
a26931594c FIX #yogosha11799 2022-07-14 11:53:31 +02:00
Laurent Destailleur
d4acad4a7a FIX #yogosha11774 2022-07-14 11:51:38 +02:00
Laurent Destailleur
97acf949fc Clean message on email limit 2022-07-13 13:39:16 +02:00
atm-lena
8aa094a631 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_NEW_Service_DefaultWorkstation 2022-07-12 11:51:13 +02:00
Laurent Destailleur
57c5de5f9a Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-12 11:43:58 +02:00
Laurent Destailleur
f396908c94 Update website templates 2022-07-12 11:24:46 +02:00
atm-lena
8a36e2e9d8 Màj column fk_fedault_workstatio and duration_unit 2022-07-12 09:21:51 +02:00
atm-lena
db5c5b9020 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_NEW_Service_DefaultWorkstation 2022-07-12 09:21:22 +02:00
Laurent Destailleur
f607ae40c3 Fix migration 2022-07-11 12:40:14 +02:00
Laurent Destailleur
5ba446f736
Merge pull request #21412 from ymollard/membership-rework 
Membership rework
 2022-07-11 12:13:34 +02:00
Laurent Destailleur
5356703f84
Update 16.0.0-17.0.0.sql 2022-07-11 11:38:52 +02:00
Laurent Destailleur
edd2be7cda Fix length of column 2022-07-11 11:32:44 +02:00
Laurent Destailleur
e29df476e6
Merge branch 'develop' into membership-rework 2022-07-11 10:56:31 +02:00
Laurent Destailleur
ae58a77208 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/stock/card.php
 2022-07-11 00:03:39 +02:00
Laurent Destailleur
6386432263 Fix missing migration 2022-07-11 00:01:33 +02:00
Laurent Destailleur
6b07daf40f Fix missing migration 2022-07-10 20:12:56 +02:00
Laurent Destailleur
2236ab53fe
Merge pull request #21321 from defrance/patch-208 
NEW : Create llx_element_categorie.sql
 2022-07-10 19:05:36 +02:00
Laurent Destailleur
16d04e475b
Merge branch 'develop' into membership-rework 2022-07-10 18:58:49 +02:00
Laurent Destailleur
2f1ab1a003 Fix detection of version 2022-07-08 14:32:47 +02:00
Laurent Destailleur
8e9b52f919 Fix detection of version 2022-07-08 14:31:28 +02:00
Laurent Destailleur
bdfa0536a6 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-08 14:20:44 +02:00
Laurent Destailleur
3ced3378ac Prepare v17 2022-07-08 14:20:08 +02:00
Laurent Destailleur
245580bfa5 FIX Several pb in invoice remind (html detection, no event, transaction) 2022-07-08 14:11:13 +02:00
Laurent Destailleur
686f460f59 NEW Added MMK currency (Myanmar Kyat) 2022-07-08 11:58:08 +02:00
Yoan Mollard
07b5657ba1 Merge remote-tracking branch 'origin/develop' into HEAD 2022-07-08 10:11:22 +02:00
This Charlène
986c241ee1
create llx_element_categorie.key.sql 2022-07-08 08:09:40 +02:00
Laurent Destailleur
f2a6560d8f Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-07 11:45:36 +02:00
Laurent Destailleur
f2961d4bf4 Fix sql 2022-07-07 11:41:40 +02:00
Laurent Destailleur
9af4676369 Fix migration 2022-07-07 11:35:40 +02:00
atm-lena
6925dc2ae1 Edit unit bom line service 2022-07-06 15:00:07 +02:00
lvessiller
ed9c7ff251 FIX resolve conflicts 2022-07-06 09:23:44 +02:00
Laurent Destailleur
37db86183c Add field close_missing_amount on invoices 2022-07-05 20:32:26 +02:00
Laurent Destailleur
7e855eac52 Add field close_missing_amount on invoices 2022-07-05 20:22:32 +02:00
atm-lena
4e1dc2792c Add default workstation in service card 2022-07-05 13:58:35 +02:00
Laurent Destailleur
51d630433e Fix migration script detection 2022-07-05 10:04:12 +02:00
Laurent Destailleur
de71df9df2 Debug install v16 with php 8.1 2022-07-04 03:06:56 +02:00
Alexandre SPANGARO
32a9e53382 Merge remote-tracking branch 'upstream/develop' into 17p1 2022-07-03 07:29:41 +02:00
Yoan Mollard
5af4e81140 Delay caneditamount feature to v17 2022-07-01 17:39:56 +02:00
Yoan Mollard
1e6df0c6d9 Merge remote-tracking branch 'origin/develop' into membership-rework 2022-07-01 17:38:47 +02:00
Laurent Destailleur
1b5eb2de22
Merge pull request #21411 from defrance/patch-213 
introduce barcode on warehouse place
 2022-07-01 17:24:25 +02:00
Laurent Destailleur
cd2df7caef Debug v16 2022-06-30 12:47:36 +02:00
Laurent Destailleur
7acf02d6da Debug v16 2022-06-30 12:37:41 +02:00
Yoan Mollard
3dcf7db198 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into membership-rework 2022-06-29 16:12:05 +02:00
This Charlène
f6b1c91f21
Update 15.0.0-16.0.0.sql 2022-06-29 14:44:17 +02:00
This Charlène
08bffca31b
introduce barcode on warehouse place 2022-06-29 14:41:50 +02:00
Yoan Mollard
5998999f18 NEW: Add free membership amounts at the membership type level 2022-06-28 02:33:17 +02:00
Laurent Destailleur
3eec5f0e69 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2022-06-27 12:16:17 +02:00
Alexandre SPANGARO
667fda9d16 Fix Problem on trema 2022-06-26 08:14:04 +02:00
Alexandre SPANGARO
2dd3faa258 NEW Add chart of accounts PCN2020 for Luxemburg 2022-06-26 07:54:45 +02:00
Alexandre SPANGARO
eb31df3113 Remove Old PCN2009 2022-06-26 07:05:54 +02:00
lvessiller
7b7ecf44ad Merge branch 'develop' of github.com:Dolibarr/dolibarr into new-inventory-category-field 2022-06-24 17:30:14 +02:00
This Charlène
7594c14236
Delete llx_element_tag.key.sql 2022-06-23 17:46:57 +02:00
This Charlène
e7858a97bf
Delete llx_element_tag.sql 2022-06-23 17:46:32 +02:00
Laurent Destailleur
ce8f6b0983
Merge pull request #21338 from dolibit-ut/patch-401 
Update llx_adherent_type.sql
 2022-06-23 10:58:18 +02:00
UT from dolibit
924ef0a7db
Update 15.0.0-16.0.0.sql 2022-06-21 19:26:23 +02:00
UT from dolibit
5f98056423
Update llx_adherent_type.sql 2022-06-21 18:27:23 +02:00
BENKE Charlene
950c0c2183
Create llx_element_categorie.sql 
The goal of table llx_element_categorie is to replace all tables llx_categories_xxx (with one table).
the llx_element_tag table initially intended for this does not have the correct nomenclature to express its real use (and was used for other things before)
more informations here : https://github.com/Dolibarr/dolibarr/pull/21192
 2022-06-20 09:15:19 +02:00
Laurent Destailleur
eeff8fdc0d Debug v16 2022-06-20 02:10:27 +02:00
Laurent Destailleur
f24099a13f
Update llx_asset_model-asset.sql 2022-06-19 17:25:16 +02:00
Laurent Destailleur
e0149f3f03
Update llx_asset_depreciation_options_fiscal-asset.sql 2022-06-19 17:24:00 +02:00
Laurent Destailleur
06023b9139
Update llx_asset_depreciation_options_economic-asset.sql 2022-06-19 17:22:59 +02:00
Laurent Destailleur
bc9159e3c8
Update llx_asset_depreciation-asset.sql 2022-06-19 17:21:54 +02:00
Laurent Destailleur
16c9c7f54a
Update llx_asset_accountancy_codes_fiscal-asset.sql 2022-06-19 17:20:44 +02:00
Laurent Destailleur
d9bd1638be
Update llx_asset_accountancy_codes_economic-asset.sql 2022-06-19 17:19:43 +02:00
Laurent Destailleur
3f43ba0bc0
Update llx_asset-asset.sql 2022-06-19 17:17:31 +02:00
Alexandre SPANGARO
1e1d78037e Change comment on llx_asset_accountancy_codes_economic-asset.sql 2022-06-19 06:10:04 +02:00
Alexandre SPANGARO
512441bbf4 Review structure data on dictionary c_asset_disposal_type 2022-06-19 06:07:03 +02:00
lvessiller
d5269cd97b FIX resolve conflicts 2022-06-16 17:08:00 +02:00
Alexandre SPANGARO
86a54d5f22 Merge remote-tracking branch 'upstream/develop' into 16a12_assets_sql 2022-06-15 04:53:55 +02:00
Frédéric France
3fdbce7a31 use isModEnabled function 2022-06-11 09:46:28 +02:00
Laurent Destailleur
1deef98f07 Fix length of field 2022-06-09 13:08:12 +02:00
Alexandre SPANGARO
1594a06b95 Merge remote-tracking branch 'upstream/develop' into 17p1 2022-06-09 03:44:21 +02:00
ButterflyOfFire
6f40c002b7
Fixing algerian provinces names 
Fixing the names of the algerian provinces by removing the "Wilaya de xxx" and adding 10 more new provinces as Algeria has now 58 provinces instead of 48. And more fixes to come.
 2022-06-08 16:13:52 +01:00
Esteban L. Castro
1fa9a8c9d7
Added US-GAAP-BASIC 2022-06-07 17:23:31 -04:00
Esteban L. Castro
d85d3fe378
Added US-GAAP-Basic COA 
COA is based on https://www.ifrs-gaap.com/us-gaap-chart-accounts
 2022-06-07 17:18:01 -04:00
Laurent Destailleur
20ec91308c Fix chart of account for at 2022-06-07 15:11:41 +02:00
Laurent Destailleur
20b5eb15d3 Fix missing position 2022-06-03 14:02:41 +02:00
Laurent Destailleur
be729ab5f3 Debug v16 2022-06-03 03:10:31 +02:00
Laurent Destailleur
500a81dda1 Clean database 2022-06-03 02:56:25 +02:00
Laurent Destailleur
91a1f97029 Cronjobs ready for future. 2022-06-03 01:42:10 +02:00
Laurent Destailleur
e3fa24fab2
Merge pull request #18283 from atm-gauthier/NEW_stockstransfers 
NEW : Stocks transfers objects management
 2022-06-01 14:49:21 +02:00
Laurent Destailleur
d6ecbe65b7 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/langs/en_US/errors.lang
 2022-05-31 15:16:54 +02:00
Laurent Destailleur
c9eda09964 FIX ODT generation of BOM document 2022-05-31 14:30:47 +02:00
Alexandre SPANGARO
19616982c7 Merge remote-tracking branch 'upstream/develop' into 16a12_assets_sql 2022-05-31 11:43:02 +02:00
Laurent Destailleur
571110f60a Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2022-05-25 23:04:58 +02:00
Laurent Destailleur
d0b6daaf4c Fix length of field 2022-05-25 16:50:09 +02:00
Laurent Destailleur
555a3ad607
Merge pull request #21008 from rycks/burundi_setup_add_taxes 
burundi : add vat rates
 2022-05-24 21:08:17 +02:00
Laurent Destailleur
e3aa26e5c2 Fix creation of primary key 2022-05-24 16:10:33 +02:00
Laurent Destailleur
1a23143394 Fix autoincrement column 2022-05-24 16:02:37 +02:00
Eric Seigne
dce6271f23 burundi : add vat rates 2022-05-23 23:23:02 +02:00
Laurent Destailleur
d0aef6857c Add missing fields for css on extrafields 2022-05-23 01:02:59 +02:00
Alexandre SPANGARO
709208abfb Merge remote-tracking branch 'upstream/develop' into 16a12_assets_sql 2022-05-22 05:53:23 +02:00
Laurent Destailleur
0f268b682a
Merge pull request #20882 from FHenry/dev_new_add_ref_clinet_intervention 
NEW: Add Customer Ref on Intervention
 2022-05-21 22:36:17 +02:00
Laurent Destailleur
3b79c41fb8
Merge pull request #20955 from Hystepik/develop#1 
Fix : bug of upgrade when install not finished
 2022-05-21 19:09:02 +02:00
Alexandre SPANGARO
1be9375b96 In english 2022-05-21 18:45:10 +02:00
Alexandre SPANGARO
f25041f577 Add disposal type data 2022-05-21 18:31:05 +02:00
Laurent Destailleur
2f6bf5f0c8
Merge pull request #20946 from SylvainLegrand/SylvainLegrand-patch-1 
field ref_customer in llx_expedition is not varchar(255) #20629
 2022-05-21 17:29:46 +02:00
Laurent Destailleur
d51b2f9164 Fix migration 2022-05-21 17:25:38 +02:00
Lucas Marcouiller
29dab3b6d1 Fix : bug on check of main_not_installed 2022-05-21 17:14:05 +02:00
Maxime Kohlhaas
6445dd3882
Merge branch 'develop' into NEW_stockstransfers 2022-05-21 16:06:59 +02:00
Sylvain Legrand
a65c4c2e05
field ref_customer in llx_expedition is not varchar(255) #20629 2022-05-21 16:05:58 +02:00
Laurent Destailleur
d38b9187f3
Merge branch 'develop' into dev_new_add_ref_clinet_intervention 2022-05-21 10:48:09 +02:00
Alexandre SPANGARO
84900ceab7 Add documentation and data example on table 2022-05-21 07:55:48 +02:00
Alexandre SPANGARO
db522fe685 Merge remote-tracking branch 'upstream/develop' into 16a12_assets_sql 2022-05-21 07:16:45 +02:00
Alexandre SPANGARO
ea8759e627 NEW Add trigger to record the event of sending an email from a project #20912 2022-05-21 07:02:15 +02:00
Laurent Destailleur
c02e3f959f
Merge pull request #20899 from atm-gauthier/NEW/sortorder_on_holiday_type_dictionnary 
New/sortorder on holiday type dictionnary
 2022-05-21 00:43:52 +02:00
Florian HENRY
93831663d1 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into dev_new_add_ref_clinet_intervention 2022-05-20 10:31:29 +02:00
Laurent Destailleur
4b996f79a9 Debug v16 2022-05-19 13:52:29 +02:00
Gauthier PC portable 024
1e0972f0a1 NEW : sortorder on holiday type dictionnary 2022-05-19 12:34:05 +02:00
Laurent Destailleur
d38697d74b Missing data in resource module 2022-05-19 08:46:50 +02:00
Florian HENRY
566806bbea Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into dev_new_add_ref_clinet_intervention 2022-05-18 22:23:18 +02:00
Laurent Destailleur
48cb30bd9b Fix scrutinizer 2022-05-18 11:34:54 +02:00
Laurent Destailleur
177e8c17fb Fix scrutinizer 2022-05-18 11:23:21 +02:00
Florian HENRY
2f959306f7 fix travis 2022-05-17 22:50:42 +02:00
Florian HENRY
ecd0d2a7e2 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into dev_new_add_ref_clinet_intervention 2022-05-17 22:49:26 +02:00
Laurent Destailleur
5f0a34166d NEW Add a protection into PHPunit to avoid to forget a var_dump 2022-05-17 15:10:20 +02:00
Florian HENRY
ada81750c1 NEW: Add Customer Ref on Intervention 2022-05-17 12:53:50 +02:00
Laurent Destailleur
61153f04c8
Merge branch 'develop' into dev_event_factrec 2022-05-16 15:34:39 +02:00
Laurent Destailleur
7c44436485 Fix phpunit 2022-05-16 15:04:57 +02:00
Laurent Destailleur
8410ba709a Fix field 2022-05-16 15:02:24 +02:00
Laurent Destailleur
b75c0d805b Add more field 2022-05-16 15:01:33 +02:00
Florian HENRY
8ebeb0bf8a add c_action_trigger for auto batch invoice création 2022-05-13 11:29:48 +02:00
Florian HENRY
0425becc03 add c_action_trigger and fix travis 2022-05-13 11:23:49 +02:00
Laurent Destailleur
c08595866f
Merge branch 'develop' into burundi_support_for_dolibarr_13 2022-05-12 01:51:17 +02:00
Eric Seigne
b8e73b4b72 burundi companies type 2022-05-10 23:47:49 +02:00
Eric Seigne
7aad16bc80 burundi currencie 2022-05-10 23:47:36 +02:00
Eric Seigne
99225dab9f burundi departements (Communes) 2022-05-10 23:47:22 +02:00
Eric Seigne
4d759c23b3 burundi : regions (provinces) 2022-05-10 23:47:04 +02:00
Laurent Destailleur
fff9a692b4
Merge pull request #20816 from hregis/fix_missing_loading_global_conf 
FIX missing loading of global conf (avoid warning)
 2022-05-10 14:47:56 +02:00
Regis Houssin
8692038be2 FIX missing loading of global conf 2022-05-10 14:06:27 +02:00
Regis Houssin
6f8eef9550 FIX missing executeHooks 2022-05-10 12:56:22 +02:00
Laurent Destailleur
779b75bf65 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/class/bookkeeping.class.php
 2022-05-09 16:53:53 +02:00
Laurent Destailleur
86a8ae8c3d NEW Suggest a way to run upgrade per entities. 2022-05-09 15:24:46 +02:00
Gauthier PC portable 024
60defe4108 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers 2022-05-09 13:29:46 +02:00
Gauthier PC portable 024
5daca35e79 FIX : new tables loading system 2022-05-09 12:33:39 +02:00
Laurent Destailleur
e9d7e216e2 Debug v16 2022-05-09 12:13:31 +02:00
lvessiller
00f321475b NEW replace fk_categories_product with categories_product in inventory 2022-05-09 09:33:44 +02:00
Laurent Destailleur
b3b6337c4c
Merge branch 'develop' into NEW_deposit_payment_terms 2022-05-08 23:09:06 +02:00
Laurent Destailleur
6592eb5d73 Debug for php 8.1 2022-05-08 18:25:22 +02:00
Laurent Destailleur
65eb11efdf Fix sql migration 2022-05-08 17:39:53 +02:00
Laurent Destailleur
f52a7a26f6 Debug v16 - Fix for postgresql - Fix for sql loading per module - php8 2022-05-08 15:18:34 +02:00
Laurent Destailleur
6b9ed5aa32 Better message in installation process 2022-05-06 20:03:59 +02:00
Laurent Destailleur
bb6f73136a Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
 2022-05-06 12:46:26 +02:00
Gauthier PC portable 024
2c840e80fb Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers 2022-05-06 11:41:18 +02:00
lvessiller
ccc4d50a1c FIX resolve conflicts 2022-05-06 09:45:20 +02:00
Laurent Destailleur
f3a630fd30 Clean code 2022-05-06 05:21:26 +02:00
Laurent Destailleur
583343a171 Clean code 2022-05-06 05:08:54 +02:00
Laurent Destailleur
93cd0174cf Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-05-05 13:16:03 +02:00
Laurent Destailleur
6c624a9a45 Fix name of sql file 2022-05-05 12:26:15 +02:00
Laurent Destailleur
e3b777ad5b
Merge pull request #20649 from FHenry/15.0_fix_createtable_without_migration_script 
fix: CREATE TABLE llx_element_tag without migration script
 2022-05-04 17:15:53 +02:00
Laurent Destailleur
3574864062 Add email_company 2022-05-04 15:07:50 +02:00
Laurent Destailleur
82f7f30f0a Clean code 2022-05-04 14:58:50 +02:00
lvessiller
31d5fe5da3 FIX resolve conflicts 2022-05-04 11:20:24 +02:00
lvessiller
e01f912f41 Resolve conflicts 2022-05-04 11:11:05 +02:00
Laurent Destailleur
0236c31e21
Merge pull request #20730 from Hystepik/develop#5 
New : module webhook database structure
 2022-05-04 01:05:09 +02:00
Laurent Destailleur
09d02dfbfa
Update llx_webhook_target-webhook.sql 2022-05-04 01:04:39 +02:00
Laurent Destailleur
5bb2772968 NEW Add firstname and lastname for module "Event Organization" 2022-05-03 18:20:39 +02:00
Laurent Destailleur
16bb5eeb3f NEW Add firstname and lastname for module "Event Organization" 2022-05-03 18:18:11 +02:00
lmarcouiller
4ea45ac05a fix table fields 2022-05-02 15:13:42 +02:00
lmarcouiller
2899a6dca5 fix database files 2022-05-02 10:41:59 +02:00
lvessiller
734cdffa59 FIX resolve conflicts 2022-05-02 10:03:23 +02:00
UT from dolibit
65b26e4ffc
Update llx_c_availability.sql 2022-04-29 20:08:27 +02:00
Laurent Destailleur
49d15b691b Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/card.php
	htdocs/expensereport/card.php
 2022-04-29 17:35:36 +02:00
Laurent Destailleur
e1aaeeef29 FIX #20140 #20301 2022-04-29 16:57:23 +02:00
matll42
ff35bf8d47 FIX #20476 migration postgresql 14.0.x to 15.0.x packaging type 2022-04-29 16:53:48 +02:00
Laurent Destailleur
d496ad65e6 Enhance the feature of keyword detection for partnership 2022-04-29 11:16:15 +02:00
Laurent Destailleur
40d0c3b996 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/tva/card.php
	htdocs/langs/en_US/admin.lang
 2022-04-28 19:23:13 +02:00
lmarcouiller
701960bd70 try to fix build fail 2022-04-28 11:47:13 +02:00
lmarcouiller
be2502c29f New : module webhook database structure 2022-04-28 10:50:55 +02:00
Laurent Destailleur
fb1c770568 Doc 2022-04-25 23:37:34 +02:00
Laurent Destailleur
307476786c Fix label of remain to pay on vendor invoices 
FIX tool to fix bank account not in main currency for vendor invoice
 2022-04-19 23:24:08 +02:00
Laurent Destailleur
aa86b2c71f Fix root passfield not editable on install 
Fix user photo when gravatar not reachable
 2022-04-19 22:26:27 +02:00
Laurent Destailleur
25fbd3b385 Fix missing field 2022-04-16 13:28:38 +02:00
HENRY Florian
9acb1b2f88
Update 14.0.0-15.0.0.sql 2022-04-16 11:14:04 +02:00
Florian HENRY
bed974ebae Merge branch '15.0' of github.com:Dolibarr/dolibarr into 15.0_fix_createtable_without_migration_script 2022-04-15 10:22:33 +02:00
Florian HENRY
24bb6c6f83 fix: clean mess up around element_tag table 2022-04-15 10:20:52 +02:00
lvessiller
c8bec685a9 FIX resolve conflicts 2022-04-15 09:25:13 +02:00
Laurent Destailleur
f61ca0b516
Merge branch 'develop' into NEW_stockstransfers 2022-04-14 22:50:31 +02:00
Laurent Destailleur
1fd004d2a7
Merge pull request #20135 from atm-quentin/NEW_inventory_pmp_hidden_conf 
New hidden conf to manage pmp on inventory
 2022-04-14 22:42:35 +02:00
Laurent Destailleur
7636c5109d
Merge pull request #20635 from Hystepik/develop#5 
Fix : add of unique(entity,label) in llx_takepos_floor_tables table
 2022-04-14 21:04:24 +02:00
Laurent Destailleur
4e34649fc2 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/modulebuilder/index.php
 2022-04-14 16:10:23 +02:00
lmarcouiller
c90d758b0f New : add of unique(entity,label) 2022-04-14 11:06:54 +02:00
lvessiller
1cb56adb2e NEW products categories in inventory card 2022-04-13 15:44:27 +02:00
Laurent Destailleur
5e76c1a45d Fix doc 2022-04-12 21:59:34 +02:00
Gauthier PC portable 024
6faefa7d86 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers 2022-04-12 09:08:57 +02:00
Laurent Destailleur
cb15a21e41 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/core/tpl/originproductline.tpl.php
	htdocs/fourn/facture/card.php
	htdocs/install/mysql/migration/14.0.0-15.0.0.sql
	htdocs/user/card.php
 2022-04-11 21:22:27 +02:00
Laurent Destailleur
d6860ca41b FIX bad bank amount in accounting with multicurrency 2022-04-09 02:22:45 +02:00
Laurent Destailleur
88066d3fca Clean data 2022-04-07 23:53:02 +02:00
Laurent Destailleur
3a2815a9c0 Debug and clean v16 2022-04-07 23:44:57 +02:00
Laurent Destailleur
06f8af71ef Code comment 2022-04-07 11:24:39 +02:00
Laurent Destailleur
5e8f632a9b Close #20571 2022-04-07 11:22:28 +02:00
Regis Houssin
35ee6096b6 FIX increased the size of the "note" field 2022-04-07 10:38:46 +02:00
Laurent Destailleur
ed1bdd26db Rename some jobs 2022-04-07 00:09:11 +02:00
Laurent Destailleur
9459971ba4 Removed the awful "group by" on list of invoices. Add index on datef. 2022-04-06 14:53:22 +02:00
Laurent Destailleur
f9c9e518c3 Load tables for opensurvey only when module opensurvey is enabled 2022-04-05 19:14:00 +02:00
Laurent Destailleur
2e5d0ef92b
Merge pull request #20249 from atm-steve/NEW_Employee_management_improvement 
New employee management improvement #18434
 2022-04-05 15:12:19 +02:00
Thomas Negre
35d596e1dc rename constant TICKET_AUTO_CREATE_FICHINTER_CREATE to WORKFLOW_TICKET_CREATE_INTERVENTION 2022-04-04 09:29:03 +02:00
Laurent Destailleur
f1d5695cb0
Merge pull request #20225 from thomas-Ngr/develop_new_ticket_workflow_auto_link_contract 
NEW: add a workflow to auto link contract on a ticket
 2022-04-02 18:15:27 +02:00
Florian HENRY
a9faf5fb54 feat: Add rank column into contract line 2022-04-01 11:29:38 +02:00
Laurent Destailleur
113af78a9c Add column for private widgets 2022-04-01 09:35:45 +02:00
Laurent Destailleur
5b86476f0b Link of country not defined, jump on country setup line 2022-03-31 16:57:15 +02:00
Laurent Destailleur
bbcfc4b9f9 Fix condition on table creation 2022-03-31 16:39:36 +02:00
Laurent Destailleur
af15e3ae9e Fix condition on table creation 2022-03-31 16:34:24 +02:00
Laurent Destailleur
3ba9916be2 Fix default value used on install after a first failed try 2022-03-31 16:23:36 +02:00
Laurent Destailleur
9b206f9224 Can retreive some param of install from url 2022-03-31 15:51:48 +02:00
atm-steve
4fa656be96
Merge branch 'develop' into NEW_Employee_management_improvement 2022-03-30 12:13:17 +02:00
UT from dolibit
b6ab3275c3
Update llx_20_c_departements.sql 
San Salvador / El Salvador Departmentos
 2022-03-29 21:00:34 +02:00
Laurent Destailleur
63d9f69732 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
 2022-03-29 15:55:47 +02:00
Laurent Destailleur
b6b20ac818 Code comment 2022-03-29 14:23:47 +02:00
Quentin VIAL-GOUTEYRON
c7e8a2bd8f Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_inventory_pmp_hidden_conf 2022-03-28 16:04:12 +02:00
Laurent Destailleur
55e414ca30 Fix sql 2022-03-26 16:02:53 +01:00
Marc de Lima Lucio
cbba7d7d5f Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms 2022-03-25 16:14:53 +01:00
Laurent Destailleur
6177e914e2
Merge pull request #20293 from atm-quentin/NEW_Availibility_dictionary_field 
NEW Availibility dictionnary new column unit and number
 2022-03-24 20:28:38 +01:00
Laurent Destailleur
27d8691fcc Use default to null 2022-03-24 12:30:26 +01:00
Laurent Destailleur
8661902bfa
Update llx_holiday.sql 2022-03-24 12:26:31 +01:00
Laurent Destailleur
d952419fac
Update llx_holiday.sql 2022-03-24 12:25:42 +01:00
BENKE Charlene
95c8dfcaa0
Update llx_holiday.sql 2022-03-23 16:53:12 +01:00
BENKE Charlene
fcc8a953ae
Update 15.0.0-16.0.0.sql 2022-03-23 16:51:36 +01:00
Laurent Destailleur
8603d493ad Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contrat/list.php
	htdocs/install/mysql/tables/llx_partnership.key.sql
 2022-03-19 17:34:26 +01:00
Laurent Destailleur
ef21def5ce NEW Add option MAIN_API_DEBUG to save API logs into a file 2022-03-19 10:42:06 +01:00
Laurent Destailleur
47acdc8f34 Fix database corruption without that. 2022-03-18 14:10:42 +01:00
Laurent Destailleur
876a013ded Fix migration 2022-03-17 19:09:58 +01:00
Laurent Destailleur
167df9593b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/comm/action/card.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/langs/en_US/products.lang
	htdocs/reception/class/reception.class.php
 2022-03-17 19:08:51 +01:00
Laurent Destailleur
e46ee982ec FIX Option to manage packaging. FIX size/length/volume of reception 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/install/mysql/migration/14.0.0-15.0.0.sql
	htdocs/langs/en_US/products.lang
	htdocs/reception/card.php
	htdocs/reception/class/reception.class.php
 2022-03-17 19:00:19 +01:00
Laurent Destailleur
5d415b183e FIX Option to manage packaging. FIX size/length/volume of reception 2022-03-17 18:53:50 +01:00
Thomas Negre
90ab7da40d Workflow : sort contracts when automatic linking to ticket. 
Introduces constants TICKET_PRODUCT_CATEGORY and WORKFLOW_TICKET_USE_PARENT_COMPANY_CONTRACTS.
Rename constant TICKET_AUTO_ASSIGN_CONTRACT_CREATE to WORKFLOW_TICKET_LINK_CONTRACT.
 2022-03-17 16:05:35 +01:00
Quentin VIAL-GOUTEYRON
5bd2951cbd fix char into varchar 2022-03-17 11:38:42 +01:00
Quentin VIAL-GOUTEYRON
4aa87f3f85 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_Availibility_dictionary_field 2022-03-17 11:37:19 +01:00
Laurent Destailleur
ef19769249
Merge pull request #20318 from Achicken7301/develop 
Vietnam date format, VAT rates
 2022-03-16 22:22:20 +01:00
Laurent Destailleur
9c8ac4e145
Merge pull request #20334 from dolibit-ut/patch-376 
Update step2.php
 2022-03-16 22:08:57 +01:00
Laurent Destailleur
79dbfac4ec
Merge pull request #20336 from dolibit-ut/patch-378 
Update llx_adherent.sql
 2022-03-16 22:03:42 +01:00
Laurent Destailleur
92f82c7474
Merge pull request #20337 from dolibit-ut/patch-379 
Update 15.0.0-16.0.0.sql
 2022-03-15 19:48:21 +01:00
Laurent Destailleur
09a60e7ecb
Merge pull request #20338 from dolibit-ut/patch-380 
Update llx_00_c_country.sql
 2022-03-15 19:46:49 +01:00
Laurent Destailleur
306b58443c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/install/mysql/data/llx_20_c_departements.sql
 2022-03-15 19:44:34 +01:00
Laurent Destailleur
f885781919 Merge branch 'croatian_install_data' of https://github.com/mps-it/dolibarr into mps-it-croatian_install_data 2022-03-15 19:42:14 +01:00
Laurent Destailleur
98dfea0443
Merge pull request #20363 from dolibit-ut/patch-382 
Update llx_c_hrm_public_holiday.sql
 2022-03-15 19:36:19 +01:00
UT from dolibit
64525349e0
Update llx_c_hrm_public_holiday.sql 
add  fk_departement
see #16646
 2022-03-15 13:46:14 +01:00
UT from dolibit
271857189c
Update llx_20_c_departements.sql 2022-03-15 13:29:34 +01:00
UT from dolibit
0766355cba
Update llx_adherent.sql 
add state -2
 2022-03-15 11:04:56 +01:00
atm-steve
21090963e0
Merge branch 'develop' into NEW_Employee_management_improvement 2022-03-14 17:03:52 +01:00
Khang
3ae22d0fb3
Merge branch 'Dolibarr:develop' into develop 2022-03-14 11:52:01 +07:00
Laurent Destailleur
ec4ba46582 NEW Add private and public notes on tax files. 2022-03-13 18:30:31 +01:00
Miro Sertić
f22888e426 Add contributor to llx_c_forme_juridique.sql 2022-03-13 14:34:14 +01:00
Miro Sertić
fc59f49b32 Add vat for Croatia 2022-03-13 14:18:14 +01:00
Miro Sertić
339152cf68 Add departments for Croatia 2022-03-13 13:50:11 +01:00
Khang
25d31e38ea Add (llx_c_tva.sql) VIETNAM VAT 2022-03-13 19:15:25 +07:00
Miro Sertić
ba4b72e59d Add regions for Croatia 2022-03-13 13:07:42 +01:00
Miro Sertić
22b3c0ccae Add forme juridique for croatia 2022-03-13 13:04:50 +01:00
UT from dolibit
f808756c3e
Update llx_00_c_country.sql 
Bahreïn  -->  Bahrain
Barbade -->  Barbados
Bénin  -->  Benin
Bermudes  -->  Bermuda 
Bhoutan  -->  Bhutan
Bolivie  -->  Bolivia 
Bosnie-Herzégovine  -->  Bosnia and Herzegovina 
Ile Bouvet  -->  Bouvet Island   (Population: 0 ;-))
Territoire britannique de l''Océan Indien  -->  British Indian Ocean Territory 
Bulgarie  -->  Bulgaria
 2022-03-12 16:34:15 +01:00
UT from dolibit
19b8d418e2
Update 15.0.0-16.0.0.sql 2022-03-12 16:18:09 +01:00
UT from dolibit
7d000e4c9f
Update llx_adherent.sql 2022-03-12 15:57:03 +01:00
stickler-ci
277142dcab Fixing style errors. 2022-03-12 13:53:15 +00:00
UT from dolibit
d36d962d36
Update step2.php 
some english translations at  //comments
 2022-03-12 14:49:54 +01:00
Gauthier PC portable 024
732724ea51 FIX : move all sql stock transfer queries into 15 => 16 migration file 2022-03-10 11:37:52 +01:00
Gauthier PC portable 024
db7bd84ec3 FIX : tms without DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP 2022-03-10 11:29:53 +01:00
Gauthier PC portable 024
96f78adb92 FIX : travis feedback, tms without "DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP" 2022-03-10 11:07:00 +01:00
Gauthier PC portable 024
c103c7d61e Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers 2022-03-10 10:31:56 +01:00
Quentin VIAL-GOUTEYRON
7ae96b9839 convert number into qty 2022-03-09 10:34:23 +01:00
Marc de Lima Lucio
4efcbe8799 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms 2022-03-08 15:23:52 +01:00
Marc de Lima Lucio
161edea6f3 FIX: deposit payment terms: adapt to v16 2022-03-08 15:22:19 +01:00
Marc de Lima Lucio
1993a8d7b1 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms 2022-03-08 15:07:37 +01:00
Quentin VIAL-GOUTEYRON
b904ea73a6 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_inventory_pmp_hidden_conf 2022-03-08 08:55:21 +01:00
Quentin VIAL-GOUTEYRON
44577b2d1a fix remove delete and add update lxx c availability 2022-03-08 08:51:31 +01:00
Quentin VIAL-GOUTEYRON
771fa0b6ed Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_Availibility_dictionary_field 2022-03-08 08:50:22 +01:00
Laurent Destailleur
fc139ba9e8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-03-07 17:22:53 +01:00
Laurent Destailleur
fa46966b81 Fix insert must not include the rowid. 2022-03-07 17:22:29 +01:00
Laurent Destailleur
ce52f8a7ed
Merge pull request #20294 from bloxera/develop 
CLOSE #20292 Include German public holidays
 2022-03-07 17:15:22 +01:00
priojk
db12fe9225 CLOSE #20292 Include German public holidays 
Definition of German public holidays (those which are
only relevant in some areas are marked with --TLW).
The values are configured during the first initial set-up of
Dolibarr.
 2022-03-07 16:38:56 +01:00
Laurent Destailleur
6d772b7627
Merge branch 'develop' into patch-1 2022-03-07 16:08:31 +01:00
Quentin VIAL-GOUTEYRON
af8ecd1a38 NEW Availibility dictionnary column unit and number 2022-03-07 16:02:49 +01:00
Laurent Destailleur
84b951c2f9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-03-07 15:27:07 +01:00
Laurent Destailleur
54ecf1f98c # WARNING: head commit changed in the meantime 
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
 2022-03-07 15:24:08 +01:00
Laurent Destailleur
c4a20685a4 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-03-07 15:21:38 +01:00
Laurent Destailleur
fa707c6015 Fix error from v12 2022-03-07 15:20:55 +01:00
Laurent Destailleur
c0088191f1 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/product/admin/product.php
	htdocs/product/class/product.class.php
 2022-03-07 15:19:51 +01:00
Laurent Destailleur
d13ae9f721 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/install/mysql/tables/llx_product_fournisseur_price.sql
	htdocs/product/admin/product.php
	htdocs/product/class/product.class.php
 2022-03-07 15:13:25 +01:00
Laurent Destailleur
c4061e578d Fix field 2022-03-07 15:06:24 +01:00
Laurent Destailleur
028fc4f004 Fix field 2022-03-07 15:05:45 +01:00
Laurent Destailleur
df0b20aad3
Merge pull request #20241 from noec764/12.0_Product_Fournisseur_Migration 
Correction of the modification on the fly of the table llx_product_fournisseur_price
 2022-03-07 15:01:40 +01:00
Quentin VIAL-GOUTEYRON
cc591b3a03 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_inventory_pmp_hidden_conf 2022-03-07 10:12:17 +01:00
Alexandre SPANGARO
1671b095eb Fix also table llx_c_country 2022-03-04 07:02:40 +01:00
Alexandre SPANGARO
13b69bcf93 NEW Dictionaries - add possibility to manage countries in EEC 2022-03-04 07:00:02 +01:00
Steve
cb17f2029e wip: add ref_employee and national_registration_number fields 2022-03-02 11:20:07 +01:00
Noé Courtier
035bc32323 Correction of the modification on the fly of the table llx_product_fournisseur_price by an addition in the script creation of the table as well as in the script of version upgrade from 12 ->13 2022-03-01 16:14:31 +01:00
Anthony Berton
0fd56eb56b
Update 15.0.0-16.0.0.sql 2022-03-01 11:09:26 +01:00
Anthony Berton
b9feefad15
Update 14.0.0-15.0.0.sql 2022-03-01 11:08:31 +01:00
Anthony Berton
eb90beaebe
Merge branch 'develop' into patch-1 2022-03-01 11:07:11 +01:00
Laurent Destailleur
ef39c50882
Merge branch '15.0' into patch-1 2022-02-28 21:09:50 +01:00