2
0
forked from Wavyzz/dolibarr
Commit Graph

7044 Commits

Author SHA1 Message Date
Laurent Destailleur
2d14e53b45 Fix: Pb with pgsql 2014-08-30 20:00:42 +02:00
Laurent Destailleur
f6be7d7930 Fix: Pb with pgsql 2014-08-30 19:58:38 +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
b27cf2cbd6 Merge branch 'Upstream/develop' 2014-08-30 05:30:53 +02:00
aspangaro
b25db97c28 Typo 2014-08-30 05:30:37 +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
47339d0e62 Fix: Missing field tobuy into service export.
Fix: Filter on date into export.
Fix: Tooltip help.
2014-08-29 20:26:27 +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
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
Regis Houssin
ff04729a07 Fix: strict mode 2014-08-28 19:38:18 +02:00
Regis Houssin
1aad1b6acd Fix: strict mode 2014-08-28 19:32:41 +02:00
Laurent Destailleur
711e7e6fc6 Fix: phpunit test
Fix: debian readme to upgrade tcpdf lib.
2014-08-28 16:59:10 +02:00
Regis Houssin
48f9ef2574 Fix: php strict mode saga 2014-08-28 15:53:29 +02:00
Regis Houssin
2c46c20dfb Fix: php strict mode saga 2014-08-28 15:52:58 +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
Regis Houssin
714da05034 Fix: another strict mode alert 2014-08-28 15:36:22 +02:00
Regis Houssin
4fdd98c4a7 Fix: another strict mode alert 2014-08-28 15:34:50 +02:00
Laurent Destailleur
1505ade3db 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.

Conflicts:
	htdocs/core/lib/files.lib.php
2014-08-28 15:14:06 +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
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
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
a446318649 Fix: strict mode anarchy ;-)
check your variable please
2014-08-27 19:03:32 +02:00
Regis Houssin
34561906fc Fix: strict mode anarchy ;-)
check your variable please
2014-08-27 19:03: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
Regis Houssin
0674667932 Fix: error with php strict mode 2014-08-27 10:46:42 +02:00
Regis Houssin
cdd716eb9d Fix: error with php strict mode 2014-08-27 10:44:40 +02:00
aspangaro
71265558d2 Integrate module Accounting Expert 2014-08-27 07:03:42 +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
Regis Houssin
9dafdf41bb Fix: error in strict mode 2014-08-26 09:51:00 +02:00
Regis Houssin
ca7ff0ecfa Fix: error in strict mode 2014-08-26 09:50:26 +02:00
Regis Houssin
28ad819ab4 Fix: error in strict mode 2014-08-26 09:49:15 +02:00
Laurent Destailleur
7cb283d0ea Prepare code to be able to choose what to show into footer 2014-08-25 19:16:37 +02:00
Laurent Destailleur
e3fede595f Removed all triggers _BUILDOC. Building a document is not a business
status change but a technical action. So hooks must be used instead.


Merge branch '3.6-patch' of github.com:aspangaro/dolibarr into
aspangaro-3.6-patch

Conflicts:
	htdocs/core/modules/project/modules_project.php
	htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
2014-08-22 00:01:53 +02:00
Laurent Destailleur
04b611f758 Merge pull request #1820 from aspangaro/develop-trad1
Qual: Renamed table llx_c_civilite into llx_c_civility
2014-08-21 23:25:49 +02:00
Laurent Destailleur
eb3c53d897 Merge pull request #1823 from Devensys/Develop-removeVersion
Hidden version on login page
2014-08-21 23:24:08 +02:00
Laurent Destailleur
cb3cb1f734 Merge pull request #1837 from GPCsolutions/civility_id
Fix: module still using deprecated civilite_id
2014-08-21 23:21:21 +02:00
Laurent Destailleur
061a3384fc Merge pull request #1836 from GPCsolutions/dictionaries
Fix: module still using deprecated dictionnaries
2014-08-21 23:21:08 +02:00