Commit Graph

94005 Commits

Author SHA1 Message Date
Laurent Destailleur
0c4d9c2e3a
Merge pull request #16004 from Hystepik/develop#2
Fix #15970 user.class.php
2021-01-19 10:54:24 +01:00
Laurent Destailleur
8cd8f21fde
Update user.class.php 2021-01-19 10:53:47 +01:00
Laurent Destailleur
7ad7ad9bb8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-19 10:43:31 +01:00
Laurent Destailleur
2c6d11e040 When creating invoice by mass action, message has link to invoice 2021-01-19 10:42:43 +01:00
lmarcouiller
73eee33f8a redo of pull request with sql updated 2021-01-19 09:24:15 +01:00
lmarcouiller
e9ac1e3443 Merge branch 'develop#2' of github.com:Hystepik/dolibarr into develop#2 2021-01-19 09:16:23 +01:00
lmarcouiller
00fb045e40 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#2 2021-01-19 09:16:14 +01:00
Frédéric FRANCE
36eeef81bf
code syntax 2021-01-19 00:41:39 +01:00
Laurent Destailleur
6d251e6a43
Merge pull request #15963 from FHenry/13.0
fix thirdparty list filter type_ent can be empty
2021-01-18 19:21:58 +01:00
Laurent Destailleur
d69ce5b917
Merge pull request #15952 from FHenry/12_fix_autofill_date_payment
12 fix autofill date payment
2021-01-18 19:20:33 +01:00
Laurent Destailleur
ca7b644072
Merge pull request #16007 from dolibit-ut/patch-65
Update dolibarr
2021-01-18 19:19:46 +01:00
Laurent Destailleur
11adbb7b73
Merge pull request #16006 from hregis/fix_update_db_model
FIX try to save again (no changes)
2021-01-18 19:19:10 +01:00
lmarcouiller
21141f0788 Fix #16010 update fournisseur.product.class.php 2021-01-18 19:18:10 +01:00
Florian HENRY
a8cdecf1b8 better fix 2021-01-18 19:17:23 +01:00
Laurent Destailleur
0a422f44dc
Merge pull request #16011 from Hystepik/develop#3
Fix #16010 update fournisseur.product.class.php
2021-01-18 19:16:41 +01:00
David Bensel
9813cb430a FIX: type 'sellist' not handled properly in showInputField and showOutputField 2021-01-18 19:14:12 +01:00
Laurent Destailleur
a7dc9c6585
Merge pull request #16014 from davidNDU/develop
# Fix: type 'sellist' not handled properly in showInputField and showOutputField
2021-01-18 19:12:55 +01:00
Florian HENRY
6b61545189 Merge branch '12.0' of github.com:Dolibarr/dolibarr into 12_fix_autofill_date_payment 2021-01-18 19:07:30 +01:00
Laurent Destailleur
2baeec1537
Merge pull request #15964 from FHenry/12.0
extrafeild selllist can be use with string fk
2021-01-18 18:53:01 +01:00
Laurent Destailleur
bb752fa83d Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/core/tpl/card_presend.tpl.php
2021-01-18 18:50:57 +01:00
Laurent Destailleur
7195a6880f
Merge pull request #15992 from atm-kevin/FIX/GETPOST_param_card_presend
FIX : missing GETPOST parameters on card_presend.tpl.php
2021-01-18 18:49:28 +01:00
Laurent Destailleur
f76df625a9
Merge pull request #16009 from dolibit-ut/patch-67
Update Links on GPL.txt
2021-01-18 18:44:16 +01:00
Laurent Destailleur
5772d0e425
Merge pull request #16008 from dolibit-ut/patch-66
Update barcode_EAN13.txt
2021-01-18 18:43:59 +01:00
stickler-ci
7e0f83d97e Fixing style errors. 2021-01-18 16:06:06 +00:00
lmarcouiller
7c7f80fb59 update pull request with sql in simple quotes 2021-01-18 17:05:15 +01:00
lmarcouiller
494bb3ee5c Fix #16010 update fournisseur.product.class.php 2021-01-18 16:39:36 +01:00
UT from dolibit
337c3730df
Update Links on GPL.txt
add  [EN] https://www.gnu.org/licenses/quick-guide-gplv3.en.html
2021-01-18 16:19:50 +01:00
UT from dolibit
ca7c535980
Update barcode_EAN13.txt 2021-01-18 16:11:43 +01:00
UT from dolibit
5f15c339c7
Update dolibarr
/var/run/php/php7.0-fpm.sock
2021-01-18 16:03:27 +01:00
David Bensel
85d63891d9 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2021-01-18 17:33:22 +03:00
David Bensel
b777a0660c FIX: type 'sellist' not handled properly in showInputField and showOutputField 2021-01-18 17:31:49 +03:00
Regis Houssin
26e74d56b3 FIX try to save again (no changes) 2021-01-18 15:28:06 +01:00
Laurent Destailleur
f95bf56c15 Fix translation 2021-01-18 15:24:50 +01:00
Laurent Destailleur
3ff720f8d0
Merge pull request #15999 from frederic34/boxdolibarrstat
fix unknown variable
2021-01-18 15:18:07 +01:00
Laurent Destailleur
38f353c047
Merge pull request #16000 from frederic34/patch-1
fix variable declaration
2021-01-18 15:16:49 +01:00
Laurent Destailleur
6ff99af8e4
Merge pull request #16005 from dolibit-ut/patch-64
Update robots.txt
2021-01-18 15:14:40 +01:00
UT from dolibit
09b4d9d20a
Update robots.txt
add  Allow: /public/members/new.php
2021-01-18 14:45:32 +01:00
lmarcouiller
841736df87 Fix #15970 user.class.php 2021-01-18 14:20:30 +01:00
Laurent Destailleur
a109dd8948 Fix removed unexpected values in stats graph
Conflicts:
	htdocs/projet/graph_opportunities.inc.php
2021-01-18 13:55:11 +01:00
Laurent Destailleur
b46d1fa6a1 Fix removed unexpected values in stats graph 2021-01-18 13:51:35 +01:00
Laurent Destailleur
512745920a css 2021-01-18 13:47:29 +01:00
Laurent Destailleur
5a4ab3d00e Fix look and feel v13 2021-01-18 12:07:40 +01:00
Laurent Destailleur
d5fd07e478 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-18 11:07:55 +01:00
Laurent Destailleur
250b530b29 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/filefunc.inc.php
2021-01-18 11:07:46 +01:00
Laurent Destailleur
c69631d646 Fix css for multiselect component that are fist hidden 2021-01-18 11:05:02 +01:00
Florian HENRY
58eeb7152b Merge branch '12.0' into 13.0 2021-01-18 09:19:05 +01:00
Florian HENRY
c4f8e81d5d better fix 2021-01-18 09:18:42 +01:00
Florian HENRY
21429622d6 Merge branch '12.0' into 13.0 2021-01-18 09:16:48 +01:00
Florian HENRY
1cd0f71c09 Merge branch '12.0' of github.com:Dolibarr/dolibarr into 12.0 2021-01-18 09:12:29 +01:00
Florian HENRY
33a0cf078c better fix 2021-01-18 09:12:23 +01:00