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

79899 Commits

Author SHA1 Message Date
Laurent Destailleur
1bb2fc0db4 css 2020-10-22 22:45:27 +02:00
Laurent Destailleur
19efd633e9
Merge pull request #15107 from frederic34/patch-4 
Update api_contracts.class.php
 2020-10-22 21:59:47 +02:00
Laurent Destailleur
c77184c848 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-22 21:57:24 +02:00
Laurent Destailleur
0e442abd36 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2020-10-22 21:57:13 +02:00
Laurent Destailleur
15bbba3f52 Remove warning 2020-10-22 21:55:01 +02:00
Frédéric FRANCE
12dc82c340
Update api_contracts.class.php 2020-10-22 21:51:42 +02:00
Laurent Destailleur
a5e2ab2822
Merge pull request #15106 from frederic34/rejet 
add type
 2020-10-22 21:36:36 +02:00
Laurent Destailleur
42963f3059
Merge pull request #15105 from frederic34/patch-6 
Update product.class.php
 2020-10-22 21:36:11 +02:00
Laurent Destailleur
4917fb187e
Merge pull request #15104 from ptibogxiv/patch-389 
FIX lang to #15055
 2020-10-22 21:35:37 +02:00
Laurent Destailleur
8505810f90
Merge pull request #15103 from hregis/develop_bug2 
FIX sql syntax error
 2020-10-22 21:35:14 +02:00
Frédéric FRANCE
f4b42234ec
add space 2020-10-22 21:32:12 +02:00
Laurent Destailleur
9699bdc0fa Fix phpcs 2020-10-22 21:31:34 +02:00
Frédéric FRANCE
02403ba640
add type 2020-10-22 21:29:33 +02:00
Frédéric FRANCE
36ad3bfbc9
Update product.class.php 2020-10-22 21:11:49 +02:00
ptibogxiv
f3848dac1e
FIX lang to #15055 2020-10-22 20:06:56 +02:00
Laurent Destailleur
b61e5dc9eb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-22 20:03:41 +02:00
Laurent Destailleur
8074d2cc1d NEW Add validation of MX domain for emails 2020-10-22 20:01:59 +02:00
Regis Houssin
cbb6e4effe FIX sql syntax error 2020-10-22 19:32:32 +02:00
Laurent Destailleur
62d3d1690e
Merge pull request #15102 from fappels/develop_fix_user_list 
Fix user list SQL error when user module has extrafields
 2020-10-22 18:35:28 +02:00
Laurent Destailleur
c05b96f58e
Merge pull request #15099 from joseplluis/patch-10 
NEW form to add customer/supplier into categories
 2020-10-22 18:33:29 +02:00
Laurent Destailleur
a6484e933b Css 2020-10-22 18:28:47 +02:00
Laurent Destailleur
fb7202b7f8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-22 17:55:47 +02:00
Laurent Destailleur
0616b9bc9b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/prelevement/card.php
	htdocs/compta/prelevement/line.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/lib/functions2.lib.php
	htdocs/core/tpl/card_presend.tpl.php
	htdocs/expensereport/class/expensereport.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2020-10-22 17:55:38 +02:00
Francis Appels
89f00b9114 Fix user list when user module has extrafields 2020-10-22 17:54:33 +02:00
Laurent Destailleur
a17c391efe Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
	htdocs/product/composition/card.php
 2020-10-22 17:38:48 +02:00
Laurent Destailleur
cfcac7e053 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/core/lib/functions2.lib.php
 2020-10-22 17:34:48 +02:00
Laurent Destailleur
a826e328c1 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-10-22 17:31:40 +02:00
Laurent Destailleur
31f1ab73b1 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-10-22 17:31:29 +02:00
Laurent Destailleur
f04dc4de15
Merge pull request #15050 from frederic34/patch-4 
Fix upload photo
 2020-10-22 17:24:06 +02:00
Laurent Destailleur
30d39f890c
Merge pull request #15054 from ptibogxiv/patch-387 
NEW display date range if exist in takepos
 2020-10-22 17:16:46 +02:00
Laurent Destailleur
7816e5d757
Merge pull request #15055 from ptibogxiv/patch-388 
NEW add alert before change thirdparty in takepos
 2020-10-22 17:16:19 +02:00
Philippe GRAND
a2b3dbd8f8 fix : deprecated 2020-10-22 16:47:35 +02:00
Philippe GRAND
dc0d9e46b8 fix : deprecated 2020-10-22 16:46:45 +02:00
Philippe GRAND
74fc38395c fix : deprecated 2020-10-22 16:44:26 +02:00
Philippe GRAND
e0639209a7 fix : deprecated 2020-10-22 16:43:35 +02:00
Philippe GRAND
0fc054a624 fix : deprecated 2020-10-22 16:43:02 +02:00
Philippe GRAND
3ee7cfc1b7 fix : deprecated 2020-10-22 16:42:32 +02:00
Philippe GRAND
a8b25e32f0 fix : deprecated 2020-10-22 16:40:58 +02:00
Philippe GRAND
d5e456fd36 fix : deprecated 2020-10-22 16:40:03 +02:00
Philippe GRAND
3854808d21 fix : deprecated 2020-10-22 16:39:21 +02:00
Florian HENRY
10a3786bab fix MAIN_AUTOFILL_DATE for expense payment date 2020-10-22 16:38:59 +02:00
Philippe GRAND
9dc93b0e29 fix : deprecated 2020-10-22 16:38:43 +02:00
Philippe GRAND
52b602b1ce fix : deprecated 2020-10-22 16:38:02 +02:00
Philippe GRAND
9260eed12a fix : deprecated 2020-10-22 16:37:06 +02:00
Philippe GRAND
1319765a4f fix : deprecated 2020-10-22 16:35:47 +02:00
Laurent Destailleur
3369379ba1
Update card.php 2020-10-22 16:34:23 +02:00
Philippe GRAND
1ca6068a41 fix : deprecated 2020-10-22 16:34:12 +02:00
Philippe GRAND
fae572d43a fix : deprecated 2020-10-22 16:29:17 +02:00
Laurent Destailleur
ec2a91471e
Merge pull request #15096 from dvasseur/patch-1 
NEW Allow to edit "demand reason" field though API
 2020-10-22 16:19:11 +02:00
Marc de Lima Lucio
34dd486b6c FIX: virtual products: displayed value is by unit 2020-10-22 16:18:37 +02:00