summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2013-04-24 11:25:28 +0200
committerBastien Guerry <bzg@altern.org>2013-04-24 11:25:28 +0200
commit6e4ce7dc231c8615d33fb826e266ca4aaed44366 (patch)
tree2f7d3e5b45ead03f8c82fb35bd0bf24306b5887f
parenta959d2320104747f1d34e22ce9b64acde71d18ec (diff)
parentaed8b7176fa4cb067b15d4facf9c6280f4807a95 (diff)
downloadorg-mode-6e4ce7dc231c8615d33fb826e266ca4aaed44366.tar.gz
Merge branch 'master' of orgmode.org:org-mode
-rw-r--r--contrib/lisp/ox-taskjuggler.el5
1 files changed, 4 insertions, 1 deletions
diff --git a/contrib/lisp/ox-taskjuggler.el b/contrib/lisp/ox-taskjuggler.el
index e1f82bb..3fdef64 100644
--- a/contrib/lisp/ox-taskjuggler.el
+++ b/contrib/lisp/ox-taskjuggler.el
@@ -458,7 +458,10 @@ ITEM is a headline. Return value is a string."
ITEM is a headline. Return value is a string or nil if ITEM
doesn't have any start date defined.."
(let ((scheduled (org-element-property :scheduled item)))
- (and scheduled (org-timestamp-format scheduled "%Y-%02m-%02d"))))
+ (or
+ (and scheduled (org-timestamp-format scheduled "%Y-%02m-%02d"))
+ (and (member 'start org-taskjuggler-valid-resource-attributes)
+ (org-element-property :START item)))))
(defun org-taskjuggler-get-end (item)
"Return end date for task or resource ITEM.