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

5498 Commits

Author SHA1 Message Date
Laurent Destailleur
62231d5b2f
Merge pull request #23042 from lamrani002/fix_issue_tooLong_reponse 
fix issue #23027
 2022-12-01 11:08:25 +01:00
Lamrani Abdel
9d59f0e038 add request migration to table opensurvey_user_studs 2022-11-30 11:32:13 +01:00
Lamrani Abdel
46d57f548d modify size of column responses 2022-11-29 17:48:05 +01:00
Laurent Destailleur
35ffe970a9 Fix sql migration 2022-11-29 10:09:29 +01:00
hystepik
da5a65019a add protection by month on public 2022-11-28 16:07:23 +01:00
Laurent Destailleur
587daa77ea Better setup by default 2022-11-25 12:27:53 +01:00
Laurent Destailleur
e4a3126cf8 Fix bad value 'system' for AC_OTH 2022-11-25 10:42:33 +01:00
fboitel
00f5a2ddc8
Merge branch 'Dolibarr:develop' into FIX-SECURITY-Fail2ban-public-pages 2022-11-24 19:10:35 +01:00
Faustin
9a028c9137 Limit survey answer on public page by ip adress 2022-11-24 13:10:43 +01:00
Faustin
0901bf55c3 Limit eventorganization attendee on public page by ip adress + fix some bugs on that page 2022-11-24 10:58:43 +01:00
Laurent Destailleur
40bc26a666 NEW Ad the target to select attendees of event for emailings 2022-11-23 21:29:15 +01:00
Faustin
dfb10f7362 Limit booth suggest on public page by ip adress 2022-11-23 19:51:34 +01:00
Faustin
1e88704a14 Limit project creation on public page by ip adress 2022-11-23 17:32:32 +01:00
Laurent Destailleur
1c43d40acf Debug v17 2022-11-20 14:37:31 +01:00
kkhelifa
97d2d4a17b Deplacement requete de migration 2022-11-18 11:03:05 +01:00
kkhelifa
5c67c37636 Merge branch 'develop' of github.com:Dolibarr/dolibarr into 14.0_fix_show_prospecting_level_on_contact_list_by_normalize_the_field_name 2022-11-18 11:00:05 +01:00
Laurent Destailleur
2f0d9e18bd Fix missing default bank account on form 2022-11-17 23:29:42 +01:00
Laurent Destailleur
259ff07bbd Add missing index 2022-11-17 01:19:31 +01:00
Laurent Destailleur
25c074668d Fix perf index 2022-11-15 22:24:30 +01:00
Laurent Destailleur
a17c9d5d36 Fix perf index 2022-11-15 22:23:10 +01:00
Laurent Destailleur
78e1e6be8c Remove default deprecated constant 2022-11-15 14:09:08 +01:00
Laurent Destailleur
a5aab68958 Fix duplicate data c_action_trigger and c_tva 2022-11-15 13:53:45 +01:00
Laurent Destailleur
1c287297c0 Fix duplicate data c_action_trigger and c_tva 2022-11-15 13:51:37 +01:00
Laurent Destailleur
e84dd8d074 NEW Init module bookcal 2022-11-14 01:27:05 +01:00
Laurent Destailleur
ddf60b399e Fix better separation label journal and label transfer 2022-11-07 21:48:52 +01:00
Alexandre SPANGARO
a3e34f20e0 Merge remote-tracking branch 'upstream/develop' into 17b15 2022-11-06 17:07:38 +01:00
Alexandre SPANGARO
13c7ddddbf FIX Accountancy - the pages of generations of entries are not journals, this term must be removed 2022-11-06 16:51:12 +01:00
kkhelifa
60eb3340d1 FIX: Fix the prospecting level colomn on contact list by normalize the field namein the table with the name defined in the fields list of the contact class 2022-11-04 17:32:48 +01:00
Laurent Destailleur
a565b297fd
Merge pull request #22730 from frederic34/overwritetrans 
add same translation in many entities
 2022-11-02 16:10:51 +01:00
Frédéric FRANCE
ca77beeff6 add same translation in many entities 2022-11-02 14:32:14 +01:00
Laurent Destailleur
2e8f0b77be Add column for birth place 2022-11-02 02:20:48 +01:00
Laurent Destailleur
840428200c Add fields to allow SEPA payments of salaries 2022-10-31 08:27:25 +01:00
Laurent Destailleur
18c9685051 Rename table to prepare need of direct debit for non invoices 2022-10-28 17:51:25 +02:00
Laurent Destailleur
06fcf5312f Close #22512 manually due to error in sticket (missing space after cast) 2022-10-25 17:30:50 +02:00
Laurent Destailleur
1a2347ff60
Merge pull request #22649 from fappels/develop_fix_migration 
Fix migration script when running on mysql 8
 2022-10-25 14:44:41 +02:00
Laurent Destailleur
4eeb73276a Close #22650 2022-10-24 19:38:38 +02:00
Laurent Destailleur
6b2cc119ed
Merge branch 'develop' into develop_fix_migration 2022-10-24 19:14:24 +02:00
Maxime Kohlhaas
cb2f940718 Fix SQL error on install llx_establishment 2022-10-23 12:20:11 +02:00
Laurent Destailleur
c1213cfde8 Fix missing code for triggers 2022-10-21 16:34:13 +02:00
Laurent Destailleur
fc64bcf56f Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-10-21 13:22:27 +02:00
Laurent Destailleur
1d21d73400 NEW Add date event (!= date project) and location on event organization 2022-10-21 13:19:21 +02:00
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
UT from dolibit
4e416dbdad
Update llx_10_c_regions.sql 2022-10-13 10:24:37 +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
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
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
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
Laurent Destailleur
eefcc49006 NEW Add index on name for company and contact 2022-09-28 15:58:10 +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
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
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
Hystepik
56a0044974
Merge branch 'develop' into develop#5 2022-09-12 10:16:31 +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
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
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
3d9b57ac3f Clean code 2022-09-02 09:35:10 +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
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
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
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
b15a4e504e Merge IMAP with phpimap 2022-08-23 22:34:24 +02:00
Laurent Destailleur
36b5195da9 Doc 2022-08-23 01:03:39 +02:00
Laurent Destailleur
5cb3191ecd Doc 2022-08-23 00:46:03 +02:00
Laurent Destailleur
4c13b08258 Move state into llx_oauth_token 2022-08-22 22:12:13 +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
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
Faustin
3bf8730c55 New imap by oauth2 works, but somes features left 2022-08-16 17:23:57 +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
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
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
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
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
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
lvessiller
8f338d84b0 FIX resolve conflicts 2022-07-15 17:35:19 +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
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