Commit Graph

43223 Commits

Author SHA1 Message Date
aspangaro
74ef9d5c59 Changelog 2014-08-30 06:22:18 +02:00
aspangaro
d6b2cb0b31 Correct travis 2014-08-30 06:05:02 +02:00
aspangaro
cc9f26a035 Correct travis 2014-08-30 05:44:12 +02:00
aspangaro
1a7c88751c Correct travis 2014-08-30 05:19:48 +02:00
aspangaro
07377e7156 Merge branch 'Upstream/develop' 2014-08-30 04:42:36 +02:00
Laurent Destailleur
5dc35ec137 Fix: Missing field tobuy into service export.
Fix: Filter on date into export.
Fix: Tooltip help.
2014-08-29 20:25:54 +02:00
Laurent Destailleur
e4dbf6a9e4 Removed useless file 2014-08-29 11:02:21 +02:00
aspangaro
bc686a7995 Test Correct travis 2014-08-29 06:43:05 +02:00
aspangaro
bb7aa9f29c Merge branch 'Upstream/develop' 2014-08-29 06:33:00 +02:00
Laurent Destailleur
711e7e6fc6 Fix: phpunit test
Fix: debian readme to upgrade tcpdf lib.
2014-08-28 16:59:10 +02:00
Laurent Destailleur
5e95daad91 Fix: Sql syntax error 2014-08-28 16:18:17 +02:00
Laurent Destailleur
4d506d29d9 Removed log output (log too long) 2014-08-28 16:14:35 +02:00
Laurent Destailleur
0b24a6e2d6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-08-28 15:57:57 +02:00
Laurent Destailleur
b182bf1eb7 Output log to make upgrade tack easier 2014-08-28 15:57:34 +02:00
Regis Houssin
139cf10c7c Fix: php strict mode saga 2014-08-28 15:52:20 +02:00
Regis Houssin
615122bf37 Fix: another strict mode alert 2014-08-28 15:36:57 +02:00
Juanjo Menent
328b8b9643 Fix: Salary payments are not reflected on the reporting sheets
Conflicts:
	ChangeLog
2014-08-28 15:29:31 +02:00
Laurent Destailleur
3e2ed270e1 Fix: sql request with pgsql 2014-08-28 15:07:33 +02:00
Laurent Destailleur
22fb37f856 Fix: Sql syntax for extrafield table of interventions 2014-08-28 15:00:09 +02:00
Laurent Destailleur
8bdf02b340 Doxygen 2014-08-28 14:48:16 +02:00
Laurent Destailleur
911cccba80 Disable rule FunctionDoubleUnderscore that seems to be bugged. 2014-08-28 12:31:57 +02:00
Laurent Destailleur
4a91476be3 Try cut and paste to solve pb on class project. 2014-08-28 12:26:43 +02:00
Laurent Destailleur
b810e6e556 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-08-28 12:19:46 +02:00
Laurent Destailleur
dcce6731fe Fix: Sql errors 2014-08-28 12:19:24 +02:00
Laurent Destailleur
a1e92b464f Merge pull request #1848 from atm-alexis/develop_feature_intervention_lines_extrafields
Feature  : Add extrafields on intervention's lines
2014-08-28 12:00:43 +02:00
Laurent Destailleur
013023204f Merge pull request #1841 from GPCsolutions/modules
Modules classes documentation enhancements
2014-08-28 11:58:13 +02:00
Laurent Destailleur
d43c6e57c7 Merge pull request #1843 from aspangaro/develop-patch1
Fix :: Sql problem on resource table
2014-08-28 11:44:26 +02:00
Laurent Destailleur
fbf51302dd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-08-28 11:20:32 +02:00
Laurent Destailleur
a486b4e415 Fix error management: When an error is returned by hooks into
dol_move_uploaded_file, message must be returned by function as if it
were an error for any other reason.
2014-08-28 11:20:13 +02:00
aspangaro
bb45b8bbc5 Typo & admin menu 2014-08-28 07:37:29 +02:00
aspangaro
5b3be47b47 Merge branch 'Upstream/develop' 2014-08-28 07:28:45 +02:00
aspangaro
84dff915c1 Typo 2014-08-28 07:21:40 +02:00
aspangaro
9b3a3a47c2 Add link chart of accounts in administration 2014-08-28 07:18:28 +02:00
aspangaro
6f8234dd60 Update Eldy menu 2014-08-28 07:13:33 +02:00
aspangaro
add4528e6c Update perms 2014-08-28 06:48:22 +02:00
aspangaro
d03763f6c3 Update Accounting Expert integration 2014-08-28 06:30:01 +02:00
Regis Houssin
76cb6f760a Fix: strict mode anarchy ;-)
check your variable please
2014-08-27 19:02:13 +02:00
Regis Houssin
071c405bad Fix: error with php strict mode 2014-08-27 10:47:25 +02:00
aspangaro
71265558d2 Integrate module Accounting Expert 2014-08-27 07:03:42 +02:00
Laurent Destailleur
c3fe0c1ae9 Fix: sql errors into migration scripts 2014-08-26 23:08:06 +02:00
Laurent Destailleur
4b4360af32 Fix: sql syntax errors 2014-08-26 23:02:21 +02:00
Juanjo Menent
a31fec1b0b Fix tab active to real tab active 2014-08-26 19:55:35 +02:00
Alexis Algoud
7af788729b debug extrafield on create card 2014-08-26 17:25:13 +02:00
Alexis Algoud
35fca84f19 ok on insert 2014-08-26 17:08:03 +02:00
Alexis Algoud
40aadc8125 add extrafield in add form 2014-08-26 12:11:34 +02:00
Alexis Algoud
85228fd8e7 add support in admin 2014-08-26 11:50:02 +02:00
Alexis Algoud
a3469f1f01 FIX bug on migration 3.6 -> 3.7 2014-08-26 11:27:57 +02:00
Regis Houssin
9dafdf41bb Fix: error in strict mode 2014-08-26 09:51:00 +02:00
Laurent Destailleur
d710d9f114 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-08-25 19:33:38 +02:00
Laurent Destailleur
a5deeebfdc Add try catch 2014-08-25 19:32:36 +02:00