Merge branch 'master' of github.com:webnotes/erpnext

This commit is contained in:
Nabin Hait
2012-12-28 16:46:48 +05:30
10 changed files with 78 additions and 55 deletions

View File

@@ -87,5 +87,5 @@ def update_feed(controller, method=None):
doc = controller.doc
if method in ['on_update', 'on_submit']:
subject, color = feed_dict.get(doc.doctype, [None, None])
if subject:
if subject:
make_feed('', doc.doctype, doc.name, doc.owner, subject % doc.fields, color)

View File

@@ -1,4 +1,14 @@
erpnext.updates = [
["28th December 2012", [
"Workflow: Added System for Multi-level approval before Submission. \
<br>See video at <a href='https://www.youtube.com/watch?v=zuGv59_wJKw' \
target='_blank'>https://www.youtube.com/watch?v=zuGv59_wJKw</a>.",
"Stock Level Report: New report to see available and estimated qty of stock",
]],
["27th December 2012", [
"Website: Added auto-generated Contact Us and About Us Pages",
"Website: Added option to create slideshows and add them to Pages, Products and Product Groups",
]],
["25th December 2012", [
"Stock Balance Report: Inflow, outflow and balance of stock within a defined period",
"Stock Reports: Added Brand filter on some of the reports"