lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
51,362 Commits 43 Branches 150 Tags 886 MiB
87c236b534
Commit Graph

51362 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
87c236b534 Fix when error creating invoice from predefined invoice, we must go back 
to create page from same predefined invoice.
 2016-01-08 16:30:43 +01:00
Laurent Destailleur
20f1455090 FIX #4314 2016-01-08 15:45:23 +01:00
Laurent Destailleur
3dafe76f5e Complete changelog 2016-01-08 14:51:20 +01:00
Laurent Destailleur
2259cf2340 Merge remote-tracking branch 'origin/3.8' into develop 2016-01-08 14:49:00 +01:00
Laurent Destailleur
8366310f0f Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/admin/agenda_extsites.php
 2016-01-08 14:47:46 +01:00
Laurent Destailleur
e008922919 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/admin/agenda_extsites.php
 2016-01-08 14:45:53 +01:00
Laurent Destailleur
5414cb6f12 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2016-01-08 14:43:20 +01:00
Laurent Destailleur
a26a6c2449 Fix sql injection even when code is on several lines 2016-01-08 14:43:04 +01:00
Laurent Destailleur
c2b8be9aaf Merge pull request #4355 from GPCsolutions/3.6-4291 
FIX #4291 Correctly filter external calendar GETPOSTs
 2016-01-08 14:23:56 +01:00
Laurent Destailleur
844e8bff83 Better fix for #4354 2016-01-08 14:22:21 +01:00
Laurent Destailleur
36df5a7325 Merge pull request #4362 from Dolibarr/revert-4354-patch-1 
Revert "Debug of module leave requests "
 2016-01-08 14:15:32 +01:00
Laurent Destailleur
6a058edc23 Revert "Debug of module leave requests " 2016-01-08 14:15:22 +01:00
Laurent Destailleur
cce473b2cb Merge pull request #4354 from T-B-A-I/patch-1 
Debug of module leave requests
 2016-01-08 14:13:08 +01:00
Laurent Destailleur
3054076f9b Merge pull request #4350 from GPCsolutions/dolibarr-export 
Added git export ignores
 2016-01-08 14:10:36 +01:00
Laurent Destailleur
d4aa83e7ca Merge pull request #4343 from grandoc/develop 
translations
 2016-01-08 14:07:05 +01:00
Laurent Destailleur
36dc8b1ce7 FIX #4341 2016-01-08 13:57:53 +01:00
Laurent Destailleur
5785744d5a Add ignore 2016-01-08 13:06:38 +01:00
Laurent Destailleur
cbe65fbc79 Fix: fields added into 3.8 to store email event was not enough. To late 
to use them. Will be done into 4.0
 2016-01-08 13:05:56 +01:00
Raphaël Doursenaud
f2178f0369 FIX #4291 Correctly filter external calendar GETPOSTs 2016-01-08 06:42:28 +01:00
TBAI
8c48785de7 Debug of module leave requests 
Add text in holiday module
 2016-01-07 20:10:22 +01:00
TBAI
f28ebefe93 Debug of module leave requests 
Cancel leave isn't possible if it has been validated
 2016-01-07 19:53:59 +01:00
TBAI
b2aa1f2115 Debug of module leave requests 
Cancel leave isn't possible if it has been validated
 2016-01-07 19:32:25 +01:00
Laurent Destailleur
3c5eaf87d5 Fix dol_fiche_head and end missing 2016-01-07 18:48:46 +01:00
Laurent Destailleur
0eae624a60 Add protection to avoid packaging external tested modules 2016-01-07 18:13:15 +01:00
Raphaël Doursenaud
f4d0c1404b Added git export ignores 
This should help generate clean production tarballs from git.
 2016-01-07 14:43:35 +01:00
Laurent Destailleur
befe58ab98 Fix selection of first entry into select 2016-01-07 13:44:19 +01:00
Laurent Destailleur
b3cb037abb Neutral color 2016-01-07 11:43:53 +01:00
Laurent Destailleur
4e2d4a6651 Fix: the new option AGENDA_USE_EVENT_TYPE_DEFAULT was not visible. 
Solved this by completing tooltip info.
 2016-01-07 11:01:37 +01:00
philippe grand
7b7f2e9fed translations 2016-01-07 10:07:05 +01:00
Laurent Destailleur
9d3afe45d3 Merge pull request #4340 from hregis/3.8_bug 
Fix: disable main.inc.php hooks
 2016-01-07 00:08:48 +01:00
Laurent Destailleur
b4d9f1bece Merge pull request #4338 from frederic34/patch-10 
FIX: Missing leave request type when calling function
 2016-01-07 00:07:29 +01:00
Laurent Destailleur
9200a4b69d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-01-07 00:05:39 +01:00
Laurent Destailleur
2945d2d171 Fix bad condition to show tabs 2016-01-07 00:05:28 +01:00
Laurent Destailleur
601284672a Merge pull request #4337 from frederic34/patch-9 
FIX: When viewing tab of leave request, remaining leave days must be nb of edited user.
 2016-01-07 00:04:28 +01:00
Laurent Destailleur
a974fa858d Merge pull request #4328 from frederic34/patch-8 
Indentation
 2016-01-06 18:51:55 +01:00
Laurent Destailleur
d6c5a73264 Fix missing payment fields definition in export 2016-01-06 17:37:01 +01:00
Regis Houssin
3ae5da1cd6 Fix: disable main.inc.php hooks 2016-01-06 16:18:52 +01:00
Frédéric FRANCE
4dacf462db Update card.php 2016-01-05 17:36:48 +01:00
Frédéric FRANCE
a0b3cdbd21 Update list.php 2016-01-05 17:33:54 +01:00
Laurent Destailleur
f6fead7403 Merge pull request #4317 from marcosgdf/bug-3798 
FIX #3798 #2519 Cron jobs would never be executed
 2016-01-03 19:36:58 +01:00
Laurent Destailleur
1e1d6d4955 Fix to be able to use dolibarr with a smartphone 2016-01-03 19:34:19 +01:00
Laurent Destailleur
b2c41d8565 Fix search forms 2016-01-03 18:46:10 +01:00
Laurent Destailleur
abe3f192fa Debug and fix when using dolibarr with jmobile 2016-01-03 16:23:23 +01:00
Marcos García de La Fuente
ae2295d019 Improvement suggested by @eldy 2016-01-03 15:10:22 +01:00
Laurent Destailleur
96e5651ed5 Fix missing field on list. Restor ability to search on supplier ref. 2016-01-03 14:38:47 +01:00
Laurent Destailleur
d5fa91f7ba Fix several bugs in css and in jmobile usage 2016-01-02 20:48:19 +01:00
Frédéric FRANCE
998649d467 Indentation 2016-01-02 18:51:31 +01:00
Laurent Destailleur
d02c261d2e Fix perf test was using a not existing js file. 2016-01-02 18:13:41 +01:00
Laurent Destailleur
0f7fd47a44 Clean changelog 2016-01-02 13:05:10 +01:00
Laurent Destailleur
0314b3b5b1 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	ChangeLog
 2016-01-02 12:27:08 +01:00