Commit Graph

45118 Commits

Author SHA1 Message Date
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
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
Juanjo Menent
328b8b9643 Fix: Salary payments are not reflected on the reporting sheets
Conflicts:
	ChangeLog
2014-08-28 15:29:31 +02:00
Juanjo Menent
0e1f22fe26 Fix: Salary payments are not reflected on the reporting sheets 2014-08-28 15:16:14 +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
d3a3e8786e Fix: sql request with pgsql 2014-08-28 15:08:24 +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
79b081a7b7 Merge pull request #1845 from Cubexed/patch-1
Fix unable to delete order line
2014-08-28 12:00:21 +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
3064aa2177 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6
Conflicts:
	htdocs/install/mysql/tables/llx_c_type_resource.key.sql
2014-08-28 11:56:19 +02:00
Laurent Destailleur
f1993e719f Merge pull request #1846 from aspangaro/3.6
Fix :: llx_c_type_resource when you update from a 3.6-beta
2014-08-28 11:55:18 +02:00
Laurent Destailleur
14ec2cd1d9 Merge pull request #1851 from grandoc/3.6
fix : missing translation
2014-08-28 11:53:00 +02:00
Laurent Destailleur
338fc5f2f8 Fix: Bad unique key 2014-08-28 11:46:47 +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
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
Philippe GRAND
08c621037c fix : missing code for extrafields 2014-08-27 11:41:18 +02:00
Philippe GRAND
61ae2f3f37 fix : missing translation 2014-08-27 11:34:24 +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
Laurent Destailleur
4405f17f22 Update changelog 2014-08-26 23:47:44 +02:00
Laurent Destailleur
12c6752971 Fix: Can upload files on services. 2014-08-26 23:45:02 +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
braito4
f5883741bf Update fiche.php
Proyect selection was missing
2014-08-26 20:20:29 +02:00