Francis Appels
c74cc53b22
Fix migration script when running on mysql 8
2022-10-21 12:16:52 +02:00
Laurent Destailleur
a52de14003
Debug hrm module
2022-10-20 22:56:07 +02:00
Laurent Destailleur
d2ec128595
Fix field fk_user_create of event registration must be null
2022-10-20 18:14:00 +02:00
Laurent Destailleur
06d94c9a97
Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-10-19 17:11:32 +02:00
Laurent Destailleur
c5c9262a3c
Fix template of emails
2022-10-18 23:09:19 +02:00
Laurent Destailleur
dcc7962757
Fix default email templates
2022-10-18 23:00:50 +02:00
Laurent Destailleur
7142b90041
Merge pull request #22568 from dolibit-ut/patch-622
...
Update llx_10_c_regions.sql
2022-10-14 19:23:56 +02:00
Laurent Destailleur
9447bcc881
Fix too many logs
2022-10-13 20:31:56 +02:00
UT from dolibit
4e416dbdad
Update llx_10_c_regions.sql
2022-10-13 10:24:37 +02:00
Laurent Destailleur
71b7ef1924
Merge pull request #22525 from FHenry/dev_new_rank_contract_line_20512
...
NEW: Manage Position (Rank) on Contract Lines
2022-10-13 10:00:15 +02:00
Laurent Destailleur
eb0f898b01
Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-10-13 01:10:31 +02:00
Laurent Destailleur
b88f49f00c
Position of field
2022-10-13 01:08:23 +02:00
Laurent Destailleur
32ec40647a
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
2022-10-13 01:07:27 +02:00
Laurent Destailleur
54c5ca7c75
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-10-13 01:06:15 +02:00
Laurent Destailleur
14edd053fb
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
2022-10-13 00:52:23 +02:00
Laurent Destailleur
374e56d938
FIX #22538
2022-10-13 00:50:55 +02:00
Laurent Destailleur
f0cee03b0f
Standardize chart of account file
2022-10-12 13:40:08 +02:00
Laurent Destailleur
5d782308d5
Space missing
2022-10-12 13:30:52 +02:00
Laurent Destailleur
3a1b4bf9d2
Better translation for english countries for journals.
2022-10-12 13:24:34 +02:00
Laurent Destailleur
bfd33c9157
Fix migration when table llx_asset is missing
2022-10-11 13:49:11 +02:00
Florian HENRY
b6452bd2c7
fix travis (website template)
2022-10-09 14:52:15 +02:00
Florian HENRY
28b69f5cd9
chore: travis
2022-10-09 14:15:43 +02:00
Florian HENRY
e2e4e63bd1
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_new_rank_contract_line_20512
2022-10-09 14:12:39 +02:00
Laurent Destailleur
fe40875aa9
Enahnce web site templates
2022-10-09 13:00:34 +02:00
Laurent Destailleur
6549bcaf77
Rename templates
2022-10-09 12:38:09 +02:00
Laurent Destailleur
fb24a1ee55
Clean code
2022-10-08 20:41:45 +02:00
Laurent Destailleur
4a9181b5bc
Clean code
2022-10-08 20:22:59 +02:00
Laurent Destailleur
a32ed5b07d
Clean code
2022-10-08 20:21:03 +02:00
Laurent Destailleur
3ecd79b915
Clean code
2022-10-08 19:39:34 +02:00
Laurent Destailleur
6729ddbbb6
NEW Templates of websites are now directories and not zip into core repo
2022-10-08 13:48:25 +02:00
Laurent Destailleur
7abb5d1e16
Merge pull request #22085 from lkotsoni/Add_notes_to_productlot
...
[NEW][#22048 ][Added notes to productlot module]
2022-10-07 23:28:13 +02:00
Florian HENRY
d597eb8202
NEW: Manage Position (Rank) on Contract Lines
2022-10-07 14:43:58 +02:00
Laurent Destailleur
bd4d6cb77e
Fix code of Bancontact
2022-10-06 22:14:42 +02:00
Laurent Destailleur
10973e90ae
Add missing column to manage multicurrency
2022-10-06 20:01:00 +02:00
Laurent Destailleur
be10cdee95
Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-10-06 16:03:50 +02:00
Laurent Destailleur
c513a767f3
Merge pull request #22457 from Quatadah/dolicloud-template01-revisited
...
#FIX template01 css corrected
2022-10-06 11:58:32 +02:00
Laurent Destailleur
ab2edad255
NEW Add performance index in llx_bank_url(url_id)
2022-10-05 02:01:38 +02:00
Laurent Destailleur
1d39154f81
NEW Default values in extrafields are not more limited to 255 char.
2022-09-29 16:24:07 +02:00
Laurent Destailleur
150f4c45d8
FIX default value for partnership status
2022-09-29 15:20:19 +02:00
Quatadah Nasdami
a048fa4b6d
template01 css corrected
2022-09-29 12:13:48 +02:00
Laurent Destailleur
e96befe783
Merge pull request #22410 from Quatadah/dolicloud-template02
...
#FIX Dolicloud template02
2022-09-28 20:53:25 +02:00
Laurent Destailleur
b751d79153
Merge pull request #22409 from Quatadah/dolicloud-template03
...
#FIX tempalte 03 css
2022-09-28 20:49:45 +02:00
Laurent Destailleur
eefcc49006
NEW Add index on name for company and contact
2022-09-28 15:58:10 +02:00
Quatadah Nasdami
6479c73a29
fix css in template02
2022-09-26 13:59:51 +02:00
Quatadah Nasdami
9e03e11126
fix template03 css
2022-09-26 13:53:09 +02:00
Christian Humpel
02fb02b282
Fix #22307 Add comma to llx_product.sql
2022-09-25 15:53:16 +02:00
Laurent Destailleur
b0162e3bea
Merge pull request #22396 from aspangaro/17p1
...
NEW #20912 Add trigger to record the event of sending an email from a project
2022-09-25 13:05:15 +02:00
priojk
93a0196786
Removed empty lines, set length of accoutn numbers to 4 with leadin zeros.
2022-09-25 10:41:28 +02:00
Alexandre SPANGARO
d009cbdcf7
Merge remote-tracking branch 'upstream/develop' into 17p1
2022-09-25 05:32:02 +02:00
Laurent Destailleur
e1b5e5033f
Clean code of deprecated field
2022-09-23 09:35:17 +02:00
Laurent Destailleur
b24cfc232f
Fix warning
2022-09-21 03:56:16 +02:00
Laurent Destailleur
cc93166c53
Fix warnings
2022-09-21 03:31:58 +02:00
Laurent Destailleur
8e61f77f4d
Fix warnings
2022-09-21 03:16:18 +02:00
Laurent Destailleur
10aefeccfe
Test travis
2022-09-20 19:32:16 +02:00
Laurent Destailleur
daa1d38d3f
Merge pull request #22252 from hregis/fix_some_upgrade_sql_errors
...
FIX some upgrade sql errors
2022-09-20 01:15:41 +02:00
Laurent Destailleur
c8a714c722
Merge pull request #22316 from dolibit-ut/patch-606
...
Update llx_00_c_country.sql
2022-09-19 17:45:23 +02:00
Laurent Destailleur
8ab26a57fc
Merge pull request #22314 from dolibit-ut/patch-605
...
Update llx_20_c_departements.sql
2022-09-19 17:44:55 +02:00
Laurent Destailleur
ad2625f842
Fix duplicate string
2022-09-17 12:45:42 +02:00
UT from dolibit
e556bdc35f
Update llx_00_c_country.sql
2022-09-16 19:17:18 +02:00
UT from dolibit
33b5a052b5
Update llx_20_c_departements.sql
2022-09-16 19:05:46 +02:00
Regis Houssin
a2c62d39b4
FIX some upgrade sql errors
2022-09-13 15:42:26 +02:00
Laurent Destailleur
b99f4ad29c
Merge pull request #22172 from Hystepik/develop#5
...
Fix : missing column in establishement sql
2022-09-13 02:00:53 +02:00
Laurent Destailleur
7dbde6f934
Merge branch 'develop' into develop_NEW_Service_DefaultWorkstation
2022-09-13 01:38:49 +02:00
lmarcouiller
9dd96b2a03
better fix
2022-09-12 10:50:59 +02:00
Laurent Destailleur
8771dc197b
Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-09-12 10:32:50 +02:00
Hystepik
56a0044974
Merge branch 'develop' into develop#5
2022-09-12 10:16:31 +02:00
Laurent Destailleur
0016e7c5e8
Fix section with root pass restored when required if hidden
2022-09-11 23:47:32 +02:00
Laurent Destailleur
605db7d792
Fix missing creation of table
2022-09-11 22:31:30 +02:00
Laurent Destailleur
07128e3d68
Fix sql for llx_element_categorie
2022-09-11 22:29:54 +02:00
Laurent Destailleur
dc73296794
FIX Test that web dir is correct in install
2022-09-11 22:18:08 +02:00
Laurent Destailleur
34106d2b3e
FIX Test that web dir is correct in install
2022-09-11 21:30:12 +02:00
Laurent Destailleur
62cc9c2482
No trigger with a number higher than 95
2022-09-11 15:11:56 +02:00
Laurent Destailleur
cc4bb9b40f
Add column revenuestamp into order for profroma to match invoice
2022-09-10 19:28:48 +02:00
Laurent Destailleur
b0209ad827
Fix sql
2022-09-10 02:59:19 +02:00
Laurent Destailleur
c601abeff1
Fix missing key for donation module
2022-09-10 01:09:32 +02:00
Laurent Destailleur
81b12c2814
Merge branch 'develop' into Add_notes_to_productlot
2022-09-09 18:02:02 +02:00
lmarcouiller
f22744210e
Fix : missing column in etablishement sql
2022-09-09 11:31:06 +02:00
Laurent Destailleur
da0cf1cbf2
Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-09-08 23:00:10 +02:00
Laurent Destailleur
764e6158eb
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
2022-09-08 22:57:50 +02:00
Laurent Destailleur
c3f673c3ad
Clean permissions for barcode menu
2022-09-08 14:58:00 +02:00
atm-lena
81ed97e9fc
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_NEW_Service_DefaultWorkstation
2022-09-08 11:21:05 +02:00
Lefteris Kotsonis
ec752621dd
Updated llx_product_lot.sql with note entries
2022-09-07 14:07:43 +02:00
Laurent Destailleur
c28966864b
FIX data integrity for llx_delivery table
2022-09-06 01:42:48 +02:00
Lefteris Kotsonis
20e9dc3f07
[NEW][ #22048 ][Added notes to productlot module]
2022-09-05 16:49:57 +02:00
mikygee
6c8f088cc2
Bug #22064 effectif should be 51-100 and 101-500 (not 100-500)
2022-09-04 13:46:19 +02:00
mikygee
66d42049be
Bug #22064 effectif should be 51-100 and 101-500 (not 100-500)
2022-09-04 13:24:23 +02:00
Laurent Destailleur
013bdc5c5f
Update 16.0.0-17.0.0.sql
2022-09-03 11:51:28 +02:00
ptibogxiv
55f8d72219
Update 16.0.0-17.0.0.sql
2022-09-03 10:56:19 +02:00
ptibogxiv
f4a4ecfdf3
NEW private and public note on user.php
...
use same code on Dolibarr
2022-09-03 10:52:33 +02:00
Laurent Destailleur
6e5b1af6ec
Merge pull request #22008 from frederic34/productbatch
...
fix php8 warnings
2022-09-02 10:30:19 +02:00
Laurent Destailleur
5720e7f6d0
Merge pull request #22003 from Adventurousdonut/patch-1
...
New : Add a second Chart of Accounts for Austria
2022-09-02 10:21:21 +02:00
Laurent Destailleur
3b5f907816
Merge pull request #22006 from frederic34/extrafieldsbankline
...
add tables for bank lines extrafields
2022-09-02 10:16:42 +02:00
Laurent Destailleur
027e597776
Merge branch 'develop' into productbatch
2022-09-02 10:11:47 +02:00
Laurent Destailleur
3d9b57ac3f
Clean code
2022-09-02 09:35:10 +02:00
Frédéric France
8e66b7207e
replace ! empty by !empty
2022-08-31 22:14:20 +02:00
Frédéric France
fc01cc66cd
fix php8 warnings
2022-08-31 21:55:55 +02:00
Frédéric FRANCE
7374974880
add tables for bank lines extrafields
2022-08-31 18:40:28 +02:00
Adventurousdonut
596fcd89ae
Update llx_accounting_account_at.sql
2022-08-31 15:52:53 +02:00
Adventurousdonut
204c223b8b
Update llx_accounting_account_at.sql
2022-08-31 15:16:15 +02:00
lmarcouiller
f4ad2d9aa5
Fix : SQL error on 16-17 migration
2022-08-30 11:12:07 +02:00
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
