Laurent Destailleur
5738d6de98
Fix: sql request not compatible with pgsql
2014-08-30 20:04:53 +02:00
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
Laurent Destailleur
f64cb085a7
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
ChangeLog
htdocs/fourn/class/fournisseur.commande.class.php
2014-08-30 18:27:34 +02:00
jfefe
b7a2e3783e
Fix : missing translations
2014-08-30 11:11:51 +02:00
jfefe
71afc4adb0
Fix : missing actions for resource element
2014-08-30 11:11:32 +02:00
jfefe
2c68317864
Fix : bad sql request when linking resource to an element
2014-08-30 10:23:58 +02:00
aspangaro
3b8a3ccb14
Correct travis
2014-08-30 07:37:01 +02:00
aspangaro
d3a14c514a
Correct travis
2014-08-30 07:11:28 +02:00
aspangaro
6bad77d8fb
Move script
2014-08-30 06:46:42 +02:00
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
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
Philippe GRAND
a448b7e36a
add product minimum recommended price
2014-08-29 19:19:26 +02:00
Damian Serrano Thode
4fe83ebbf9
Contract never shown on interventions
...
Column fk_contrat is never read from the database, so it is never shown
in the corresponding field of the intervention, even though you have set
it choosing the contract from the dropdown.
2014-08-29 11:34:07 +02:00
Laurent Destailleur
47fc72a001
Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6
2014-08-29 11:18:36 +02:00
Laurent Destailleur
a518a7256c
maj copyright
2014-08-29 11:17:38 +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
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
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
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
