' : '
'; + return (str + '').replace(/([^>\r\n]?)(\r\n|\n\r|\r|\n)/g, '$1'+ break_tag +'$2'); + }, + /** * * var regex_login = new RegExp(/(^|\s)@((\w|@|\.)*)/g); @@ -465,16 +507,11 @@ openerp.mail = function(session) { }, }); + session.web.form.widgets.add( 'Thread', 'openerp.mail.Thread'); - - /* Add ThreadView widget to registry */ - session.web.form.widgets.add( 'ThreadView', 'openerp.mail.RecordThread'); -// session.web.page.readonly.add( 'ThreadView', 'openerp.mail.RecordThread'); - - /* ThreadView widget: thread of comments */ + /** ThreadView widget: thread of comments */ mail.RecordThread = session.web.form.AbstractField.extend({ - // QWeb template to use when rendering the object - template: 'RecordThread', + template: 'mail.RecordThread', init: function() { this._super.apply(this, arguments); @@ -516,7 +553,7 @@ openerp.mail = function(session) { this._super.apply(this, arguments); var self = this; this.reinit(); - if (! this.view.datarecord.id) { this.$element.find('ul.oe_mail_thread').hide(); return; } + if (! this.view.datarecord.id) { this.$element.find('.oe_mail_thread').hide(); return; } // fetch followers var fetch_sub_done = this.fetch_subscribers(); // create and render Thread widget @@ -541,7 +578,7 @@ openerp.mail = function(session) { if (record.id == self.session.uid) { self.is_subscriber = true; } var mini_url = self.thread_get_avatar('res.users', 'avatar', record.id); $('
').html(render_res).appendTo(self.$element.find('div.oe_mail_wall_threads'));
+ var render_res = session.web.qweb.render('mail.WallThreadContainer', {});
+ $('').html(render_res).appendTo(self.$element.find('ul.oe_mail_wall_threads'));
var thread = new mail.Thread(self, {
'res_model': model_name, 'res_id': res_id, 'uid': self.session.uid, 'records': records,
'parent_id': false, 'thread_level': self.params.thread_level, 'show_hide': true}
);
self.thread_list.push(thread);
- return thread.appendTo(self.$element.find('div.oe_mail_wall_thread:last'));
+ return thread.appendTo(self.$element.find('li.oe_mail_wall_thread:last'));
});
// update TODO
this.comments_structure['root_ids'] = _.union(this.comments_structure['root_ids'], this.comments_structure['new_root_ids']);
@@ -770,12 +804,14 @@ openerp.mail = function(session) {
/** Action: Posts a comment */
do_comment: function () {
- var comment_node = this.$element.find('textarea.oe_mail_wall_action_textarea');
+ var comment_node = this.$element.find('.oe_mail_wall_action textarea');
var body_text = comment_node.val();
comment_node.val('');
var call_done = this.ds_users.call('message_append_note', [[this.session.uid], 'Tweet', body_text, false, 'comment', 'html']).then(this.proxy('init_and_fetch_comments'));
},
});
+ session.web.client_actions.add('mail.all_feeds', 'session.mail.WallView');
+
};
// vim:et fdc=0 fdl=0 foldnestmax=3 fdm=syntax:
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index a34e362960b..5ff8a996116 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -1,36 +1,34 @@
-
+
-
All Feeds |
-
+
-
+
-
+
![User img]()
-
-
+
-
+ -
+
-
History and Comments
-
-
+
+
-
@@ -44,8 +42,8 @@
-
-
+
- Production Dashboard
+ Manufacturing
board.board
form
form
-
-
+
diff --git a/addons/product/i18n/zh_CN.po b/addons/product/i18n/zh_CN.po
index 1e41e1274ee..5a2fe1756b2 100644
--- a/addons/product/i18n/zh_CN.po
+++ b/addons/product/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-21 05:25+0000\n"
-"X-Generator: Launchpad (build 15435)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:44+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
#. module: product
#: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/project/__openerp__.py b/addons/project/__openerp__.py
index 2c53fc2a28a..2c38b2e56c1 100644
--- a/addons/project/__openerp__.py
+++ b/addons/project/__openerp__.py
@@ -54,7 +54,6 @@ Dashboard for project members that includes:
"res_partner_view.xml",
"report/project_report_view.xml",
"board_project_view.xml",
- 'board_project_manager_view.xml',
'report/project_cumulative.xml',
'res_config_view.xml',
],
diff --git a/addons/project/board_project_manager_view.xml b/addons/project/board_project_manager_view.xml
deleted file mode 100644
index d9340eefb3a..00000000000
--- a/addons/project/board_project_manager_view.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
-
-
diff --git a/addons/project/board_project_view.xml b/addons/project/board_project_view.xml
index df35534659d..09a7fe57bab 100644
--- a/addons/project/board_project_view.xml
+++ b/addons/project/board_project_view.xml
@@ -2,14 +2,48 @@
-
+
+ project.vs.remaining.hour.tree
+ project.vs.hours
+ tree
+
+
+
+
+
+
+
+ project.vs.remaining.hour.graph
+ project.vs.hours
+ graph
+
+
+
+
+
+
+
+ Remaining Hours Per Project
+ project.vs.hours
+ form
+ graph,tree
+ [('user_id','=',uid),('state','not in',('cancel','done'))]
+
+
project.task.tree
project.task
tree
-
+
-
- project.task.delegated.tree
- project.task
- tree
-
-
-
-
-
-
-
- My Open Tasks
+ My Tasks
project.task
form
tree,form
- [('user_id','=',uid),('state','=','open')]
-
-
-
- My Delegated Tasks
- project.task
- form
- tree,form
- [('parent_ids.user_id','=',uid),('state', 'in', ('draft','open','pending'))]
-
-
-
- My Task's Deadlines
- project.task
- form
- tree,form
- [('user_id','=',uid),('state','=','open'),('date_deadline','<>',False)]
+ [('user_id','=',uid),('state','not in',('cancel','done'))]
@@ -78,11 +74,10 @@
@@ -90,7 +85,7 @@
- Project Dashboard
+ Project
board.board
form
form
@@ -98,19 +93,10 @@
-
-
-
+
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index d9cba469bc4..f883f007bd6 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -361,7 +361,6 @@
@@ -385,15 +384,16 @@
+
+
- project.vs.remaining.hour.tree
- project.vs.hours
- tree
-
-
-
-
-
-
-
- project.vs.remaining.hour.graph
- project.vs.hours
- graph
-
-
-
-
-
-
-
- Remaining Hours Per Project
- project.vs.hours
- form
- graph,tree
- [('user_id','=',uid),('state','=','open')]
-
-
-
- tree
-
-
- graph
-
-
-
- task.by.days.tree
- task.by.days
- tree
-
-
-
-
-
-
-
- task.by.days.graph
- task.by.days
- graph
-
-
-
-
-
-
-
- Task By Days
- task.by.days
- form
- graph,tree
- [('day','<=',time.strftime('%Y-%m-%d')),('day','>=', time.strftime('%Y-%m-%d', time.localtime(time.time()-(15*24*3600))))]
-
-
-
-
- project.vs.planned.total.hour.tree
- project.vs.hours
- tree
-
-
-
-
-
-
-
- project.vs.planned.total.hour.graph
- project.vs.hours
- graph
-
-
-
-
-
-
diff --git a/addons/project_issue/board_project_issue_view.xml b/addons/project_issue/board_project_issue_view.xml
index 495a1efe3c1..cedcd85d4fc 100644
--- a/addons/project_issue/board_project_issue_view.xml
+++ b/addons/project_issue/board_project_issue_view.xml
@@ -2,89 +2,7 @@
-
- Project issues
- project.issue
- form
- tree,form
- [('state','in',['draft','open'])]
-
-
-
- Project issues
- project.issue
- form
- tree,form
- [('state','=','pending')]
-
-
-
- Project Issue
- project.issue.report
- form
- graph
- []
-
-
-
- project.issue.report.graph
- project.issue.report
- graph
-
-
-
-
-
-
-
- Project Issue
- project.issue.report
- form
- graph
- []
-
-
-
- board.project.issue.form
- board.board
- form
-
-
-
-
-
-
- Project Issue Dashboard
- board.board
- form
- form
- menu
-
-
-
-
-
+
Project Issue Board Tree
project.issue
tree
@@ -105,6 +23,7 @@
+
My Project Issues
project.issue
@@ -113,40 +32,17 @@
[('state','not in',('cancel','done')),('user_id','=',uid)]
-
- my.open.project.issue.graph
- project.issue.report
- graph
-
-
-
-
-
-
- My Open Project issues
- project.issue.report
- form
- graph,tree,form,
- [('state','=','open'),('user_id','=',uid)]
- {'default_user_id': uid}
-
-
+
+
board.my.project.issue.form.inherit
board.board
form
-
-
-
-
+
-
diff --git a/addons/purchase/board_purchase_view.xml b/addons/purchase/board_purchase_view.xml
index f7b5d0a3736..c76defe468f 100644
--- a/addons/purchase/board_purchase_view.xml
+++ b/addons/purchase/board_purchase_view.xml
@@ -2,11 +2,6 @@
-
-
Request for Quotations
ir.actions.act_window
@@ -16,14 +11,6 @@
[('state','=','draft')]
{'quotation_only': True}
-
- Purchase Order Waiting Approval
- ir.actions.act_window
- purchase.order
- form
- tree,form
- [('date_order','>',time.strftime('%Y-01-01 00:00:00')),('date_order','<',time.strftime('%Y-12-31 23:59:59')), ('state','in',('wait','confirmed'))]
-
purchase.order.monthly.categ.tree
@@ -69,19 +56,6 @@
[('state','in',('approved','except_picking','except_invoice','done'))]
-
- tree
-
-
- graph
-
-
board.purchase.form
@@ -102,19 +76,19 @@
- Purchase Dashboard
+ Purchases
board.board
form
form
menu
-
+
+
diff --git a/addons/purchase/i18n/ja.po b/addons/purchase/i18n/ja.po
index b7245862172..92bb95fff49 100644
--- a/addons/purchase/i18n/ja.po
+++ b/addons/purchase/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-06-18 23:05+0000\n"
+"PO-Revision-Date: 2012-06-21 23:39+0000\n"
"Last-Translator: Akira Hiyama \n"
"Language-Team: Japanese \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-21 05:16+0000\n"
-"X-Generator: Launchpad (build 15435)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:35+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
#. module: purchase
#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -27,7 +27,7 @@ msgstr "買い手は仕入先に送られる前に見積依頼（RFQ）を承認
#. module: purchase
#: model:process.node,note:purchase.process_node_productrecept0
msgid "Incoming products to control"
-msgstr "制御のために入ってくる製品"
+msgstr "制御のための入庫製品"
#. module: purchase
#: field:purchase.order,invoiced:0
@@ -355,12 +355,12 @@ msgstr "請求書行"
#: model:process.node,name:purchase.process_node_packinglist0
#: model:process.node,name:purchase.process_node_productrecept0
msgid "Incoming Products"
-msgstr "入ってくる製品"
+msgstr "入庫製品"
#. module: purchase
#: model:process.node,name:purchase.process_node_packinginvoice0
msgid "Outgoing Products"
-msgstr "出て行く製品"
+msgstr "出庫製品"
#. module: purchase
#: view:purchase.order:0
@@ -1037,7 +1037,7 @@ msgstr "これは請求書は既に支払われたことを意味しています
#. module: purchase
#: model:process.node,note:purchase.process_node_packinginvoice0
msgid "Outgoing products to invoice"
-msgstr "請求するための出て行く製品"
+msgstr "請求するための出庫製品"
#. module: purchase
#: selection:purchase.report,month:0
@@ -1179,7 +1179,7 @@ msgstr "この発注オーダーはキャンセルできません。"
#. module: purchase
#: model:process.transition,note:purchase.process_transition_createpackinglist0
msgid "A pick list is generated to track the incoming products."
-msgstr "入ってくる製品を追跡するために集荷リストが作成されます。"
+msgstr "入庫製品を追跡するために集荷リストが作成されます。"
#. module: purchase
#: help:purchase.order,pricelist_id:0
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 5c107d984ce..24b789795ed 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -70,6 +70,7 @@
parent="base.menu_purchase_root" sequence="6"/>
+ Based on Draft Invoices
account.invoice
form
tree,form,calendar,graph
@@ -77,10 +78,14 @@
[('type','=','in_invoice')]
{'default_type':'in_invoice', 'type':'in_invoice', 'journal_type': 'purchase', 'search_default_draft': 1}
Use this menu to control the invoices to be received from your supplier. OpenERP pregenerates draft invoices from your purchase orders or receptions, according to your settings. Once you receive a supplier invoice, you can match it with the draft invoice and validate it.
+
+ Use this menu to control the invoices to be received from your supplier.
+ OpenERP generates draft invoices from your purchase orders or receptions, according to your settings.
+ Once you receive a supplier invoice, you can match it with the draft invoice and validate it.
+
-
{'search_default_draft': 1}
tree,form,graph,calendar
You can create a request for quotation when you want to buy products to a supplier but the purchase is not confirmed yet. Use also this menu to review requests for quotation created automatically based on your logistic rules (minimum stock, MTO, etc). You can convert the request for quotation into a purchase order once the order is confirmed. If you use the extended interface (from user's preferences), you can select the way to control your supplier invoices: based on the order, based on the receptions or manual encoding.
+
+ Create a request for quotation when you want to buy products from a supplier.
+ You can also use this menu to review requests for quotation created automatically
+ (based on logistic rules, like minimum stock, MTO, etc.)
+ <p>
+ Once confirmed, a request for quotation becomes a purchase order.
+ In the Purchase Settings, you can select the way to control supplier invoicing:
+ based on the order, based on receptions, or manual.
+
+
+
diff --git a/addons/mrp/board_manufacturing_view.xml b/addons/mrp/board_manufacturing_view.xml
index 9dd5d1afb0e..0ac0c02540f 100644
--- a/addons/mrp/board_manufacturing_view.xml
+++ b/addons/mrp/board_manufacturing_view.xml
@@ -21,19 +21,18 @@
-