2
0
forked from Wavyzz/dolibarr
Commit Graph

9475 Commits

Author SHA1 Message Date
Laurent Destailleur
c8f12dc5f2 Fix PUT method for already formated strings 2015-08-29 15:12:31 +02:00
Juanjo Menent
25fca6615a Merge pull request #3395 from fmarcet/develop
NEW: Translate extrafield's labels
2015-08-28 16:44:49 +02:00
Laurent Destailleur
39cbd7629f Fix error message during import 2015-08-27 23:49:25 +02:00
Laurent Destailleur
302b61c5ce Fix Can't download generated document for cheque summary deposit. 2015-08-27 22:43:09 +02:00
philippe grand
6952084be3 it's a mess 2015-08-27 17:23:23 +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
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
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
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
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
feed3f714c Fix to avoid warning 2015-08-24 11:17:11 +02:00
aspangaro
a6701aeb69 New: CkEditor add possibility to choose skin 2015-08-23 15:39:55 +02:00
Regis Houssin
7b7fc44b46 Fix: disable hook for avoid errors when object langs is disable 2015-08-22 09:24:46 +02:00
Laurent Destailleur
1b409538a8 Fix #3400
Conflicts:
	htdocs/core/lib/date.lib.php
2015-08-20 15:51:28 +02:00
Laurent Destailleur
4541d189ac Fix #3400 2015-08-20 15:50:00 +02:00
Laurent Destailleur
d409568442 Format code 2015-08-20 15:07:16 +02:00
Laurent Destailleur
e24fd6fa37 Merge remote-tracking branch 'origin/develop' into 3.8
Conflicts:
	htdocs/expedition/class/expedition.class.php
2015-08-20 14:36:32 +02:00
Laurent Destailleur
c3fb14855b Try a better fix to replace PR #3297 2015-08-20 14:34:48 +02:00
Laurent Destailleur
936f912216 Fix filter on category 2015-08-20 04:07:07 +02:00
Laurent Destailleur
26e3fcc636 Try a better fix to replace PR #3297 2015-08-20 03:38:21 +02:00
Laurent Destailleur
9a6e13d253 Fix test if empty was inverted 2015-08-19 19:45:24 +02:00
Laurent Destailleur
b11642a7f4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-08-19 18:27:22 +02:00
Laurent Destailleur
5f30ad3b63 Fix no link to show if id empty 2015-08-19 18:27:12 +02:00
Florian HENRY
91c8057d51 NEW : import Third parties/Sales representatives 2015-08-19 16:59:43 +02:00
philippe grand
3743c7460d FIX : pdf_writeLinkedObjects use foreach instead of for($i..) because
now linked objects return by fetchLinkedObject are associative array
with ID as key.
2015-08-19 16:36:44 +02:00
Juanjo Menent
7befa78223 Merge pull request #3386 from grandoc/grandoc_fixes_20150815
the form should be outside table to avoid errors
2015-08-18 20:07:38 +02:00
fmarcet
d6b84233ed NEW: Translate extrafield's labels 2015-08-18 16:40:03 +02:00