Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-14 13:31:28 +01:00
Code Issues Packages Projects Releases Wiki Activity
122,559 Commits 36 Branches 190 Tags
e65c85dc44f7ddbb9d2931be2d01eaed85b51a99
Commit Graph

7539 Commits

Author SHA1 Message Date
Regis Houssin
3029804db7 FIX compatibility with Multicompany 2021-10-20 19:21:18 +02:00
Laurent Destailleur
e43b33028c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/card.php
 2021-10-20 15:06:10 +02:00
Laurent Destailleur
8e68f452ed Merge branch 'develop' into develop_NEW_block_leave_if_negative_balance 2021-10-20 14:48:06 +02:00
Regis Houssin
f38fca8174 FIX wrong array key value 2021-10-20 13:35:30 +02:00
Laurent Destailleur
e4d0bf7a91 Merge pull request #18967 from aspangaro/15a23 
NEW Add sortorder on units list
 2021-10-20 12:50:32 +02:00
Gauthier PC portable 024
4614b0dd65 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers 2021-10-20 09:13:58 +02:00
Laurent Destailleur
b9540c3eb6 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	ChangeLog
	htdocs/adherents/card.php
	htdocs/filefunc.inc.php
	htdocs/install/repair.php
 2021-10-20 03:38:10 +02:00
atm-florian
d0d5955fb1 FIX 13.0: sometimes firstname was mistyped as fistname 2021-10-18 12:09:33 +02:00
Florian HENRY
5f4410468d add filed budget in task 2021-10-15 10:24:56 +02:00
Marc de Lima Lucio
29768a1c6e Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms 2021-10-13 11:33:04 +02:00
Alexandre SPANGARO
41d6a96342 Merge remote-tracking branch 'upstream/develop' into 15a23 2021-10-13 03:29:57 +02:00
Alexandre SPANGARO
3a04a0115b Add data sortorder 2021-10-13 03:26:39 +02:00
Gauthier PC portable 024
ca18db8f50 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers 2021-10-11 16:01:47 +02:00
Laurent Destailleur
e3045f24cd Merge pull request #18923 from aspangaro/15a24 
NEW Societe - Add perentity functionality on customer/supplier accountancy auxiliary account
 2021-10-11 15:20:27 +02:00
Alexandre SPANGARO
754b13a83f NEW Add sortorder on units list 2021-10-11 08:58:00 +02:00
Alexandre SPANGARO
c7fd9328cd NEW Societe - Add perentity functionality on customer/supplier accountancy auxiliary account 2021-10-08 06:29:22 +02:00
Gauthier PC portable 024
fb74d23ae8 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers 2021-10-07 13:40:52 +02:00
Laurent Destailleur
2cb0edb5eb Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/public/project/suggestbooth.php
	htdocs/public/project/suggestconference.php
 2021-10-07 11:01:53 +02:00
Laurent Destailleur
9b5909300e Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/compta/paiement/card.php
	htdocs/fourn/facture/card.php
 2021-10-07 11:00:00 +02:00
Gauthier PC portable 024
70648477a7 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers 2021-10-07 10:37:09 +02:00
Alexandre SPANGARO
24e3dd0992 Prepare sql 2021-10-07 06:05:36 +02:00
Laurent Destailleur
ec545f8967 Fix data 2021-10-07 02:58:51 +02:00
Laurent Destailleur
89b2ecf504 Add missing migration sql 2021-10-06 13:28:05 +02:00
Laurent Destailleur
0cf18ded80 Merge pull request #18866 from marc-dll/14.0_FIX_holiday_increments_pgsql 
FIX: postgresql compatibility with camelcase fields
 2021-10-06 13:26:57 +02:00
Laurent Destailleur
8f9a7f4e35 Update 13.0.0-14.0.0.sql 2021-10-06 13:26:42 +02:00
Laurent Destailleur
ff56415c00 Merge pull request #18903 from aspangaro/15a21 
HTML5 - <font> tag is deprecated, replace by <span>
 2021-10-05 16:51:41 +02:00
Marc de Lima Lucio
fdb6ebe80e FIX: postgresql: rename the oly column with uppercase characters to lowercase 2021-10-05 16:18:56 +02:00
Marc de Lima Lucio
b173832d54 NEW: deposit payment terms: add a 30% deposit example payment term at install/migration 2021-10-05 15:42:40 +02:00
Marc de Lima Lucio
6ed9e00b4d Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms 2021-10-05 13:35:50 +02:00
Alexandre SPANGARO
2e49eee106 HTML5 - <font> tag is deprecated, replace by <span> 2021-10-05 09:52:45 +02:00
Laurent Destailleur
5ad02ccc32 MAIN_EMAIL_ADD_TRACK_ID removed, MAIN_FIX_FOR_BUGGED_MTA 1 by defaut 2021-10-05 09:11:20 +02:00
Laurent Destailleur
950fccc186 Merge branch 'develop' into NEW_deposit_payment_terms 2021-10-04 19:06:42 +02:00
Laurent Destailleur
1c56f65c27 Fix missing migration instruction 2021-10-04 11:49:49 +02:00
Gauthier PC portable 024
73e741ca74 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers 2021-10-04 11:10:38 +02:00
Quentin VIAL-GOUTEYRON
05cd74a64e missing migration file incoterm stocktransfer 2021-10-04 08:46:24 +02:00
Alexandre SPANGARO
94166cdb7e FIX Remove Isle of Man of ECC's countries 2021-10-03 05:36:53 +02:00
Laurent Destailleur
2f813e0b6a Merge pull request #18832 from atm-gauthier/NEW/integration_GPEC_sql 
NEW : integration HRM sql and migration files
 2021-10-02 21:18:50 +02:00
Laurent Destailleur
f479c2bc77 Merge pull request #18868 from frederic34/patch-1 
Fix migration Update 14.0.0-15.0.0.sql
 2021-10-02 20:50:10 +02:00
Laurent Destailleur
55e97784bd FIX #18880 2021-10-02 20:42:54 +02:00
Frédéric FRANCE
87cbc2b555 Update 14.0.0-15.0.0.sql 2021-10-01 08:24:40 +02:00
Gauthier PC portable 024
433132de9a FIX : llx_hrm_position > llx_hrm_job_user 2021-10-01 07:49:31 +02:00
Marc de Lima Lucio
78b593c067 FIX: leave request block moved to v15 2021-09-30 17:42:59 +02:00
Marc de Lima Lucio
5f826f78a1 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_NEW_block_leave_if_negative_balance 2021-09-30 17:41:38 +02:00
Laurent Destailleur
673a2982a5 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/opensurvey/card.php
 2021-09-30 16:32:40 +02:00
Laurent Destailleur
3d4bb66853 Clean code 2021-09-30 15:59:47 +02:00
Laurent Destailleur
3565a47954 Merge branch 'develop' into NEW_develop_virtual_product_DragAndDrop 2021-09-30 14:24:30 +02:00
Laurent Destailleur
11c48a53a5 Fix name of file 2021-09-29 17:20:59 +02:00
Quentin VIAL-GOUTEYRON
8de4d3d1a4 NEW incoterms 2021-09-29 16:56:57 +02:00
Marc de Lima Lucio
ab48351d15 NEW: deposit payment terms: database fields 2021-09-29 11:10:58 +02:00
Gauthier PC portable 024
419ff967e3 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/integration_GPEC_sql 2021-09-29 07:52:13 +02:00