Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
106,460 Commits 36 Branches 189 Tags
ccbbc98f7a8f0977d5085a309e7c7c3b4dbaaa0d
Commit Graph

3440 Commits

Author SHA1 Message Date
Laurent Destailleur
52bacbd914 Tables for emailing and asset modules are loaded on module activation 2022-02-10 19:21:15 +01:00
Laurent Destailleur
3bc064ac55 Add status on tasks 2022-02-10 19:08:35 +01:00
Laurent Destailleur
d2af490b33 Fix missing key on a new table 2022-02-10 13:12:00 +01:00
Laurent Destailleur
21f0264683 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-10 13:02:48 +01:00
Laurent Destailleur
760b8caa31 Fix migration 2022-02-10 11:26:36 +01:00
Laurent Destailleur
d69f9eca40 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/pdf.lib.php
 2022-02-10 11:25:15 +01:00
Laurent Destailleur
9412bcdba0 Merge pull request #20009 from OPEN-DSI/new_variants_remake_sql2 
NEW: Update variants to standard card and list (SQL)
 2022-02-10 11:03:32 +01:00
Laurent Destailleur
06fe8c391e Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/core/lib/pdf.lib.php
	htdocs/install/mysql/tables/llx_propaldet.sql
 2022-02-10 10:23:42 +01:00
Laurent Destailleur
77f1649adf Merge pull request #20012 from atm-adrien/NEW_rec_invoices_15.0_newPR 
NEW Recurring vendor invoices
 2022-02-10 10:09:47 +01:00
Laurent Destailleur
6ff39da34d Update 15.0.0-16.0.0.sql 2022-02-10 10:09:05 +01:00
Thomas Negre
b21fdbb21e add a field date_last_msg_sent in ticket.sql install file 
modify migration script
 2022-02-07 15:19:13 +01:00
Adrien Raze
5bee821726 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_rec_invoices_15.0_newPR 2022-02-07 14:37:10 +01:00
Adrien Raze
ee52cac3ba NEW : Template supplier invoices 2022-02-07 14:34:27 +01:00
kamel
75653395fd NEW: Update variants to standard card and list (SQL) 2022-02-07 10:12:41 +01:00
Alexandre SPANGARO
ea83b9c11c FIX Propal - Missing field import_key in import propal line 2022-02-06 13:56:57 +01:00
Laurent Destailleur
86da9c610e Merge pull request #17887 from marc-dll/develop_NEW_block_leave_if_negative_balance 
NEW: leave requests: add field into type dictionary to block request if balance is negative
 2022-02-04 20:23:04 +01:00
atm-lena
d6ff551702 Add column "fk_parent_line" to llx_mrp_mo 2022-02-02 15:15:22 +01:00
Laurent Destailleur
2fea78c90a Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/install/mysql/data/llx_c_action_trigger.sql
 2022-01-29 16:48:40 +01:00
Laurent Destailleur
adf8f3886b Merge 2022-01-28 18:07:56 +01:00
Anthony Berton
6fdbda93f8 Update 14.0.0-15.0.0.sql 2022-01-28 02:28:55 +01:00
Juanjo Menent
56cb81287e Merge remote-tracking branch 'upstream/develop' into develop_hotfix19760 
# Conflicts:
#	htdocs/install/mysql/migration/15.0.0-16.0.0.sql
 2022-01-25 16:25:44 +01:00
Laurent Destailleur
13f66df975 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-01-25 15:43:57 +01:00
Laurent Destailleur
c3a58ae303 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-01-25 15:43:42 +01:00
Laurent Destailleur
4b00ddb0b5 Merge pull request #19866 from atm-gauthier/FIX_hrm_divers 
FIX : rankorder + vacant positions
 2022-01-25 14:02:44 +01:00
Anthony Berton
13dbadf770 Update 15.0.0-16.0.0.sql 2022-01-25 00:19:41 +01:00
Anthony Berton
1d265d801a Update 14.0.0-15.0.0.sql 2022-01-25 00:19:09 +01:00
Anthony Berton
1bd86e4bae Update 14.0.0-15.0.0.sql 2022-01-25 00:11:04 +01:00
Laurent Destailleur
be01e3b1ac Migration 2022-01-24 14:48:18 +01:00
Laurent Destailleur
38dbaa3d07 Doc 2022-01-24 14:12:27 +01:00
Florian HENRY
3063006d61 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_BDD_19763 2022-01-22 18:12:32 +01:00
Laurent Destailleur
a16293f9b7 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-01-22 17:27:57 +01:00
Laurent Destailleur
1dcfb88ad4 Debug v15 2022-01-21 13:44:40 +01:00
Juanjo Menent
0fb9e9c988 Merge remote-tracking branch 'upstream/develop' into develop_hotfix19760 
# Conflicts:
#	htdocs/install/mysql/migration/15.0.0-16.0.0.sql
 2022-01-21 12:42:51 +01:00
Florian HENRY
8141e3e460 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_BDD_19763 2022-01-19 13:30:39 +01:00
Laurent Destailleur
c2c74f4849 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-01-19 02:02:52 +01:00
Anthony Berton
f093e01cec Update 14.0.0-15.0.0.sql 2022-01-18 19:34:18 +01:00
Laurent Destailleur
6276bb77ad Prepare v16 2022-01-18 13:17:59 +01:00
Gauthier PC portable 024
255d8ba753 FIX : rankorder + vacant positions 2022-01-18 10:59:10 +01:00
Laurent Destailleur
744296a43a FIX Permission on holiday and expensereport. 2022-01-14 13:52:08 +01:00
Laurent Destailleur
00108589fd Fix creation of fields tms into sql scripts 2022-01-11 01:00:31 +01:00
Juanjo Menent
840b0e4843 FIX #19760 Uniformize label length 2022-01-08 14:47:40 +01:00
Laurent Destailleur
3a6b5199ec Debug module intracomm 2022-01-08 01:19:04 +01:00
Florian HENRY
f5788bef66 OK BDD 2022-01-07 12:20:27 +01:00
Laurent Destailleur
fbce09f21b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/customer/index.php
	htdocs/compta/facture/card.php
	htdocs/reception/card.php
 2021-12-19 00:36:22 +01:00
Laurent Destailleur
fcb10df570 Fix size of origintype 2021-12-17 09:54:03 +01:00
Laurent Destailleur
494e9a2745 Merge branch 'develop' into develop_NEW_block_leave_if_negative_balance 2021-12-16 19:12:06 +01:00
Laurent Destailleur
43e682b56f Fix several pb with down payments 2021-12-16 12:33:45 +01:00
Laurent Destailleur
3abb3f5018 Debug inventory feature 2021-12-12 00:05:31 +01:00
Laurent Destailleur
8cdc5726a0 Fix column length 2021-12-10 10:26:20 +01:00
Laurent Destailleur
7b68ef1fb8 Clean/Debug module hrm. 2021-11-27 14:46:47 +01:00