Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
71,061 Commits 36 Branches 189 Tags
01e7b5747d3ece7bb4623c8889ffa98ebb39bc7c
Commit Graph

6304 Commits

Author SHA1 Message Date
John
63180f45a8 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_avoir_situation 2018-04-09 09:17:26 +02:00
Frédéric FRANCE
f5b49aa93b do not fill error with success message 2018-04-09 00:21:29 +02:00
Laurent Destailleur
259f3b3020 Add hidden option MAIN_SHOW_ALL_FILES_ON_DOCUMENT_TOOLTIP 2018-04-07 13:23:26 +02:00
Laurent Destailleur
093c367609 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formfile.class.php
 2018-04-07 13:20:22 +02:00
Laurent Destailleur
5a34a22934 Code comment 2018-04-07 13:04:52 +02:00
Laurent Destailleur
85d4f7115b Better position of the substitution tooltip for emails 2018-04-06 16:16:08 +02:00
Laurent Destailleur
9ce5d02fde Merge pull request #8517 from bafbes/master700 
define module part to include external modules menus
 2018-04-06 11:26:23 +02:00
Laurent Destailleur
151245a5e4 Update conf.class.php 2018-04-06 11:25:48 +02:00
Laurent Destailleur
658e1224d1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-05 19:53:09 +02:00
Laurent Destailleur
48ff89c63b Fix regression 2018-04-05 19:52:54 +02:00
Laurent Destailleur
2d547abaa9 Merge pull request #8498 from atm-john/New_import_lines_from_linked_element 
New import lines from linked element
 2018-04-05 18:26:47 +02:00
Laurent Destailleur
d55657951d Merge pull request #8503 from ruistrecht-alt/FIX_pictos_in_agenda 
FIX: img_pictos for remove assigned user in agenda card
 2018-04-05 16:42:40 +02:00
bahfir abbes
16ae46e64c define module part to include external modules menus 2018-04-05 15:23:17 +01:00
Laurent Destailleur
dd934c89bf Merge pull request #8507 from frederic34/patch-2 
Translation of error message
 2018-04-05 16:12:36 +02:00
Laurent Destailleur
533de639ae Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/hookmanager.class.php
 2018-04-05 13:29:27 +02:00
Laurent Destailleur
45d074c39d Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-04-05 13:25:59 +02:00
Laurent Destailleur
eeb2d5a4da Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/extrafields.class.php
	htdocs/cron/list.php
 2018-04-05 13:24:36 +02:00
Laurent Destailleur
2b135dc951 FIX #8488 2018-04-05 13:13:45 +02:00
Regis Houssin
5914bfdf18 Fix: more complete 2018-04-05 13:00:55 +02:00
Regis Houssin
156d26ddb9 Fix: backward compatibility 2018-04-05 13:00:50 +02:00
florian HENRY
cc0fb830b8 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_mailtouser 2018-04-05 10:53:17 +02:00
Frédéric FRANCE
fd6c1f129c Update CMailFile.class.php 2018-04-04 15:58:24 +02:00
John
ce24ca08ee move list of situation table and fix credit note display 2018-04-04 12:33:48 +02:00
John
b7681e7249 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_avoir_situation 2018-04-03 14:12:49 +02:00
Rui Strecht
4f9a8d5b0a img_picto must return fullpath to picto.png 2018-04-03 12:23:26 +01:00
John
d689e88b92 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into New_import_lines_from_linked_element 2018-04-03 11:38:12 +02:00
Laurent Destailleur
2d3a55a6a8 Restore broken confirmation popup 2018-03-31 23:39:08 +02:00
Laurent Destailleur
d21143831c Clean code 2018-03-31 22:44:32 +02:00
Laurent Destailleur
96c73a13f6 Clean code 2018-03-31 16:45:36 +02:00
Laurent Destailleur
84bb4c6ad7 FIX With x extrafields, request for multicompany label was done x times 2018-03-30 19:51:53 +02:00
Laurent Destailleur
0978c8f58b CSS 2018-03-29 16:07:49 +02:00
Laurent Destailleur
a214d0b3d7 Merge pull request #8461 from hregis/develop_multicompany 
Fix: best visibility of choices
 2018-03-29 13:58:30 +02:00
florian HENRY
cc7deb0add Merge branch '7.0' of https://github.com/Dolibarr/dolibarr.git into 7.0 2018-03-29 09:36:05 +02:00
florian HENRY
78812ef826 better error management 2018-03-29 09:35:47 +02:00
Laurent Destailleur
1c86eb1c44 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/localtax/index.php
	htdocs/compta/tva/quarter_report.php
	htdocs/core/lib/tax.lib.php
 2018-03-29 03:08:01 +02:00
Laurent Destailleur
125085acee Fix name of method to avoid ci errors 2018-03-29 03:01:05 +02:00
florian HENRY
7635f23d78 Merge branch '7.0' of https://github.com/Dolibarr/dolibarr.git into 7.0 2018-03-27 18:39:56 +02:00
florian HENRY
af7c1d8da1 fix error log 2018-03-27 18:39:18 +02:00
Regis Houssin
7d7a006583 Fix: best visibility of choices 2018-03-27 18:12:42 +02:00
Laurent Destailleur
e28307ede4 Merge pull request #8449 from hregis/develop_dict 
NEW add "moreHtmlRef" hook
 2018-03-27 18:07:57 +02:00
Laurent Destailleur
3fa7cdf17f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-27 18:00:29 +02:00
Laurent Destailleur
20eb7015e8 Doxygen 2018-03-27 18:00:17 +02:00
Regis Houssin
35b6cb750f Fix: move "moreHtmlRef" hook in "showrefnav" function 2018-03-27 17:36:25 +02:00
Laurent Destailleur
930512d9a2 FIX Add a test to avoid to reset binding by error. 2018-03-27 13:08:16 +02:00
Frédéric FRANCE
1071ec7e57 ignore Return-Path in dkim sign with swiftmailer 2018-03-26 21:36:03 +02:00
florian HENRY
ffbeb17ec2 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_mailtouser 2018-03-25 17:19:27 +02:00
Laurent Destailleur
852191010a Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2018-03-25 15:29:11 +02:00
Laurent Destailleur
a5dd98701e Too verbose log 2018-03-25 13:40:22 +02:00
Laurent Destailleur
6ef1dbbe0f FIX auto open contract if one result found 2018-03-24 18:28:06 +01:00
Laurent Destailleur
c85cb7fe0a Merge pull request #8447 from fappels/7.0_modulbuilder 
Update on module builder
 2018-03-24 16:41:43 +01:00