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

65962 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
ec6e933f66 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2020-01-10 19:47:00 +01:00
Laurent Destailleur
e0c8ccb9fb Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2020-01-10 19:45:35 +01:00
Laurent Destailleur
ef00cb0736 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
 2020-01-10 19:44:52 +01:00
Laurent Destailleur
d7f7f5bf3d Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 2020-01-10 19:42:34 +01:00
Laurent Destailleur
7c0a6946a7 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9 2020-01-10 19:42:15 +01:00
Laurent Destailleur
1ecc1afa9e Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.8 2020-01-10 19:41:49 +01:00
Laurent Destailleur
ceb1e699b7 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.7 2020-01-10 19:37:16 +01:00
Laurent Destailleur
c028819cab FIX clone of purchase order 2020-01-10 19:35:49 +01:00
Laurent Destailleur
5dbf060f00 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/core/lib/functions.lib.php
 2019-12-09 13:24:01 +01:00
Laurent Destailleur
53149bb7cd Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2019-12-08 04:22:50 +01:00
Laurent Destailleur
394104291a Fix function not found when creating a payment of an expense report 2019-12-08 04:22:09 +01:00
Laurent Destailleur
b847eb1b7e
Merge pull request #12056 from atm-florianm/FIX_7.0_email_addresses_in_email_sending_error_message 
FIX 7.0: addresses not displayed in e-mail sending error messages
 2019-10-07 20:25:01 +02:00
Florian Mortgat
2aee62ea28 FIX: $from and $sendto variables are unescaped in the sending error message 
This causes addresses like Tom <tom@examp.le> not to be shown in the message.
 2019-10-07 17:32:52 +02:00
Laurent Destailleur
7aac67f79c
Merge pull request #11884 from frederic34/patch-10 
fix colspan in show_project
 2019-09-14 16:33:02 +02:00
Laurent Destailleur
935e84d985
Merge pull request #11885 from frederic34/patch-12 
Create .stickler.yml
 2019-09-14 16:32:25 +02:00
Laurent Destailleur
fbb8808f29
Merge pull request #11887 from frederic34/patch-14 
Update index.php
 2019-09-14 16:32:11 +02:00
Frédéric FRANCE
00394493eb
Update index.php 2019-09-12 22:02:39 +02:00
Frédéric FRANCE
6db7414f88
Create .stickler.yml 2019-09-12 21:45:04 +02:00
Frédéric FRANCE
0d3a2f800b
fix colspan in show_project 2019-09-12 21:39:57 +02:00
Laurent Destailleur
bdd57ecce7
Merge pull request #11727 from hregis/7.0_price 
FIX avoid sql error if fk_project is empty during update
 2019-08-26 16:38:57 +02:00
Regis Houssin
2d59f6bb3d FIX avoid sql error if fk_project is empty during update 2019-08-23 07:59:36 +02:00
Laurent Destailleur
e8932335aa
Merge pull request #11544 from atm-josselin/FIX_upload_file_with_multiple_spaces 
FIX : correct error in files with multiple spaces
 2019-07-25 17:48:26 +02:00
atm-josselin
0a1f4b7931 FIX : correct error in files with multiple spaces 2019-07-23 09:45:17 +02:00
Laurent Destailleur
4c4a0b796e Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2019-07-22 18:50:59 +02:00
Laurent Destailleur
891eaf50e1 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2019-07-22 18:50:49 +02:00
Laurent Destailleur
45ea80a336
Merge pull request #11530 from atm-florianm/FIX_if_MAIN_USE_COMPANY_NAME_OF_CONTACT_set_socobject_is_a_contact 
FIX: extrafield loading bug due to assumption that an object is a thi…
 2019-07-22 18:43:51 +02:00
Laurent Destailleur
a872b7d42f
Merge pull request #11532 from atm-gauthier/6.0_fix_phone_search 
FIX : search by phone pro
 2019-07-22 18:30:07 +02:00
gauthier
cd7d3f1a36 FIX : search by phone pro 2019-07-19 15:41:44 +02:00
Florian Mortgat
b100cdb9db FIX: extrafield loading bug due to assumption that an object is a third party while it may be a contact if MAIN_USE_COMPANY_NAME_OF_CONTACT is set. 2019-07-19 11:58:21 +02:00
Laurent Destailleur
2035cbaee1
Merge pull request #11440 from atm-maxime/7.0 
Fix wrong column for filters on invoice template list
 2019-07-04 10:46:49 +02:00
Maxime Kohlhaas
6b43c325c7 Fix wrong column for filters on invoice template list 2019-07-02 10:53:47 +02:00
Laurent Destailleur
58a7640dc3
Merge pull request #11417 from atm-maxime/7.0 
Fix invoice list filter on withdrawal card
 2019-06-28 12:41:13 +02:00
Maxime Kohlhaas
fc1d4704a5 Fix invoice list filter on withdrawal card 2019-06-27 17:33:47 +02:00
Laurent Destailleur
e1ee079254 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2019-06-25 23:20:07 +02:00
Laurent Destailleur
c5572e0176 Add info on signature generator 2019-06-25 23:19:00 +02:00
Laurent Destailleur
162498d2f8 Add info on signature generator 2019-06-25 23:18:20 +02:00
Laurent Destailleur
de3ec5682c
Merge pull request #11403 from fmarcet/7.0 
FIX: Not showing Contract and Project columns on ficheinter list
 2019-06-25 13:07:03 +02:00
Ferran Marcet
7f127989b2 FIX: Not showing Contract and Project columns on ficheinter list 2019-06-25 09:55:34 +02:00
Laurent Destailleur
04606ec6a3
Merge pull request #11384 from ATM-Consulting/7.0_fix_mass_send_mail 
FIX mass send mail
 2019-06-24 15:34:06 +02:00
John Botella
ec7ebe9f39 redo backported fix and update adherent substitution methode 2019-06-21 15:32:38 +02:00
John Botella
200b66d11f Remove a backported fix because failling at init test 2019-06-21 14:52:12 +02:00
Laurent Destailleur
9093be2f0a FIX Add missing end date of subscription in export 2019-06-21 11:23:49 +02:00
John Botella
b21006614c Fix substitutions null 2019-06-20 12:00:44 +02:00
John Botella
6a68c8cd99 Fix display option email per participient 2019-06-20 11:09:37 +02:00
John Botella
9305403bea Fix duplicate pdf in mass sendmail 2019-06-20 10:32:32 +02:00
John Botella
252bd6d9ba FIX condition 2019-06-20 09:48:08 +02:00
John Botella
7c29fb614c Fix replacement and vars names 2019-06-20 09:21:35 +02:00
Laurent Destailleur
5bac3d4d2b
Merge pull request #11332 from atm-gauthier/7.0_fix_syntax_error 
FIX : syntax error
 2019-06-14 13:35:40 +02:00
Laurent Destailleur
319bc7ec8a Fix syntax error 2019-06-13 12:12:20 +02:00
gauthier
28218a00b3 FIX : syntax error 2019-06-13 11:01:12 +02:00