diff options
| author | Christophe Simonis <chs@openerp.com> | 2013-11-25 16:00:54 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@openerp.com> | 2013-11-25 16:00:54 +0100 |
| commit | bb1e256f5b24bb4fc4b64e1fa973f86a30e4bace (patch) | |
| tree | 95f1de1c67b507b0d10786d04aa0f98bcd22243a /addons/document | |
| parent | f148061b9455e39d3b3e6f316a5c7d586e1aad88 (diff) | |
| parent | 7baee2822180db919e6754f04c0fa9bc8aaafe92 (diff) | |
[MERGE] forward port of branch saas-2 up to revid 9010 dle@openerp.com-20131125143003-vjtzj1c5051pdnk3
bzr revid: chs@openerp.com-20131125150054-b135qshkx6icakgk
Diffstat (limited to 'addons/document')
| -rw-r--r-- | addons/document/security/ir.model.access.csv | 1 | ||||
| -rw-r--r-- | addons/document/static/src/js/document.js | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/addons/document/security/ir.model.access.csv b/addons/document/security/ir.model.access.csv index e0513a0640c..8c5e4323831 100644 --- a/addons/document/security/ir.model.access.csv +++ b/addons/document/security/ir.model.access.csv @@ -15,3 +15,4 @@ access_report_document_user_group_document_manager,report.document.user document access_report_document_file_group_document_manager,report.document.file document manager,model_report_document_file,base.group_system,1,0,0,0
access_report_document_file_group_document,report.document.file document manager,model_report_document_file,base.group_document_user,1,0,0,0
access_report_document_user_knowledgeuser,report.document.user knowledgeuser,document.model_report_document_user,base.group_document_user,1,0,0,0
+access_document_storage,access_document_storage,model_document_storage,base.group_system,1,1,1,1
diff --git a/addons/document/static/src/js/document.js b/addons/document/static/src/js/document.js index 23f1375e8c8..e4bce2da76e 100644 --- a/addons/document/static/src/js/document.js +++ b/addons/document/static/src/js/document.js @@ -9,7 +9,7 @@ openerp.document = function (instance) { on_attachments_loaded: function(attachments) { //to display number in name if more then one attachment which has same name. var self = this; - _.chain(attachments.reverse()) + _.chain(attachments) .groupBy(function(attachment) { return attachment.name}) .each(function(attachment){ if(attachment.length > 1) |