Commit Graph

49118 Commits

Author SHA1 Message Date
philippe grand
6952084be3 it's a mess 2015-08-27 17:23:23 +02:00
aspangaro
aff134ab65 Fix #3289 Salaries module shows amounts with currency symbol unlike the rest of Dolibarr 2015-08-27 16:10:02 +02:00
aspangaro
134bd42c4e Increase length of column pcg_version to 32 2015-08-27 15:13:29 +02:00
philippe grand
e9f631d2e3 fix : Fatal error: Uncaught exception 'Exception' with message 'Incorrect log level' 2015-08-27 14:49:12 +02:00
philippe grand
db7defb7c3 Revert "fix : Fatal error: Uncaught exception 'Exception' with message 'Incorrect log level'"
This reverts commit 2527ae263b.
2015-08-27 14:43:48 +02:00
philippe grand
2527ae263b fix : Fatal error: Uncaught exception 'Exception' with message 'Incorrect log level' 2015-08-27 14:28:12 +02:00
Juanjo Menent
ddb9c6a025 Merge remote-tracking branch 'origin/3.8' into develop 2015-08-26 21:01:39 +02:00
Juanjo Menent
0a33f0728a Fix translations of contract exports 2015-08-26 21:01:01 +02:00
Juanjo Menent
4cd61073e2 Merge remote-tracking branch 'origin/3.8' into develop 2015-08-26 20:26:27 +02:00
Juanjo Menent
6321e96e49 Close #3223 2015-08-26 20:25:52 +02:00
Raphaël Doursenaud
ba1ad9f317 Fix #3219 More conventional presentation 2015-08-26 19:51:06 +02:00
Raphaël Doursenaud
33ea968b5b Fix #3218 Bank date selectors presentation 2015-08-26 19:45:32 +02:00
Raphaël Doursenaud
cea47f3e25 Added tags/categories management to suppliers
Suppliers part of #2571
2015-08-26 19:30:55 +02:00
Guido Schratzer
154f6cff9f Fix: htdocs/projet/element.php Logoposition
Fixed Logo from center to right
set table width to 100 %
2015-08-26 18:35:15 +02:00
Niklas Spanring
53a02e5863 Fix: travis-ci error files.lib.php
error line="215" message="There must be no blank lines after the function comment"
error line="217" message="Arguments with default values must be at the end of the argument list"
error line="248" message="The use of function sizeof() is forbidden; use count() instead"
error line="303" message="The use of function sizeof() is forbidden; use count() instead"
error line="447" message="The use of function sizeof() is forbidden; use count() instead"
error line="456" message="The use of function sizeof() is forbidden; use count() instead"
error line="465" message="The use of function sizeof() is forbidden; use count() instead"
error line="474" message="The use of function sizeof() is forbidden; use count() instead" 
error line="483" message="The use of function sizeof() is forbidden; use count() instead"
error line="494" message="The use of function sizeof() is forbidden; use count() instead"
error line="510" message="There must be no blank lines after the function comment"
2015-08-26 15:12:17 +02:00
Niklas Spanring
2f08ddef54 Fix: travis-ci error actions_sendmails.inc.php
error line="124""The use of function sizeof() is forbidden; use count() instead"
error line="229" "The use of function sizeof() is forbidden; use count() instead"
2015-08-26 15:04:50 +02:00
Laurent Destailleur
6e7ab5a32f Merge pull request #3406 from aspangaro/develop-58
Update php-iban library - Just number version update
2015-08-26 11:30:33 +02:00
Laurent Destailleur
603c44c37c Merge pull request #3405 from aspangaro/3.8-13
Fast review 3.8
2015-08-26 11:27:16 +02:00
Laurent Destailleur
0a880cd205 Merge remote-tracking branch 'origin/3.7' into develop 2015-08-26 11:26:00 +02:00
Laurent Destailleur
3fc63eba0d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-08-26 11:25:05 +02:00
Laurent Destailleur
edf05e8d94 Merge pull request #3404 from hregis/3.7_bug
Fix: disable hook for avoid errors when object langs is disable
2015-08-26 11:24:50 +02:00
Laurent Destailleur
3db021addf Fix Use correct boolean type.
Complete doxygen
2015-08-26 11:24:31 +02:00
Juanjo Menent
9deaa3cceb Merge remote-tracking branch 'origin/3.8' into develop 2015-08-25 22:01:33 +02:00
Juanjo Menent
f32a7ba228 Close #3224 2015-08-25 21:59:46 +02:00
gschratzer
99e679ec39 Merge https://github.com/gschratzer/dolibarr into develop 2015-08-25 17:07:15 +02:00
gschratzer
16268e9f0a New: function calculate_byte 2015-08-25 17:05:08 +02:00
Guido Schratzer
6b85a49068 Merge pull request #1 from Dolibarr/develop
get new version
2015-08-25 16:42:52 +02:00
aspangaro
73d8f20c6b Fix: Correct directory where the donation is generated & add the action to remove_file who are generated 2015-08-25 08:09:14 +02:00
Laurent Destailleur
a54589c13c Fix filter lost 2015-08-24 17:47:26 +02:00
Laurent Destailleur
09355b0c7b Fix filtering 2015-08-24 16:40:43 +02:00
Guido Schratzer
0aabf5eb08 Update actions_sendmails.inc.php 2015-08-24 16:35:08 +02:00
Laurent Destailleur
2cf10ac05d Fix filtering 2015-08-24 16:32:43 +02:00
gschratzer
bf00b5d795 New: IMAP dolimail Support 2015-08-24 16:22:21 +02:00
gschratzer
7c550fdba5 New: IMAP dolimail Support 2015-08-24 16:05:15 +02:00
Laurent Destailleur
8061ec9084 Fix translation 2015-08-24 15:59:17 +02:00
Laurent Destailleur
aaba18bd51 Fix filter on date 2015-08-24 15:40:33 +02:00
Laurent Destailleur
32ec57403b Bad translation 2015-08-24 15:28:15 +02:00
Laurent Destailleur
1a55159e35 Fix filter on prospect status 2015-08-24 14:59:46 +02:00
Laurent Destailleur
80fc4743c9 Fix the property "list" was not used. 2015-08-24 14:42:07 +02:00
Laurent Destailleur
e17abbb59a Fix syntax error 2015-08-24 12:26:49 +02:00
Laurent Destailleur
feed3f714c Fix to avoid warning 2015-08-24 11:17:11 +02:00
aspangaro
fabc771a80 Update php-iban library - Just docs update 2015-08-23 08:00:04 +02:00
aspangaro
478947d630 Correct 2015-08-23 07:46:37 +02:00
aspangaro
7d2eae2359 Fix: Better presentation for add form 2015-08-23 07:37:38 +02:00
BENKE Charlie
af7302fa90 change done 2015-08-23 00:30:11 +02:00
Regis Houssin
7b7fc44b46 Fix: disable hook for avoid errors when object langs is disable 2015-08-22 09:24:46 +02:00
BENKE Charlie
1b117d5581 add in get_origin function generic origintype
actually we have only internal module origintype 
propose to add feature to add stockmovement from other external module
2015-08-21 14:10:55 +02:00
Laurent Destailleur
15ab9c0ecd Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	htdocs/core/lib/security.lib.php
	htdocs/product/stock/mouvement.php
2015-08-20 16:08:42 +02:00
Laurent Destailleur
da8e71b2c5 Fix #3309 2015-08-20 16:05:29 +02:00
Laurent Destailleur
1b409538a8 Fix #3400
Conflicts:
	htdocs/core/lib/date.lib.php
2015-08-20 15:51:28 +02:00