lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
93,950 Commits 43 Branches 150 Tags 886 MiB
113ef1a02b
Commit Graph

93950 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
113ef1a02b Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/user/class/user.class.php
 2021-01-19 16:21:53 +01:00
Laurent Destailleur
803ae91136 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-01-19 16:20:19 +01:00
Laurent Destailleur
755de9fff2 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-01-19 16:19:46 +01:00
Laurent Destailleur
a0fe2a8abc
Merge pull request #16022 from frederic34/patch-1 
Update .gitignore
 2021-01-19 16:19:26 +01:00
Laurent Destailleur
fd65a2adc1 FIX #15955 2021-01-19 16:04:21 +01:00
Laurent Destailleur
560d401cff Code comment 2021-01-19 15:54:24 +01:00
Laurent Destailleur
a81b3a0d61 FIX #15946 2021-01-19 15:23:36 +01:00
Laurent Destailleur
0917b37bb9 FIX #15966 #15967 2021-01-19 15:20:35 +01:00
Frédéric FRANCE
b2d790b46a
Update .gitignore 2021-01-19 14:27:31 +01:00
Laurent Destailleur
2d8ca513d6 Fix param 'all' 2021-01-19 12:55:24 +01:00
Laurent Destailleur
7472b102e4 Fix name of constraints 2021-01-19 12:32:37 +01:00
Laurent Destailleur
7cb8d5af55 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-19 12:25:28 +01:00
Laurent Destailleur
f54efca075 Clean code 2021-01-19 12:25:05 +01:00
Laurent Destailleur
01996261dc
Merge pull request #15985 from frederic34/codesyntax 
code syntax
 2021-01-19 11:29:18 +01:00
Laurent Destailleur
03d8c6bfd6 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/compta/paiement_charge.php
 2021-01-19 10:59:42 +01:00
Laurent Destailleur
934070f14e Backport FIx #15970 2021-01-19 10:56:46 +01:00
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