diff --git a/addons/account_voucher/i18n/zh_CN.po b/addons/account_voucher/i18n/zh_CN.po
index 8ba6cb29fa0..37bfbcda4d8 100644
--- a/addons/account_voucher/i18n/zh_CN.po
+++ b/addons/account_voucher/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-07-14 03:37+0000\n"
+"X-Launchpad-Export-Date: 2010-07-15 03:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
diff --git a/addons/account_voucher_payment/i18n/zh_CN.po b/addons/account_voucher_payment/i18n/zh_CN.po
index 362481f0a53..377a1926046 100644
--- a/addons/account_voucher_payment/i18n/zh_CN.po
+++ b/addons/account_voucher_payment/i18n/zh_CN.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-07-14 03:37+0000\n"
+"X-Launchpad-Export-Date: 2010-07-15 03:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher_payment
diff --git a/addons/analytic_journal_billing_rate/i18n/zh_CN.po b/addons/analytic_journal_billing_rate/i18n/zh_CN.po
index 4b85391f013..765982cfc04 100644
--- a/addons/analytic_journal_billing_rate/i18n/zh_CN.po
+++ b/addons/analytic_journal_billing_rate/i18n/zh_CN.po
@@ -7,55 +7,55 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-20 07:31+0000\n"
+"PO-Revision-Date: 2010-07-14 03:49+0000\n"
 "Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-22 04:17+0000\n"
+"X-Launchpad-Export-Date: 2010-07-15 03:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_journal_billing_rate
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效的视图结构XML文件!"
+msgstr "无效XML视图结构!"
 
 #. module: analytic_journal_billing_rate
 #: field:analytic_journal_rate_grid,journal_id:0
 msgid "Analytic Journal"
-msgstr "辅助核算分类帐"
+msgstr "辅助核算记录集合"
 
 #. module: analytic_journal_billing_rate
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
+msgstr "对象名称必须以“x_”开头且不能包含任何特殊字符！"
 
 #. module: analytic_journal_billing_rate
 #: view:analytic_journal_rate_grid:0
 msgid "Billing Rate per Journal for this Analytic Account"
-msgstr "辅助核算分类帐中每个分类帐的记帐标准"
+msgstr "辅助核算记录集合中每个记录集合的开单税率"
 
 #. module: analytic_journal_billing_rate
 #: field:analytic_journal_rate_grid,account_id:0
 msgid "Analytic Account"
-msgstr "辅助核算分类帐"
+msgstr "辅助核算项"
 
 #. module: analytic_journal_billing_rate
 #: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
 msgid "Relation table between journals and billing rates"
-msgstr "分类帐和记帐标准的关系表"
+msgstr "记录集合和开票税率的关系表"
 
 #. module: analytic_journal_billing_rate
 #: field:account.analytic.account,journal_rate_ids:0
 msgid "Invoicing Rate per Journal"
-msgstr "分类帐的开票税率"
+msgstr "每个记录集合的的开票税率"
 
 #. module: analytic_journal_billing_rate
 #: model:ir.module.module,shortdesc:analytic_journal_billing_rate.module_meta_information
 msgid "Analytic Journal Billing Rate"
-msgstr "辅助核算分类帐的记帐标准"
+msgstr "辅助核算集合的开票税率"
 
 #. module: analytic_journal_billing_rate
 #: field:analytic_journal_rate_grid,rate_id:0
diff --git a/addons/analytic_user_function/i18n/zh_CN.po b/addons/analytic_user_function/i18n/zh_CN.po
index 034ad99e623..e20db0149f5 100644
--- a/addons/analytic_user_function/i18n/zh_CN.po
+++ b/addons/analytic_user_function/i18n/zh_CN.po
@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-20 07:31+0000\n"
+"PO-Revision-Date: 2010-07-14 03:52+0000\n"
 "Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-22 04:17+0000\n"
+"X-Launchpad-Export-Date: 2010-07-15 03:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效的视图结构XML文件!"
+msgstr "无效XML视图结构!"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
@@ -51,7 +51,7 @@ msgstr "用户"
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
+msgstr "对象名称必须以“x_”开头且不能包含任何特殊字符！"
 
 #. module: analytic_user_function
 #: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
@@ -63,6 +63,10 @@ msgstr "辅助核算用的函数"
 msgid "User's Product for this Analytic Account"
 msgstr "用户的产品辅助核算项"
 
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "错误！"
+
 #~ msgid ""
 #~ "\n"
 #~ "\n"
diff --git a/addons/auction/i18n/zh_CN.po b/addons/auction/i18n/zh_CN.po
index cdd945f6eef..03e5ffa4234 100644
--- a/addons/auction/i18n/zh_CN.po
+++ b/addons/auction/i18n/zh_CN.po
@@ -1,19 +1,19 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-# 	* auction
+#	* auction
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-06-04 12:37+0000\n"
-"Last-Translator: Eleanor Chen <chenyueg@gmail.com>\n"
+"PO-Revision-Date: 2010-07-15 03:34+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-22 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-07-15 03:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
@@ -24,7 +24,7 @@ msgstr "总利润"
 #. module: auction
 #: wizard_view:auction.lots.sms_send,init:0
 msgid "SMS - Gateway: clickatell"
-msgstr "SMS网关"
+msgstr "短信网关：clickatell"
 
 #. module: auction
 #: view:auction.lots:0
@@ -32,22 +32,24 @@ msgid "Set to draft"
 msgstr "设为草稿"
 
 #. module: auction
-#: field:auction.deposit,partner_id:0 view:auction.lots:0
-#: xsl:report.auction.seller.list:0 field:report.deposit.border,seller:0
-#: field:report.seller.auction,seller:0 field:report.seller.auction2,seller:0
+#: field:auction.deposit,partner_id:0
+#: view:auction.lots:0
+#: field:report.deposit.border,seller:0
+#: field:report.seller.auction,seller:0
+#: field:report.seller.auction2,seller:0
 msgid "Seller"
 msgstr "卖方"
 
 #. module: auction
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "在这动作定义中无效的模块名"
+msgstr "在动作定义使用了无效的模块名。"
 
 #. module: auction
 #: selection:auction.lots.send.aie,date_ask,numerotation:0
 #: selection:auction.lots.send.aie,init,numerotation:0
 msgid "Provisoire"
-msgstr ""
+msgstr "暂时的"
 
 #. module: auction
 #: selection:auction.lots.send.aie,date_ask,numerotation:0
@@ -58,7 +60,7 @@ msgstr "确定的(订单目录)"
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_report_auction_object_date_tree1_my
 msgid "My Encoded Objects Per Day"
-msgstr "每天我编码的物品"
+msgstr "我每天编号的物品"
 
 #. module: auction
 #: model:ir.model,name:auction.model_auction_lot_history
@@ -79,26 +81,31 @@ msgstr "物品#"
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_action_bids_form
 msgid "Bids line"
-msgstr "出价线"
+msgstr "投标线"
 
 #. module: auction
 #: xsl:report.auction.deposit:0
 msgid "Deposit Form"
-msgstr "押金方式"
+msgstr "押金单"
 
 #. module: auction
-#: rml:auction.bids:0 view:auction.lots:0 field:auction.lots,ach_uid:0
+#: rml:auction.bids:0
+#: view:auction.lots:0
+#: field:auction.lots,ach_uid:0
 #: wizard_field:auction.lots.buyer_map,check,ach_uid:0
 #: wizard_field:auction.lots.make_invoice_buyer,init,buyer_id:0
-#: wizard_field:auction.pay.buy,init,buyer_id:0 rml:buyer.list:0
+#: wizard_field:auction.pay.buy,init,buyer_id:0
+#: rml:buyer.list:0
 #: model:ir.ui.menu,name:auction.auction_report_buyer_menu
-#: rml:report.auction.buyer.result:0 field:report.buyer.auction,buyer:0
+#: rml:report.auction.buyer.result:0
+#: field:report.buyer.auction,buyer:0
 #: field:report.buyer.auction2,buyer:0
 msgid "Buyer"
 msgstr "买家"
 
 #. module: auction
-#: field:report.auction.view,nobjects:0 field:report.buyer.auction,object:0
+#: field:report.auction.view,nobjects:0
+#: field:report.buyer.auction,object:0
 msgid "No of objects"
 msgstr "没有物品"
 
@@ -110,7 +117,7 @@ msgstr "拍卖最终结果"
 #. module: auction
 #: rml:auction.total.rml:0
 msgid "# of paid items (based on invoices):"
-msgstr "(根据发票)支付项目:"
+msgstr "支付项目(根据发票):"
 
 #. module: auction
 #: model:ir.actions.wizard,name:auction.wizard_numerotate_lot
@@ -123,7 +130,8 @@ msgid "Antique/Books, manuscripts, eso."
 msgstr "古董/书籍/手稿"
 
 #. module: auction
-#: view:auction.deposit:0 model:ir.model,name:auction.model_auction_deposit
+#: view:auction.deposit:0
+#: model:ir.model,name:auction.model_auction_deposit
 msgid "Deposit Border"
 msgstr "押金最少"
 
@@ -131,7 +139,7 @@ msgstr "押金最少"
 #: wizard_field:auction.lots.make_invoice,init,amount:0
 #: wizard_field:auction.lots.make_invoice_buyer,init,amount:0
 msgid "Invoiced Amount"
-msgstr "发票金额"
+msgstr "已开票金额"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
@@ -141,7 +149,7 @@ msgstr "古董/锡/铜制品"
 #. module: auction
 #: field:auction.lots,paid_ach:0
 msgid "Buyer invoice reconciled"
-msgstr "买家发票对账"
+msgstr "买家发票已核销"
 
 #. module: auction
 #: model:ir.actions.wizard,name:auction.auction_wizard_able_taken
@@ -151,7 +159,7 @@ msgstr "标记为带走"
 #. module: auction
 #: xsl:report.auction.seller.list:0
 msgid "Inv."
-msgstr ""
+msgstr "发票"
 
 #. module: auction
 #: field:auction.deposit.cost,amount:0
@@ -195,7 +203,8 @@ msgid "Objects by Auction"
 msgstr "拍卖物品"
 
 #. module: auction
-#: field:auction.lots,lot_num:0 field:report.unclassified.objects,lot_num:0
+#: field:auction.lots,lot_num:0
+#: field:report.unclassified.objects,lot_num:0
 msgid "List Number"
 msgstr "表编号"
 
@@ -230,7 +239,8 @@ msgid "Contemporary Art"
 msgstr "当代艺术"
 
 #. module: auction
-#: view:auction.lots:0 view:report.unclassified.objects:0
+#: view:auction.lots:0
+#: view:report.unclassified.objects:0
 msgid "Ref"
 msgstr "参考"
 
@@ -250,9 +260,10 @@ msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
 msgstr "错误:登入必须要先登出"
 
 #. module: auction
-#: view:auction.lots:0 field:report.buyer.auction,total_price:0
+#: view:auction.lots:0
+#: field:report.buyer.auction,total_price:0
 msgid "Total Adj."
-msgstr ""
+msgstr "合计"
 
 #. module: auction
 #: field:report.auction.view2,obj_margin_procent:0
@@ -260,7 +271,8 @@ msgid "Net margin (%)"
 msgstr "净利润(%)"
 
 #. module: auction
-#: selection:auction.lots,state:0 selection:report.object.encoded,state:0
+#: selection:auction.lots,state:0
+#: selection:report.object.encoded,state:0
 #: selection:report.seller.auction,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Unsold"
@@ -274,7 +286,7 @@ msgstr "日期"
 #. module: auction
 #: constraint:product.template:0
 msgid "Error: UOS must be in a different category than the UOM"
-msgstr "错误:销售单位必须要和计量单位不同类型"
+msgstr "错误:销售单位必须和计量单位在不同的分类."
 
 #. module: auction
 #: rml:auction.total.rml:0
@@ -288,7 +300,9 @@ msgid "Seller Costs"
 msgstr "卖家费用"
 
 #. module: auction
-#: view:auction.bid:0 view:auction.bid_line:0 view:auction.lots:0
+#: view:auction.bid:0
+#: view:auction.bid_line:0
+#: view:auction.lots:0
 #: field:auction.lots,bid_lines:0
 #: model:ir.actions.report.xml,name:auction.bid_auction
 #: model:ir.ui.menu,name:auction.menu_action_bid_open
@@ -311,7 +325,8 @@ msgid "Contact"
 msgstr "联系"
 
 #. module: auction
-#: field:report.auction.view,obj_ret:0 field:report.object.encoded,obj_ret:0
+#: field:report.auction.view,obj_ret:0
+#: field:report.object.encoded,obj_ret:0
 #: field:report.object.encoded.manager,obj_ret:0
 msgid "# obj ret"
 msgstr "物品#"
@@ -339,7 +354,7 @@ msgstr "佣金"
 #. module: auction
 #: wizard_button:auction.lots.numerotate,search,init:0
 msgid "Back"
-msgstr "后面"
+msgstr "后退"
 
 #. module: auction
 #: model:ir.actions.act_window,name:auction.action_all_objects_unsold
@@ -352,17 +367,20 @@ msgid "Sold Objects"
 msgstr "已卖出的物品"
 
 #. module: auction
-#: view:report.buyer.auction2:0 view:report.seller.auction2:0
+#: view:report.buyer.auction2:0
+#: view:report.seller.auction2:0
 msgid "Sum net margin"
 msgstr "合计净利润"
 
 #. module: auction
 #: view:auction.deposit:0
 msgid "Deposit Border Form"
-msgstr "押金最少方式"
+msgstr "最少押金单"
 
 #. module: auction
-#: field:auction.bid,bid_lines:0 rml:auction.bids:0 rml:bids.lots:0
+#: field:auction.bid,bid_lines:0
+#: rml:auction.bids:0
+#: rml:bids.lots:0
 #: model:ir.model,name:auction.model_auction_bid_line
 msgid "Bid"
 msgstr "出价"
@@ -373,15 +391,17 @@ msgid "Langage"
 msgstr ""
 
 #. module: auction
-#: field:auction.bid_line,lot_id:0 field:auction.lot.history,lot_id:0
-#: view:auction.lots:0 model:ir.model,name:auction.model_auction_lots
+#: field:auction.bid_line,lot_id:0
+#: field:auction.lot.history,lot_id:0
+#: view:auction.lots:0
+#: model:ir.model,name:auction.model_auction_lots
 msgid "Object"
 msgstr "物品"
 
 #. module: auction
 #: model:ir.actions.wizard,name:auction.wizard_map_user
 msgid "Map buyer username to Partners"
-msgstr "从买家用户到业务伙伴"
+msgstr "从买家到业务伙伴"
 
 #. module: auction
 #: wizard_field:auction.lots.numerotate,search,lot_num:0
@@ -407,9 +427,11 @@ msgid "Auction buyer reporting form view"
 msgstr "拍卖买方报表"
 
 #. module: auction
-#: field:auction.dates,state:0 field:auction.lots,state:0
+#: field:auction.dates,state:0
+#: field:auction.lots,state:0
 #: field:report.auction.adjudication,state:0
-#: field:report.object.encoded,state:0 field:report.seller.auction,state:0
+#: field:report.object.encoded,state:0
+#: field:report.seller.auction,state:0
 #: field:report.unclassified.objects,state:0
 msgid "Status"
 msgstr "状态"
@@ -425,7 +447,8 @@ msgid "Antique/Cartoons"
 msgstr "古董/卡通"
 
 #. module: auction
-#: view:auction.lots:0 selection:auction.lots,state:0
+#: view:auction.lots:0
+#: selection:auction.lots,state:0
 #: selection:report.seller.auction,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Sold"
@@ -449,7 +472,7 @@ msgstr "费用科目"
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_wizard_emporte
 msgid "Deliveries Management"
-msgstr "发货管理"
+msgstr "交付管理"
 
 #. module: auction
 #: field:auction.lots,obj_desc:0
@@ -482,47 +505,48 @@ msgstr ""
 #. module: auction
 #: model:ir.actions.wizard,name:auction.wizard_pay
 msgid "Pay objects of the buyer"
-msgstr ""
+msgstr "买家支付的物品"
 
 #. module: auction
 #: view:report.deposit.border:0
 msgid "Depositer's statistics"
-msgstr ""
+msgstr "押金统计"
 
 #. module: auction
 #: view:auction.lots:0
 msgid "Buyer information"
-msgstr ""
+msgstr "买家信息"
 
 #. module: auction
 #: model:ir.model,name:auction.model_report_seller_auction
 msgid "Auction Reporting on seller view"
-msgstr ""
+msgstr "拍卖报表卖家视图"
 
 #. module: auction
 #: field:auction.lots,name2:0
 msgid "Short Description (2)"
-msgstr ""
+msgstr "简短描述(2)"
 
 #. module: auction
 #: model:ir.model,name:auction.model_auction_dates
 msgid "auction.dates"
-msgstr ""
+msgstr "拍卖.日期"
 
 #. module: auction
-#: rml:auction.total.rml:0 model:ir.ui.menu,name:auction.auction_buyers_menu
+#: rml:auction.total.rml:0
+#: model:ir.ui.menu,name:auction.auction_buyers_menu
 msgid "Buyers"
-msgstr ""
+msgstr "买家"
 
 #. module: auction
 #: wizard_field:auction.pay.buy,init,amount:0
 #: wizard_field:auction.pay.buy,init,amount2:0
 #: wizard_field:auction.pay.buy,init,amount3:0
 msgid "Amount paid"
-msgstr ""
+msgstr "已付款金额"
 
 #. module: auction
-#: view:board.board:0
+#: model:ir.ui.menu,name:auction.menu_report_latest_doposit_tree
 msgid "My Latest Deposits"
 msgstr "我最近的押金"
 
@@ -533,27 +557,27 @@ msgstr "我最近的押金"
 #: field:report.auction.view,min_est:0
 #: field:report.unclassified.objects,lot_est1:0
 msgid "Minimum Estimation"
-msgstr ""
+msgstr "最低估价"
 
 #. module: auction
 #: view:auction.dates:0
 msgid "Accounting"
-msgstr ""
+msgstr "会计"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_buyer_allmonth_view2
 msgid "Buyer's Revenues"
-msgstr ""
+msgstr "买家收入"
 
 #. module: auction
 #: model:ir.model,name:auction.model_report_auction_adjudication
 msgid "report_auction_adjudication"
-msgstr ""
+msgstr "拍卖最终结果报表"
 
 #. module: auction
 #: field:auction.bid_line,price:0
 msgid "Maximum Price"
-msgstr ""
+msgstr "最高价格"
 
 #. module: auction
 #: selection:auction.lots.send.aie,date_ask,lang:0
@@ -563,22 +587,22 @@ msgstr ""
 #. module: auction
 #: view:report.buyer.auction2:0
 msgid "Auction buyer reporting tree view2"
-msgstr ""
+msgstr "拍卖买家报表树视图2"
 
 #. module: auction
 #: wizard_view:auction.lots.sms_send,init:0
 msgid "Bulk SMS send"
-msgstr ""
+msgstr "批量发送SMS"
 
 #. module: auction
 #: wizard_view:auction.taken,init:0
 msgid "Select lots which are Sold"
-msgstr ""
+msgstr "选择已售出的批"
 
 #. module: auction
 #: field:auction.lots,statement_id:0
 msgid "Payment"
-msgstr ""
+msgstr "付款"
 
 #. module: auction
 #: selection:auction.lots.send.aie,date_ask,lang:0
@@ -588,50 +612,50 @@ msgstr ""
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Antique/Old weapons and militaria"
-msgstr ""
+msgstr "古董/旧武器和军备"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Antique/Oriental Arts/Chineese furnitures"
-msgstr ""
+msgstr "古董/东方艺术品/中国家具"
 
 #. module: auction
 #: selection:auction.deposit,method:0
 msgid "Keep until sold"
-msgstr ""
+msgstr "保留直到售出"
 
 #. module: auction
 #: wizard_button:auction.lots.numerotate,init,choice:0
 #: wizard_button:auction.lots.send.aie,init,date_ask:0
 #: wizard_button:auction.lots.send.aie.results,init,date_ask:0
 msgid "Continue"
-msgstr ""
+msgstr "继续"
 
 #. module: auction
 #: field:report.object.encoded,obj_num:0
 #: field:report.object.encoded.manager,obj_num:0
 msgid "# of Encoded obj."
-msgstr ""
+msgstr "# 物品编码"
 
 #. module: auction
 #: xsl:report.auction.vnd_bordereau:0
 msgid "List N."
-msgstr ""
+msgstr "列表 N"
 
 #. module: auction
 #: field:report.deposit.border,moy_est:0
 msgid "Avg. Est"
-msgstr ""
+msgstr "平均值"
 
 #. module: auction
 #: rml:auction.total.rml:0
 msgid "# of sellers:"
-msgstr ""
+msgstr "# 卖家"
 
 #. module: auction
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "错误:无效EAN编码"
 
 #. module: auction
 #: model:ir.module.module,description:auction.module_meta_information
@@ -642,26 +666,31 @@ msgid ""
 "     Delivery Management. \n"
 "    "
 msgstr ""
+"这模块提供以下功能\n"
+"    管理艺术家, 作品, 买家, 卖家和拍卖\n"
+"    管理出价, 售出跟踪, 支付和未售出物品\n"
+"    交付管理 \n"
+"    "
 
 #. module: auction
 #: rml:auction.total.rml:0
 msgid "# of items taken away:"
-msgstr ""
+msgstr "# 带走的物品:"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_auction_allmonth_view1
 msgid "Auction's Summary"
-msgstr ""
+msgstr "拍卖合计:"
 
 #. module: auction
 #: rml:buyer.list:0
 msgid "%)"
-msgstr ""
+msgstr "%)"
 
 #. module: auction
 #: wizard_view:auction.lots.able,init:0
 msgid "Confirmation set taken away"
-msgstr ""
+msgstr "确认设为带走"
 
 #. module: auction
 #: wizard_field:auction.lots.make_invoice,init,objects:0
@@ -670,7 +699,7 @@ msgstr ""
 #: wizard_field:auction.lots.send.aie.results,date_ask,objects:0
 #: field:report.deposit.border,nb_obj:0
 msgid "# of objects"
-msgstr ""
+msgstr "# 物品"
 
 #. module: auction
 #: field:auction.lots,lot_est2:0
@@ -679,82 +708,83 @@ msgstr ""
 #: field:report.auction.view,max_est:0
 #: field:report.unclassified.objects,lot_est2:0
 msgid "Maximum Estimation"
-msgstr ""
+msgstr "最高估价"
 
 #. module: auction
 #: field:auction.lots,buyer_price:0
 msgid "Buyer price"
-msgstr ""
+msgstr "买家价格"
 
 #. module: auction
 #: model:ir.actions.wizard,name:auction.auction_wizard_payer_sel
 msgid "Mark as paid for seller"
-msgstr ""
+msgstr "标记为卖家支付"
 
 #. module: auction
 #: model:ir.actions.report.xml,name:auction.seller_form_id
 msgid "Seller List"
-msgstr ""
+msgstr "卖家列表"
 
 #. module: auction
 #: field:auction.lots,is_ok:0
 msgid "Buyer's payment"
-msgstr ""
+msgstr "买家付款"
 
 #. module: auction
 #: view:auction.dates:0
 msgid "Close + Create all invoices"
-msgstr ""
+msgstr "费用 + 创建所有发票"
 
 #. module: auction
 #: model:ir.actions.wizard,name:auction.auction_catalog_flagy
 msgid "Auction Catalog Flagey"
-msgstr ""
+msgstr "拍卖目录Flagey"
 
 #. module: auction
 #: field:auction.lot.history,price:0
 msgid "Withdrawn price"
-msgstr ""
+msgstr "撤销价格"
 
 #. module: auction
 #: model:account.tax,name:auction.auction_tax4
 msgid "Seller Costs1"
-msgstr ""
+msgstr "卖家成本1"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Antique/Verreries"
-msgstr ""
+msgstr "古董/玻璃器皿"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Antique/Toys"
-msgstr ""
+msgstr "古董/玩具"
 
 #. module: auction
-#: field:auction.deposit,create_uid:0 field:auction.lots,create_uid:0
+#: field:auction.deposit,create_uid:0
+#: field:auction.lots,create_uid:0
 msgid "Created by"
-msgstr ""
+msgstr "创建者"
 
 #. module: auction
 #: xsl:report.auction.ach_bordereau:0
 msgid "Buyer form"
-msgstr ""
+msgstr "买家"
 
 #. module: auction
 #: xsl:report.auction.deposit:0
 msgid "Estimate"
-msgstr ""
+msgstr "预计"
 
 #. module: auction
 #: rml:auction.total.rml:0
 msgid "# of buyers:"
-msgstr ""
+msgstr "# 买家:"
 
 #. module: auction
 #: field:auction.lots,costs:0
 msgid "Indirect costs"
-msgstr ""
+msgstr "间接成本"
 
 #. module: auction
 #: xsl:report.auction.ach_bordereau:0
@@ -764,53 +794,53 @@ msgstr ""
 #. module: auction
 #: constraint:account.tax.code:0
 msgid "Error ! You can not create recursive accounts."
-msgstr ""
+msgstr "错误!你不能创建递归的科目"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.auction_menu_root
 msgid "Auction Management"
-msgstr ""
+msgstr "拍卖管理"
 
 #. module: auction
 #: field:auction.dates,journal_seller_id:0
 msgid "Seller Journal"
-msgstr ""
+msgstr "卖家记录集合"
 
 #. module: auction
 #: view:report.buyer.auction:0
 msgid "Auction buyer reporting tree view"
-msgstr ""
+msgstr "拍卖买家报表树视图"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_auction_artist
 msgid "Define Artists"
-msgstr ""
+msgstr "定义艺术家"
 
 #. module: auction
 #: field:auction.lot.category,name:0
 msgid "Category Name"
-msgstr ""
+msgstr "类别名称"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_report_auction_estimation_adj_category_manager
 #: model:ir.ui.menu,name:auction.menu_report_auction_estimation_adj_category_member
 msgid "Comparison of estimations"
-msgstr ""
+msgstr "估价比较"
 
 #. module: auction
 #: model:ir.actions.report.xml,name:auction.v_report_barcode_lot
 msgid "Code barres du lot"
-msgstr ""
+msgstr "条码批"
 
 #. module: auction
 #: wizard_button:auction.lots.numerotate,not_exist,init:0
 msgid "Retry"
-msgstr ""
+msgstr "重试"
 
 #. module: auction
 #: field:auction.artists,birth_death_dates:0
 msgid "Birth / Death dates"
-msgstr ""
+msgstr "出生/ 死亡日期"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
@@ -820,7 +850,7 @@ msgstr ""
 #. module: auction
 #: model:ir.model,name:auction.model_report_unclassified_objects
 msgid "Unclassified objects "
-msgstr ""
+msgstr "无类别物品 "
 
 #. module: auction
 #: wizard_button:auction.lots.numerotate_cont,init,set_number:0
@@ -837,22 +867,22 @@ msgstr ""
 #. module: auction
 #: xsl:report.auction.deposit:0
 msgid "Document type"
-msgstr ""
+msgstr "文档类型"
 
 #. module: auction
 #: model:ir.model,name:auction.model_report_auction_estimation_adj_category
 msgid "comparaison estimate/adjudication "
-msgstr ""
+msgstr "估价比价/ 最终结果 "
 
 #. module: auction
 #: rml:buyer.list:0
 msgid "Adj(EUR)"
-msgstr ""
+msgstr "最终结果(EUR)"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Cont. Art/Other Media"
-msgstr ""
+msgstr "艺术品/ 其它媒体"
 
 #. module: auction
 #: model:ir.actions.wizard,name:auction.wizard_emporte
@@ -860,42 +890,44 @@ msgid "Gestion emporte"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.lots.list.landscape:0 xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.lots.list.landscape:0
+#: xsl:report.auction.vnd_bordereau:0
 msgid "Cat. N."
 msgstr ""
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_auction_object_cat
 msgid "Object Categories"
-msgstr ""
+msgstr "物品类别"
 
 #. module: auction
 #: wizard_field:auction.lots.send.aie,date_ask,img_send:0
 msgid "Send Image also ?"
-msgstr ""
+msgstr "也传送图像?"
 
 #. module: auction
 #: view:auction.deposit:0
 msgid "General Informations"
-msgstr ""
+msgstr "一般信息"
 
 #. module: auction
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "在这动作定义中无效的模块名"
+msgstr "无效XML视图结构!"
 
 #. module: auction
 #: view:report.auction.view:0
 msgid "Auctions results"
-msgstr ""
+msgstr "拍卖结果"
 
 #. module: auction
 #: wizard_field:auction.lots.sms_send,init,app_id:0
 msgid "API ID"
-msgstr ""
+msgstr "API ID"
 
 #. module: auction
-#: field:auction.bid,name:0 field:auction.bid_line,bid_id:0
+#: field:auction.bid,name:0
+#: field:auction.bid_line,bid_id:0
 msgid "Bid ID"
 msgstr ""
 
@@ -907,40 +939,40 @@ msgstr ""
 #. module: auction
 #: field:report.buyer.auction2,net_margin:0
 msgid "Net Margin"
-msgstr ""
+msgstr "净利润"
 
 #. module: auction
 #: field:auction.lots,vnd_lim_net:0
 msgid "Net limit ?"
-msgstr ""
+msgstr "净限额?"
 
 #. module: auction
 #: rml:auction.total.rml:0
 msgid "# of commissions:"
-msgstr ""
+msgstr "# 佣金:"
 
 #. module: auction
 #: model:ir.actions.act_window,name:auction.action_unclassified_objects
 #: model:ir.ui.menu,name:auction.menu_all_objects_unclassified
 #: view:report.unclassified.objects:0
 msgid "Unclassified objects"
-msgstr ""
+msgstr "无类别物品"
 
 #. module: auction
 #: wizard_view:auction.lots.make_invoice_buyer,init:0
 msgid "(Keep empty for automatic number)"
-msgstr ""
+msgstr "(空为自动编号)"
 
 #. module: auction
 #: model:ir.model,name:auction.model_report_auction_object_date
 #: view:report.auction.object.date:0
 msgid "Objects per day"
-msgstr ""
+msgstr "每天物品"
 
 #. module: auction
 #: model:product.template,name:auction.monproduit_product_template
 msgid "Oeuvres a 21%"
-msgstr ""
+msgstr "全部 21%"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
@@ -948,97 +980,99 @@ msgid "Antique/Carpet and textilles"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.seller.list:0 field:report.object.encoded.manager,adj:0
+#: field:report.object.encoded.manager,adj:0
 msgid "Adj."
-msgstr ""
+msgstr "最终结果"
 
 #. module: auction
-#: field:auction.lot.history,name:0 field:report.attendance,name:0
-#: field:report.auction.adjudication,date:0 xsl:report.auction.deposit:0
+#: field:auction.lot.history,name:0
+#: field:report.attendance,name:0
+#: field:report.auction.adjudication,date:0
 #: field:report.auction.estimation.adj.category,date:0
 msgid "Date"
-msgstr ""
+msgstr "日期"
 
 #. module: auction
 #: field:auction.lots,obj_ret:0
 msgid "Price retired"
-msgstr ""
+msgstr "价格撤回"
 
 #. module: auction
 #: view:auction.deposit:0
 msgid "Extra Costs"
-msgstr ""
+msgstr "额外费用"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_auction_dates_new
 msgid "New Auction Dates"
-msgstr ""
+msgstr "新拍卖日期"
 
 #. module: auction
 #: field:auction.lots,paid_vnd:0
 msgid "Seller Paid"
-msgstr ""
+msgstr "卖家支付"
 
 #. module: auction
 #: field:auction.deposit,date_dep:0
 msgid "Deposit date"
-msgstr ""
+msgstr "押金日期"
 
 #. module: auction
 #: model:ir.actions.report.xml,name:auction.id_deposit
 msgid "Deposits"
-msgstr ""
+msgstr "押金"
 
 #. module: auction
 #: field:auction.deposit,specific_cost_ids:0
 msgid "Specific Costs"
-msgstr ""
+msgstr "特别费用"
 
 #. module: auction
-#: view:report.buyer.auction2:0 view:report.seller.auction2:0
+#: view:report.buyer.auction2:0
+#: view:report.seller.auction2:0
 msgid "Sum adj"
-msgstr ""
+msgstr "最终结果合计"
 
 #. module: auction
-#: view:auction.dates:0 view:report.auction.view2:0
+#: view:auction.dates:0
+#: view:report.auction.view2:0
 msgid "Auctions"
-msgstr ""
+msgstr "拍卖"
 
 #. module: auction
 #: field:report.seller.auction,object_number:0
 msgid "No of Objects"
-msgstr ""
+msgstr "没物品"
 
 #. module: auction
 #: view:auction.lots:0
 msgid "History"
-msgstr ""
+msgstr "日志"
 
 #. module: auction
 #: field:auction.lot.category,priority:0
 msgid "Priority"
-msgstr ""
+msgstr "优先级"
 
 #. module: auction
 #: rml:auction.code_bar_lot:0
 msgid "Nr."
-msgstr ""
+msgstr "Nr."
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Antique/Painting"
-msgstr ""
+msgstr "古董/ 绘画"
 
 #. module: auction
 #: field:auction.lot.category,aie_categ:0
 msgid "Aie Category"
-msgstr ""
+msgstr "Aie类别"
 
 #. module: auction
-#: xsl:flagey.huissier:0 rml:report.auction.buyer.result:0
-#: xsl:report.auction.deposit:0
+#: rml:report.auction.buyer.result:0
 msgid "Num"
-msgstr ""
+msgstr "编号"
 
 #. module: auction
 #: wizard_button:auction.lots.able,init,end:0
@@ -1055,94 +1089,97 @@ msgstr ""
 #: wizard_button:auction.pay.buy,init,end:0
 #: wizard_button:auction.payer.sel,init,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "取消"
 
 #. module: auction
 #: view:auction.dates:0
 msgid "Beginning of the auction"
-msgstr ""
+msgstr "开始拍卖"
 
 #. module: auction
 #: field:auction.artists,biography:0
 msgid "Biography"
-msgstr ""
+msgstr "传记"
 
 #. module: auction
 #: field:auction.lots,lot_local:0
 msgid "Location"
-msgstr ""
+msgstr "位置"
 
 #. module: auction
 #: wizard_view:auction.payer.sel,init:0
 msgid "Check payment for seller"
-msgstr ""
+msgstr "检查卖家付款"
 
 #. module: auction
 #: model:ir.actions.act_window,name:auction.view_report_object_by_auction
 msgid "Detailed lots"
-msgstr ""
+msgstr "详细"
 
 #. module: auction
-#: view:board.board:0
+#: view:report.object.encoded:0
+#: view:report.object.encoded.manager:0
 msgid "Objects statistics"
 msgstr "物品统计"
 
 #. module: auction
 #: view:auction.dates:0
 msgid "Analytic"
-msgstr ""
+msgstr "分析"
 
 #. module: auction
 #: model:ir.actions.wizard,name:auction.wizard_results
 msgid "Send results to Auction-in-europe.com"
-msgstr ""
+msgstr "发送结果到europe.com"
 
 #. module: auction
-#: rml:bids.lots:0 rml:bids.phones.details:0
+#: rml:bids.lots:0
+#: rml:bids.phones.details:0
 msgid "Cat.N"
 msgstr ""
 
 #. module: auction
 #: selection:auction.deposit,method:0
 msgid "Decrease limit of 10%"
-msgstr ""
+msgstr "减少10%限制"
 
 #. module: auction
 #: field:auction.dates,adj_total:0
 #: field:report.auction.adjudication,adj_total:0
 #: field:report.auction.estimation.adj.category,adj_total:0
 msgid "Total Adjudication"
-msgstr ""
+msgstr "最终结果合计"
 
 #. module: auction
 #: model:ir.actions.act_window,name:auction.action_auction_reporting1
 #: model:ir.actions.act_window,name:auction.action_auction_reporting_all1
 #: model:ir.actions.act_window,name:auction.action_auction_reporting_all2
 msgid "Seller's auction"
-msgstr ""
+msgstr "卖家拍卖"
 
 #. module: auction
 #: model:ir.actions.wizard,name:auction.wizard_invoice_buyer1
 msgid "Invoice Buyer objects"
-msgstr ""
+msgstr "买家物品发票"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_seller_allmonth_view2
 msgid "Seller's Revenues"
-msgstr ""
+msgstr "卖家收入"
 
 #. module: auction
 #: xsl:flagey.huissier:0
 msgid "Price"
-msgstr ""
+msgstr "价格"
 
 #. module: auction
 #: rml:bids.phones.details:0
 msgid "-"
-msgstr ""
+msgstr "-"
 
 #. module: auction
-#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0
+#: xsl:report.auction.vnd_bordereau:0
 msgid "Subtotal:"
 msgstr ""
 
@@ -1158,7 +1195,8 @@ msgid "Invoice Number"
 msgstr ""
 
 #. module: auction
-#: field:report.buyer.auction,date:0 field:report.buyer.auction2,date:0
+#: field:report.buyer.auction,date:0
+#: field:report.buyer.auction2,date:0
 #: field:report.object.encoded,date:0
 #: field:report.object.encoded.manager,date:0
 #: field:report.seller.auction,date:0
@@ -1181,7 +1219,8 @@ msgid "Name"
 msgstr ""
 
 #. module: auction
-#: field:auction.deposit,name:0 field:auction.lots,bord_vnd_id:0
+#: field:auction.deposit,name:0
+#: field:auction.lots,bord_vnd_id:0
 #: wizard_field:auction.lots.numerotate,init,bord_vnd_id:0
 #: field:report.deposit.border,bord:0
 #: field:report.unclassified.objects,bord_vnd_id:0
@@ -1209,7 +1248,7 @@ msgid "Login"
 msgstr ""
 
 #. module: auction
-#: rml:buyer.list:0 xsl:report.auction.seller.list:0
+#: rml:buyer.list:0
 msgid "To pay"
 msgstr ""
 
@@ -1229,7 +1268,8 @@ msgid "Seller Form"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,lot_type:0 field:report.unclassified.objects,lot_type:0
+#: field:auction.lots,lot_type:0
+#: field:report.unclassified.objects,lot_type:0
 msgid "Object category"
 msgstr ""
 
@@ -1298,7 +1338,8 @@ msgid "Payment's history"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0
+#: xsl:report.auction.vnd_bordereau:0
 msgid "Document"
 msgstr ""
 
@@ -1370,7 +1411,8 @@ msgid "Cont. Art/Curiosa"
 msgstr ""
 
 #. module: auction
-#: field:auction.bid,auction_id:0 field:auction.lots,auction_id:0
+#: field:auction.bid,auction_id:0
+#: field:auction.lots,auction_id:0
 #: wizard_field:auction.lots.auction_move,init,auction_id:0
 #: wizard_field:auction.lots.send.aie,date_ask,dates:0
 #: wizard_field:auction.lots.send.aie,init,dates:0
@@ -1418,7 +1460,8 @@ msgid "Cont. Art/Jewelry"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.deposit:0 xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.deposit:0
+#: xsl:report.auction.vnd_bordereau:0
 msgid "Inventory"
 msgstr ""
 
@@ -1428,7 +1471,7 @@ msgid "Next Auctions"
 msgstr ""
 
 #. module: auction
-#: rml:buyer.list:0 xsl:report.auction.seller.list:0
+#: rml:buyer.list:0
 msgid "#"
 msgstr ""
 
@@ -1530,7 +1573,7 @@ msgstr ""
 #: constraint:product.template:0
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
-msgstr ""
+msgstr "错误:默认的计量单位和这货物的计量单位必须是同一类型."
 
 #. module: auction
 #: xsl:report.auction.vnd_bordereau:0
@@ -1558,14 +1601,15 @@ msgid "Buyer Journal"
 msgstr ""
 
 #. module: auction
-#: selection:auction.lots,state:0 xsl:report.auction.ach_bordereau:0
+#: selection:auction.lots,state:0
 #: selection:report.object.encoded,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Paid"
 msgstr ""
 
 #. module: auction
-#: rml:bids.lots:0 rml:bids.phones.details:0
+#: rml:bids.lots:0
+#: rml:bids.phones.details:0
 msgid "Phone"
 msgstr ""
 
@@ -1596,8 +1640,7 @@ msgid "Antique/Sculpture, bronze, eso."
 msgstr ""
 
 #. module: auction
-#: rml:buyer.list:0 xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.seller.list:0 xsl:report.auction.vnd_bordereau:0
+#: rml:buyer.list:0
 msgid "Total:"
 msgstr ""
 
@@ -1661,7 +1704,7 @@ msgstr ""
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr ""
+msgstr "对象名称必须以“x_”开头且不能包含任何特殊字符！"
 
 #. module: auction
 #: field:auction.deposit,transfer:0
@@ -1741,7 +1784,8 @@ msgid "Plate Number:"
 msgstr ""
 
 #. module: auction
-#: view:auction.deposit:0 field:auction.deposit,lot_id:0
+#: view:auction.deposit:0
+#: field:auction.deposit,lot_id:0
 #: model:ir.ui.menu,name:auction.auction_objects_menu
 msgid "Objects"
 msgstr "对象"
@@ -1763,9 +1807,10 @@ msgid "Allow Negative Amount"
 msgstr ""
 
 #. module: auction
-#: rml:auction.bids:0 view:auction.lots:0 rml:auction.total.rml:0
+#: rml:auction.bids:0
+#: view:auction.lots:0
+#: rml:auction.total.rml:0
 #: model:ir.ui.menu,name:auction.auction_report_auction_menu
-#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.deposit:0
 msgid "Auction"
 msgstr ""
 
@@ -1775,12 +1820,17 @@ msgid "Cont. Art/Shows"
 msgstr ""
 
 #. module: auction
-#: field:auction.dates,name:0 field:auction.lot.history,auction_id:0
+#: field:auction.dates,name:0
+#: field:auction.lot.history,auction_id:0
 #: field:report.auction.adjudication,name:0
-#: field:report.auction.view,auction_id:0 field:report.auction.view2,auction:0
-#: field:report.auction.view2,date:0 field:report.buyer.auction,auction:0
-#: field:report.buyer.auction2,auction:0 field:report.seller.auction,auction:0
-#: field:report.seller.auction2,auction:0 field:report.seller.auction2,date:0
+#: field:report.auction.view,auction_id:0
+#: field:report.auction.view2,auction:0
+#: field:report.auction.view2,date:0
+#: field:report.buyer.auction,auction:0
+#: field:report.buyer.auction2,auction:0
+#: field:report.seller.auction,auction:0
+#: field:report.seller.auction2,auction:0
+#: field:report.seller.auction2,date:0
 #: field:report.unclassified.objects,auction:0
 msgid "Auction date"
 msgstr ""
@@ -1842,7 +1892,6 @@ msgstr ""
 
 #. module: auction
 #: field:report.attendance,total_attendance:0
-#: xsl:report.auction.ach_bordereau:0
 msgid "Total"
 msgstr ""
 
@@ -1932,7 +1981,8 @@ msgstr ""
 
 #. module: auction
 #: wizard_view:auction.lots.auction_move,init:0
-msgid "Warning, this will erase the object adjudication price and its buyer !"
+msgid ""
+"Warning, this will erase the object adjudication price and its buyer !"
 msgstr ""
 
 #. module: auction
@@ -1956,14 +2006,16 @@ msgid "Income Account"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,net_revenue:0 field:report.auction.view2,net_revenue:0
+#: field:auction.lots,net_revenue:0
+#: field:report.auction.view2,net_revenue:0
 #: field:report.object.encoded.manager,net_revenue:0
 #: field:report.seller.auction2,net_revenue:0
 msgid "Net revenue"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.deposit:0 xsl:report.auction.lots.list.landscape:0
+#: xsl:report.auction.deposit:0
+#: xsl:report.auction.lots.list.landscape:0
 msgid "Limit"
 msgstr ""
 
@@ -2035,7 +2087,8 @@ msgid "Closed"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,obj_comm:0 field:report.unclassified.objects,obj_comm:0
+#: field:auction.lots,obj_comm:0
+#: field:report.unclassified.objects,obj_comm:0
 msgid "Commission"
 msgstr ""
 
@@ -2047,7 +2100,7 @@ msgstr ""
 #. module: auction
 #: constraint:res.partner:0
 msgid "The VAT doesn't seem to be correct."
-msgstr ""
+msgstr "这增值税似乎不正确"
 
 #. module: auction
 #: field:report.attendance,employee_id:0
@@ -2055,7 +2108,8 @@ msgid "Employee"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0
+#: xsl:report.auction.vnd_bordereau:0
 msgid "Adj.(EUR)"
 msgstr ""
 
@@ -2067,7 +2121,7 @@ msgstr ""
 #. module: auction
 #: model:ir.ui.menu,name:auction.auction_report_menu
 msgid "Reporting"
-msgstr "报表"
+msgstr "内部报表"
 
 #. module: auction
 #: view:auction.lots:0
@@ -2132,7 +2186,8 @@ msgid "Invoiced"
 msgstr ""
 
 #. module: auction
-#: view:auction.lots:0 selection:auction.lots,state:0
+#: view:auction.lots:0
+#: selection:auction.lots,state:0
 msgid "Taken away"
 msgstr ""
 
@@ -2166,10 +2221,11 @@ msgstr ""
 #. module: auction
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "错误！您不能创建递归的相关成员。"
 
 #. module: auction
-#: selection:auction.dates,state:0 selection:auction.lots,state:0
+#: selection:auction.dates,state:0
+#: selection:auction.lots,state:0
 #: selection:report.auction.adjudication,state:0
 #: selection:report.object.encoded,state:0
 #: selection:report.seller.auction,state:0
@@ -2198,7 +2254,8 @@ msgid "Adj"
 msgstr ""
 
 #. module: auction
-#: view:auction.dates:0 model:ir.ui.menu,name:auction.auction_date_menu
+#: view:auction.dates:0
+#: model:ir.ui.menu,name:auction.auction_date_menu
 msgid "Auction Dates"
 msgstr ""
 
@@ -2344,11 +2401,11 @@ msgid "Report Sign In/Out"
 msgstr ""
 
 #. module: auction
-#: view:auction.deposit:0 field:auction.deposit,info:0 view:auction.lots:0
+#: view:auction.deposit:0
+#: field:auction.deposit,info:0
+#: view:auction.lots:0
 #: wizard_field:auction.lots.numerotate,search,obj_desc:0
-#: rml:bids.phones.details:0 xsl:flagey.huissier:0
-#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.deposit:0
-#: xsl:report.auction.lots.list.landscape:0 xsl:report.auction.vnd_bordereau:0
+#: rml:bids.phones.details:0
 msgid "Description"
 msgstr ""
 
@@ -2358,7 +2415,8 @@ msgid "Cont. Art/Arts"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,obj_price:0 field:report.auction.view,adj_price:0
+#: field:auction.lots,obj_price:0
+#: field:report.auction.view,adj_price:0
 #: field:report.unclassified.objects,obj_price:0
 msgid "Adjudication price"
 msgstr ""
@@ -2420,7 +2478,8 @@ msgid "Pay objects"
 msgstr ""
 
 #. module: auction
-#: view:report.object.encoded:0 view:report.object.encoded.manager:0
+#: view:report.object.encoded:0
+#: view:report.object.encoded.manager:0
 msgid "# objects"
 msgstr ""
 
@@ -2488,84 +2547,88 @@ msgstr ""
 #. module: auction
 #: view:board.board:0
 msgid "Objects by day"
-msgstr "天物品"
+msgstr ""
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_board_auction_manager
 msgid "Auction Manager"
-msgstr "拍卖管理"
+msgstr ""
 
 #. module: auction
 #: view:board.board:0
 msgid "Summary pointing by user"
-msgstr "每用户摘要指示"
+msgstr ""
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_board_auction
 msgid "Auction Member"
-msgstr "拍卖会员"
+msgstr ""
 
 #. module: auction
 #: model:ir.actions.act_window,name:auction.open_board_auction
 msgid "Auction member board"
-msgstr "拍卖会员控制台"
+msgstr ""
 
 #. module: auction
 #: view:board.board:0
 msgid "Auction manager "
-msgstr "拍卖管理 "
+msgstr ""
 
 #. module: auction
 #: model:ir.module.module,shortdesc:auction.module_meta_information
 msgid "Board for Auction"
-msgstr "拍卖控制台"
+msgstr ""
 
 #. module: auction
 #: view:board.board:0
 msgid "Estimations/Adjudication"
-msgstr "评价/最终结果"
+msgstr ""
 
 #. module: auction
 #: view:board.board:0
 msgid "Total Adjudications"
-msgstr "最终结果合计"
+msgstr ""
 
 #. module: auction
 #: view:board.board:0
 msgid "Latest objects"
-msgstr "最新的物品"
+msgstr ""
 
 #. module: auction
 #: view:board.board:0
 msgid "Latest deposits"
-msgstr "最近的押金"
+msgstr ""
 
 #. module: auction
 #: view:board.board:0
 msgid "Menu"
-msgstr "菜单"
+msgstr ""
 
 #. module: auction
 #: view:board.board:0
 msgid "My objects By Day"
-msgstr "每天我的物品"
+msgstr ""
 
 #. module: auction
 #: view:board.board:0
 msgid "My board"
-msgstr "我的控制台"
+msgstr ""
 
 #. module: auction
 #: model:ir.actions.act_window,name:auction.open_board_auction_manager
 msgid "Auction manager board"
-msgstr "拍卖管理控制台"
+msgstr ""
 
 #. module: auction
 #: view:board.board:0
 msgid "Min/Adj/Max"
-msgstr "最少/邻近/最大"
+msgstr ""
 
 #. module: auction
 #: view:board.board:0
 msgid "My Latest Objects"
-msgstr "我最后的物品"
+msgstr ""
+
+#, python-format
+#~ msgid "The Buyer \"%s\" has no Invoice Address."
+#~ msgstr "نىڭ رۇخسەت ئادېرىسى يوق \"%s\" ساتقۇچى تەرەپ"
diff --git a/addons/base_contact/i18n/ru.po b/addons/base_contact/i18n/ru.po
index 426fb570629..5f5320fbf33 100644
--- a/addons/base_contact/i18n/ru.po
+++ b/addons/base_contact/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-07-08 15:37+0000\n"
-"Last-Translator: Pomazan Bogdan <Unknown>\n"
+"PO-Revision-Date: 2010-07-14 08:08+0000\n"
+"Last-Translator: Nikolay Chesnokov <chesnokov_n@msn.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-07-09 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-07-15 03:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
@@ -67,7 +67,7 @@ msgstr "Имя"
 #. module: base_contact
 #: model:ir.model,name:base_contact.model_res_partner_job
 msgid "Contact Partner Function"
-msgstr ""
+msgstr "Функции сотрудника партнера"
 
 #. module: base_contact
 #: field:res.partner.job,other:0
@@ -122,7 +122,7 @@ msgstr "Телефон"
 #. module: base_contact
 #: model:process.transition,note:base_contact.process_transition_contacttofunction0
 msgid "Defines contacts and functions."
-msgstr ""
+msgstr "Определить контакты и функции"
 
 #. module: base_contact
 #: field:res.partner.contact,title:0
@@ -196,7 +196,7 @@ msgstr "Категории"
 #. module: base_contact
 #: field:res.partner.contact,function_id:0
 msgid "Main Function"
-msgstr ""
+msgstr "Личная функция"
 
 #. module: base_contact
 #: model:process.transition,note:base_contact.process_transition_partnertoaddress0
@@ -211,12 +211,12 @@ msgstr "Неправильный XML для просмотра архитект
 #. module: base_contact
 #: model:process.process,name:base_contact.process_process_basecontactprocess0
 msgid "Base Contact Process"
-msgstr ""
+msgstr "Основной контакт"
 
 #. module: base_contact
 #: view:res.partner.contact:0
 msgid "Seq."
-msgstr ""
+msgstr "Посл-ть"
 
 #. module: base_contact
 #: field:res.partner.job,extension:0
@@ -272,7 +272,7 @@ msgstr "Основной работодатель"
 #. module: base_contact
 #: model:process.transition,name:base_contact.process_transition_functiontoaddress0
 msgid "Function to address"
-msgstr ""
+msgstr "Адрес функции"
 
 #. module: base_contact
 #: model:ir.actions.act_window,name:base_contact.act_res_partner_jobs
diff --git a/addons/base_module_record/i18n/ru.po b/addons/base_module_record/i18n/ru.po
index 06bf1c04a8e..b191fa95feb 100644
--- a/addons/base_module_record/i18n/ru.po
+++ b/addons/base_module_record/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-04-16 13:36+0000\n"
+"PO-Revision-Date: 2010-07-14 08:10+0000\n"
 "Last-Translator: Nikolay Chesnokov <chesnokov_n@msn.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-22 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-07-15 03:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_record
@@ -32,7 +32,7 @@ msgstr "Информация"
 #. module: base_module_record
 #: model:ir.model,name:base_module_record.model_ir_module_record
 msgid "ir.module.record"
-msgstr ""
+msgstr "Системный модуль записи"
 
 #. module: base_module_record
 #: constraint:ir.model:0
diff --git a/addons/hr_contract/i18n/ru.po b/addons/hr_contract/i18n/ru.po
index 7c5d4087cc2..4c7ab9930f4 100644
--- a/addons/hr_contract/i18n/ru.po
+++ b/addons/hr_contract/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-08 19:44+0000\n"
-"Last-Translator: Vadim Peretokin <vperetokin@gmail.com>\n"
+"PO-Revision-Date: 2010-07-14 08:14+0000\n"
+"Last-Translator: Nikolay Chesnokov <chesnokov_n@msn.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-22 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-07-15 03:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
@@ -38,7 +38,7 @@ msgstr ""
 #: view:hr.contract:0
 #: view:hr.employee:0
 msgid "Generalities"
-msgstr ""
+msgstr "Общее положение"
 
 #. module: hr_contract
 #: field:hr.employee,children:0
@@ -73,7 +73,7 @@ msgstr "Сумма на руки"
 #. module: hr_contract
 #: model:ir.module.module,shortdesc:hr_contract.module_meta_information
 msgid "Human Resources Contracts"
-msgstr ""
+msgstr "Договор с содрудником"
 
 #. module: hr_contract
 #: field:hr.contract.wage.type.period,factor_days:0
@@ -189,7 +189,7 @@ msgstr "Зарплатный период"
 #. module: hr_contract
 #: field:hr.employee,audiens_num:0
 msgid "AUDIENS Number"
-msgstr ""
+msgstr "Номер посещения"
 
 #. module: hr_contract
 #: view:hr.contract:0
diff --git a/addons/multi_company/i18n/ru.po b/addons/multi_company/i18n/ru.po
index 8b9ce974399..82fb3aa107c 100644
--- a/addons/multi_company/i18n/ru.po
+++ b/addons/multi_company/i18n/ru.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-12-08 11:46+0000\n"
-"PO-Revision-Date: 2010-07-07 22:52+0000\n"
-"Last-Translator: Pomazan Bogdan <Unknown>\n"
+"PO-Revision-Date: 2010-07-14 08:17+0000\n"
+"Last-Translator: Nikolay Chesnokov <chesnokov_n@msn.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-07-09 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-07-15 03:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: multi_company
@@ -35,6 +35,7 @@ msgstr ""
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
 msgstr ""
+"Ошибка. ЕИМ по умолчанию и закупочная ЕИМ должны иметь одинаковую категорию."
 
 #. module: multi_company
 #: constraint:res.partner:0
@@ -115,7 +116,7 @@ msgstr "Ошибка. UOS и UOM должны принадлежать к раз
 #. module: multi_company
 #: model:product.category,name:multi_company.Odoo1
 msgid "Odoo Offers"
-msgstr ""
+msgstr "Предложения Odoo"
 
 #. module: multi_company
 #: constraint:res.company:0
@@ -155,7 +156,7 @@ msgstr "Выражение"
 #. module: multi_company
 #: model:product.template,name:multi_company.product_product_odoo1_product_template
 msgid "Odoo Offer"
-msgstr ""
+msgstr "Предложение Odoo"
 
 #. module: multi_company
 #: field:multi_company.default,sequence:0
diff --git a/addons/olap/data/olap_cube_view.xml b/addons/olap/data/olap_cube_view.xml
index c3f43b89740..bd30efeafe7 100644
--- a/addons/olap/data/olap_cube_view.xml
+++ b/addons/olap/data/olap_cube_view.xml
@@ -76,7 +76,30 @@
 	            <field name="model">olap.parameters.config.wizard</field>
 	            <field name="type">form</field>
 	            <field name="arch" type="xml">
-	                <form string="Parameters Configure">
+                <form string="Parameters Configure wizard">
+                   <group colspan="4" col="8">
+                       <group colspan="3" width="180" height="250">
+                           <field name="config_logo" widget="image" width="200" height="100" nolabel="1" colspan="1"/>
+                           <newline/>
+                           <label align="0.0" string="This wizard will automatically configure the web client for Business Intelligence." width="200" colspan="2"/>
+                       </group>
+                       <separator string="" position="vertical" colspan="1" rowspan="12"/>
+                       <group colspan="4">
+                           <separator string=" Business Intelligence Web Client" colspan="4"/>
+                           <field name="host_name" colspan="4"/>
+                           <field name="host_port" colspan="4"/>
+                       </group>
+                       <group colspan="8" col="8">
+                       <separator string="" colspan="8"/>
+                           <group colspan="4" width="220">
+                               <field name="progress" widget="progressbar" nolabel="1" colspan="2"/>
+                          </group>
+                           <button special="cancel" string="Cancel" name="action_cancel" type="object" icon='gtk-cancel'/>
+                          <button name="action_config" string="Configure" icon='gtk-ok' type="object"/>
+                       </group>
+                   </group>
+               </form>
+	                <!--form string="Parameters Configure">
 	                    <separator string="BI Web Client." colspan="4"/>
 	                    <label string="This wizard will automatically configure the web client for BI." align="0.0" colspan="4"/>
 	                    <field name="host_name" colspan="4"/>
@@ -87,7 +110,7 @@
 	                        <button special="cancel" string="Cancel" name="action_cancel" type="object" icon='gtk-cancel'/>
 	                        <button name="action_config" string="Configure" icon='gtk-ok' type="object"/>
 	                    </group>
-	                </form>
+	                </form-->
 	            </field>
 	        </record>
 	
diff --git a/addons/olap/olap.py b/addons/olap/olap.py
index 317a56dd7c3..765711793f3 100644
--- a/addons/olap/olap.py
+++ b/addons/olap/olap.py
@@ -30,6 +30,9 @@ from osv import osv
 from osv import fields, osv
 import netsvc
 import cube
+import os
+import tools
+import base64
 from cube import levels
 
 
@@ -2128,16 +2131,34 @@ class olap_parameters_config_wizard(osv.osv_memory):
                Word(alphanums + "_" + " ").suppress()
         return s_p.parseString(aid.url)[1]
 
+    def _get_image(self, cr, uid, context=None):
+        path = os.path.join('base','res','config_pixmaps/1.png')
+        file_data = tools.file_open(path,'rb').read()
+        return base64.encodestring(file_data)
+
+    def _progress(self, cr, uid, context=None):
+        total = self.pool.get('ir.actions.todo')\
+            .search_count(cr, uid, [], context)
+        open = self.pool.get('ir.actions.todo')\
+            .search_count(cr, uid, [('state','<>','open')], context)
+        if total:
+            return round(open*90./total)
+        return 100.
+
     _columns = {
         'host_name': fields.char('Server Name', size = 64, help = "Put here the server address or IP \
                 Put localhost if its not clear.", required = True),
         'host_port': fields.char('Port', size = 4, help = "Put the port for the server. Put 8080 if \
                 its not clear.", required = True),
+        'config_logo': fields.binary('Image', readonly=True),
+        'progress': fields.float('Configuration Progress', readonly=True),
             }
 
     _defaults = {
         'host_name': _get_host,
         'host_port': _get_port,
+        'progress': _progress,
+        'config_logo': _get_image,
         }
 
     def action_cancel(self, cr, uid, ids, conect = None):
diff --git a/addons/scrum/__init__.py b/addons/project_scrum/__init__.py
similarity index 96%
rename from addons/scrum/__init__.py
rename to addons/project_scrum/__init__.py
index 204f3abd3f8..ab85f618822 100644
--- a/addons/scrum/__init__.py
+++ b/addons/project_scrum/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,11 +15,11 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
-import scrum
+import project_scrum
 import report
 import wizard
 
diff --git a/addons/scrum/__openerp__.py b/addons/project_scrum/__openerp__.py
similarity index 85%
rename from addons/scrum/__openerp__.py
rename to addons/project_scrum/__openerp__.py
index ef552090c67..c42908ff50a 100644
--- a/addons/scrum/__openerp__.py
+++ b/addons/project_scrum/__openerp__.py
@@ -51,15 +51,15 @@
     'init_xml': [],
     'update_xml': [
         'security/ir.model.access.csv',
-        'scrum_report.xml',
-        'wizard/scrum_backlog_create_task_view.xml',
-        'scrum_view.xml',
-        'process/scrum_process.xml',
-        'wizard/scrum_backlog_sprint_view.xml',
-        'wizard/scrum_backlog_merger_view.xml',
-        "board_scrum_view.xml",
+        'project_scrum_report.xml',
+        'wizard/project_scrum_backlog_create_task_view.xml',
+        'project_scrum_view.xml',
+        'process/project_scrum_process.xml',
+        'wizard/project_scrum_backlog_sprint_view.xml',
+        'wizard/project_scrum_backlog_merger_view.xml',
+        "board_project_scrum_view.xml",
     ],
-    'demo_xml': ['scrum_demo.xml'],
+    'demo_xml': ['project_scrum_demo.xml'],
     'installable': True,
     'active': False,
     'certificate': '0084121063261',
diff --git a/addons/scrum/board_scrum_view.xml b/addons/project_scrum/board_project_scrum_view.xml
similarity index 87%
rename from addons/scrum/board_scrum_view.xml
rename to addons/project_scrum/board_project_scrum_view.xml
index 5184aefa79c..3889e8f7af3 100644
--- a/addons/scrum/board_scrum_view.xml
+++ b/addons/project_scrum/board_project_scrum_view.xml
@@ -2,8 +2,8 @@
 <openerp>
     <data>
             <record id="view_scrum_sprint_dashboard_tree" model="ir.ui.view">
-            <field name="name">scrum.sprint.dashboard.tree</field>
-            <field name="model">scrum.sprint</field>
+            <field name="name">project.scrum.sprint.dashboard.tree</field>
+            <field name="model">project.scrum.sprint</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
             	 <tree string="Scrum Sprint">
@@ -14,21 +14,21 @@
                     <field name="date_start"/>
                     <field name="progress" widget="progressbar"/>
                     <field name="effective_hours" sum="Effective hours" widget="float_time"/>
-                    <field name="planned_hours" sum="Planned hours" widget="float_time"/>
+                    <!-- field name="planned_hours" sum="Planned hours" widget="float_time"/> -->
                     <field name="expected_hours" sum="Expected hours" widget="float_time"/>
                     <field name="state"/>
                     <button type="object" string="Open" name="button_open" states="draft,pending" icon="gtk-jump-to"/>
                     <button type="object" string="Pending" name="button_pending" states="open" icon="gtk-media-pause"/>
                     <button type="object" string="Close" name="button_close" states="open,pending" icon="gtk-jump-to"/>
                     <button type="object" string="Set to Draft" name="button_draft" states="cancel,done" icon="gtk-convert"/>
-                	<button name="%(scrum.report_scrum_sprint_burndown_chart)d" states="open,draft,close,cancel"
+                	<button name="%(project_scrum.report_scrum_sprint_burndown_chart)d" states="open,draft,close,cancel"
                                 	string="Burndown Chart" type="action" icon="gtk-print"/>
              	</tree>
             </field>
         </record>
         <record id="action_sprint_all_dashboard_tree" model="ir.actions.act_window">
             <field name="name">Sprint's List</field>
-            <field name="res_model">scrum.sprint</field>
+            <field name="res_model">project.scrum.sprint</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_scrum_sprint_dashboard_tree"/>
diff --git a/addons/scrum/i18n/ar.po b/addons/project_scrum/i18n/ar.po
similarity index 100%
rename from addons/scrum/i18n/ar.po
rename to addons/project_scrum/i18n/ar.po
diff --git a/addons/scrum/i18n/bg.po b/addons/project_scrum/i18n/bg.po
similarity index 100%
rename from addons/scrum/i18n/bg.po
rename to addons/project_scrum/i18n/bg.po
diff --git a/addons/scrum/i18n/bs.po b/addons/project_scrum/i18n/bs.po
similarity index 100%
rename from addons/scrum/i18n/bs.po
rename to addons/project_scrum/i18n/bs.po
diff --git a/addons/scrum/i18n/ca.po b/addons/project_scrum/i18n/ca.po
similarity index 100%
rename from addons/scrum/i18n/ca.po
rename to addons/project_scrum/i18n/ca.po
diff --git a/addons/scrum/i18n/cs.po b/addons/project_scrum/i18n/cs.po
similarity index 100%
rename from addons/scrum/i18n/cs.po
rename to addons/project_scrum/i18n/cs.po
diff --git a/addons/scrum/i18n/de.po b/addons/project_scrum/i18n/de.po
similarity index 100%
rename from addons/scrum/i18n/de.po
rename to addons/project_scrum/i18n/de.po
diff --git a/addons/scrum/i18n/es.po b/addons/project_scrum/i18n/es.po
similarity index 100%
rename from addons/scrum/i18n/es.po
rename to addons/project_scrum/i18n/es.po
diff --git a/addons/scrum/i18n/es_AR.po b/addons/project_scrum/i18n/es_AR.po
similarity index 100%
rename from addons/scrum/i18n/es_AR.po
rename to addons/project_scrum/i18n/es_AR.po
diff --git a/addons/scrum/i18n/et.po b/addons/project_scrum/i18n/et.po
similarity index 100%
rename from addons/scrum/i18n/et.po
rename to addons/project_scrum/i18n/et.po
diff --git a/addons/scrum/i18n/fr.po b/addons/project_scrum/i18n/fr.po
similarity index 100%
rename from addons/scrum/i18n/fr.po
rename to addons/project_scrum/i18n/fr.po
diff --git a/addons/scrum/i18n/hr.po b/addons/project_scrum/i18n/hr.po
similarity index 100%
rename from addons/scrum/i18n/hr.po
rename to addons/project_scrum/i18n/hr.po
diff --git a/addons/scrum/i18n/hu.po b/addons/project_scrum/i18n/hu.po
similarity index 100%
rename from addons/scrum/i18n/hu.po
rename to addons/project_scrum/i18n/hu.po
diff --git a/addons/scrum/i18n/id.po b/addons/project_scrum/i18n/id.po
similarity index 100%
rename from addons/scrum/i18n/id.po
rename to addons/project_scrum/i18n/id.po
diff --git a/addons/scrum/i18n/it.po b/addons/project_scrum/i18n/it.po
similarity index 100%
rename from addons/scrum/i18n/it.po
rename to addons/project_scrum/i18n/it.po
diff --git a/addons/scrum/i18n/ko.po b/addons/project_scrum/i18n/ko.po
similarity index 100%
rename from addons/scrum/i18n/ko.po
rename to addons/project_scrum/i18n/ko.po
diff --git a/addons/scrum/i18n/lt.po b/addons/project_scrum/i18n/lt.po
similarity index 100%
rename from addons/scrum/i18n/lt.po
rename to addons/project_scrum/i18n/lt.po
diff --git a/addons/scrum/i18n/nl.po b/addons/project_scrum/i18n/nl.po
similarity index 100%
rename from addons/scrum/i18n/nl.po
rename to addons/project_scrum/i18n/nl.po
diff --git a/addons/scrum/i18n/nl_BE.po b/addons/project_scrum/i18n/nl_BE.po
similarity index 100%
rename from addons/scrum/i18n/nl_BE.po
rename to addons/project_scrum/i18n/nl_BE.po
diff --git a/addons/scrum/i18n/pl.po b/addons/project_scrum/i18n/pl.po
similarity index 100%
rename from addons/scrum/i18n/pl.po
rename to addons/project_scrum/i18n/pl.po
diff --git a/addons/scrum/i18n/pt.po b/addons/project_scrum/i18n/pt.po
similarity index 100%
rename from addons/scrum/i18n/pt.po
rename to addons/project_scrum/i18n/pt.po
diff --git a/addons/scrum/i18n/pt_BR.po b/addons/project_scrum/i18n/pt_BR.po
similarity index 100%
rename from addons/scrum/i18n/pt_BR.po
rename to addons/project_scrum/i18n/pt_BR.po
diff --git a/addons/scrum/i18n/ro.po b/addons/project_scrum/i18n/ro.po
similarity index 100%
rename from addons/scrum/i18n/ro.po
rename to addons/project_scrum/i18n/ro.po
diff --git a/addons/scrum/i18n/ru.po b/addons/project_scrum/i18n/ru.po
similarity index 100%
rename from addons/scrum/i18n/ru.po
rename to addons/project_scrum/i18n/ru.po
diff --git a/addons/scrum/i18n/scrum.pot b/addons/project_scrum/i18n/scrum.pot
similarity index 100%
rename from addons/scrum/i18n/scrum.pot
rename to addons/project_scrum/i18n/scrum.pot
diff --git a/addons/scrum/i18n/sl.po b/addons/project_scrum/i18n/sl.po
similarity index 100%
rename from addons/scrum/i18n/sl.po
rename to addons/project_scrum/i18n/sl.po
diff --git a/addons/scrum/i18n/sq.po b/addons/project_scrum/i18n/sq.po
similarity index 100%
rename from addons/scrum/i18n/sq.po
rename to addons/project_scrum/i18n/sq.po
diff --git a/addons/scrum/i18n/sv.po b/addons/project_scrum/i18n/sv.po
similarity index 100%
rename from addons/scrum/i18n/sv.po
rename to addons/project_scrum/i18n/sv.po
diff --git a/addons/scrum/i18n/tlh.po b/addons/project_scrum/i18n/tlh.po
similarity index 100%
rename from addons/scrum/i18n/tlh.po
rename to addons/project_scrum/i18n/tlh.po
diff --git a/addons/scrum/i18n/tr.po b/addons/project_scrum/i18n/tr.po
similarity index 100%
rename from addons/scrum/i18n/tr.po
rename to addons/project_scrum/i18n/tr.po
diff --git a/addons/scrum/i18n/uk.po b/addons/project_scrum/i18n/uk.po
similarity index 100%
rename from addons/scrum/i18n/uk.po
rename to addons/project_scrum/i18n/uk.po
diff --git a/addons/scrum/i18n/vi.po b/addons/project_scrum/i18n/vi.po
similarity index 100%
rename from addons/scrum/i18n/vi.po
rename to addons/project_scrum/i18n/vi.po
diff --git a/addons/scrum/i18n/zh_CN.po b/addons/project_scrum/i18n/zh_CN.po
similarity index 100%
rename from addons/scrum/i18n/zh_CN.po
rename to addons/project_scrum/i18n/zh_CN.po
diff --git a/addons/scrum/i18n/zh_TW.po b/addons/project_scrum/i18n/zh_TW.po
similarity index 100%
rename from addons/scrum/i18n/zh_TW.po
rename to addons/project_scrum/i18n/zh_TW.po
diff --git a/addons/scrum/process/scrum_process.xml b/addons/project_scrum/process/project_scrum_process.xml
similarity index 84%
rename from addons/scrum/process/scrum_process.xml
rename to addons/project_scrum/process/project_scrum_process.xml
index c9c7db868f6..9700677c100 100644
--- a/addons/scrum/process/scrum_process.xml
+++ b/addons/project_scrum/process/project_scrum_process.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" ?>
 <openerp>
     <data>
-    
-        <!--        
+
+        <!--
             Process Node
         -->
-    
+
         <record id="process_node_productbacklog0" model="process.node">
-            <field name="menu_id" ref="scrum.menu_action_product_backlog_form"/>
-            <field name="model_id" ref="scrum.model_scrum_product_backlog"/>
+            <field name="menu_id" ref="menu_action_product_backlog_form"/>
+            <field name="model_id" ref="model_project_scrum_product_backlog"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Product backlog&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Create task from backlogs&quot;&quot;&quot;" name="note"/>
@@ -16,11 +16,11 @@
             <field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
             <field eval="1" name="flow_start"/>
         </record>
-        
-        <!--        
+
+        <!--
             Process Transition
         -->
-        
+
         <record id="process_transition_backlogtask0" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
@@ -29,6 +29,6 @@
             <field model="process.node" name="target_node_id" ref="project.process_node_drafttask0"/>
             <field model="process.node" name="source_node_id" ref="process_node_productbacklog0"/>
         </record>
-    
+
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/scrum/scrum.py b/addons/project_scrum/project_scrum.py
similarity index 90%
rename from addons/scrum/scrum.py
rename to addons/project_scrum/project_scrum.py
index 0eb23916bc1..5fc873c40aa 100644
--- a/addons/scrum/scrum.py
+++ b/addons/project_scrum/project_scrum.py
@@ -27,7 +27,7 @@ import re
 import tools
 from tools.translate import _
 
-class scrum_project(osv.osv):
+class project_scrum_project(osv.osv):
     _inherit = 'project.project'
     _columns = {
         'product_owner_id': fields.many2one('res.users', 'Product Owner', help="The person who is responsible for the product"),
@@ -39,11 +39,11 @@ class scrum_project(osv.osv):
         'sprint_size': 15,
         'scrum': 1
     }
-scrum_project()
+project_scrum_project()
 
-class scrum_sprint(osv.osv):
-    _name = 'scrum.sprint'
-    _description = 'Scrum Sprint'
+class project_scrum_sprint(osv.osv):
+    _name = 'project.scrum.sprint'
+    _description = 'Project Scrum Sprint'
 
     def _calc_progress(self, cr, uid, ids, name, args, context):
         res = {}
@@ -115,10 +115,10 @@ class scrum_sprint(osv.osv):
         'project_id': fields.many2one('project.project', 'Project', required=True, domain=[('scrum','=',1)], help="If you have [?] in the project name, it means there are no analytic account linked to this project."),
         'product_owner_id': fields.many2one('res.users', 'Product Owner', required=True,help="The person who is responsible for the product"),
         'scrum_master_id': fields.many2one('res.users', 'Scrum Master', required=True,help="The person who is maintains the processes for the product"),
-        'meeting_ids': fields.one2many('scrum.meeting', 'sprint_id', 'Daily Scrum'),
+        'meeting_ids': fields.one2many('project.scrum.meeting', 'sprint_id', 'Daily Scrum'),
         'review': fields.text('Sprint Review'),
         'retrospective': fields.text('Sprint Retrospective'),
-        'backlog_ids': fields.one2many('scrum.product.backlog', 'sprint_id', 'Sprint Backlog'),
+        'backlog_ids': fields.one2many('project.scrum.product.backlog', 'sprint_id', 'Sprint Backlog'),
         'progress': fields.function(_calc_progress, method=True, string='Progress (0-100)', help="Computed as: Time Spent / Total Time."),
         'effective_hours': fields.function(_calc_effective, method=True, string='Effective hours', help="Computed using the sum of the task work done."),
         'expected_hours': fields.function(_calc_expected, method=True, string='Planned Hours', help='Estimated time to do the task.'),
@@ -153,10 +153,10 @@ class scrum_sprint(osv.osv):
             v['date_stop'] = (DateTime.now() + DateTime.RelativeDateTime(days=int(proj.sprint_size or 14))).strftime('%Y-%m-%d')
         return {'value':v}
 
-scrum_sprint()
+project_scrum_sprint()
 
-class scrum_product_backlog(osv.osv):
-    _name = 'scrum.product.backlog'
+class project_scrum_product_backlog(osv.osv):
+    _name = 'project.scrum.product.backlog'
     _description = 'Product Backlog'
 
     def name_search(self, cr, uid, name, args=None, operator='ilike', context=None, limit=100):
@@ -200,9 +200,10 @@ class scrum_product_backlog(osv.osv):
         return res
 
     def button_cancel(self, cr, uid, ids, context={}):
+        obj_project_task = self.pool.get('project.task')
         self.write(cr, uid, ids, {'state':'cancel'}, context=context)
         for backlog in self.browse(cr, uid, ids, context=context):
-            self.pool.get('project.task').write(cr, uid, [i.id for i in backlog.tasks_id], {'state': 'cancelled'})
+            obj_project_task.write(cr, uid, [i.id for i in backlog.tasks_id], {'state': 'cancelled'})
         return True
 
     def button_draft(self, cr, uid, ids, context={}):
@@ -217,9 +218,10 @@ class scrum_product_backlog(osv.osv):
         return True
 
     def button_close(self, cr, uid, ids, context={}):
+        obj_project_task = self.pool.get('project.task')
         self.write(cr, uid, ids, {'state':'done'}, context=context)
         for backlog in self.browse(cr, uid, ids, context=context):
-            self.pool.get('project.task').write(cr, uid, [i.id for i in backlog.tasks_id], {'state': 'done'})
+            obj_project_task.write(cr, uid, [i.id for i in backlog.tasks_id], {'state': 'done'})
             message = _('Product Backlog ') + " '" + backlog.name + "' "+ _("is Closed.")
             self.log(cr, uid, backlog.id, message)
         return True
@@ -249,7 +251,7 @@ class scrum_product_backlog(osv.osv):
         'active' : fields.boolean('Active', help="If Active field is set to true, it will allow you to hide the product backlog without removing it."),
         'project_id': fields.many2one('project.project', 'Project', required=True, domain=[('scrum','=',1)], help="If you have [?] in the project name, it means there are no analytic account linked to this project."),
         'user_id': fields.many2one('res.users', 'Author'),
-        'sprint_id': fields.many2one('scrum.sprint', 'Sprint'),
+        'sprint_id': fields.many2one('project.scrum.sprint', 'Sprint'),
         'sequence' : fields.integer('Sequence', help="Gives the sequence order when displaying a list of product backlog."),
         'tasks_id': fields.one2many('project.task', 'product_backlog_id', 'Tasks Details'),
         'state': fields.selection([('draft','Draft'),('open','Open'),('pending','Pending'),('done','Done'),('cancel','Cancelled')], 'State', required=True),
@@ -265,42 +267,42 @@ class scrum_product_backlog(osv.osv):
         'user_id': lambda self, cr, uid, context: uid,
     }
     _order = "sequence"
-scrum_product_backlog()
+project_scrum_product_backlog()
 
-class scrum_task(osv.osv):
+class project_scrum_task(osv.osv):
     _name = 'project.task'
     _inherit = 'project.task'
 
     def _get_task(self, cr, uid, ids, context={}):
         result = {}
-        for line in self.pool.get('scrum.product.backlog').browse(cr, uid, ids, context=context):
+        for line in self.pool.get('project.scrum.product.backlog').browse(cr, uid, ids, context=context):
             for task in line.tasks_id:
                 result[task.id] = True
         return result.keys()
     _columns = {
-        'product_backlog_id': fields.many2one('scrum.product.backlog', 'Product Backlog',help="Related product backlog that contains this task. Used in SCRUM methodology"),
-        'sprint_id': fields.related('product_backlog_id','sprint_id', type='many2one', relation='scrum.sprint', string='Sprint',
+        'product_backlog_id': fields.many2one('project.scrum.product.backlog', 'Product Backlog',help="Related product backlog that contains this task. Used in SCRUM methodology"),
+        'sprint_id': fields.related('product_backlog_id','sprint_id', type='many2one', relation='project.scrum.sprint', string='Sprint',
             store={
                 'project.task': (lambda self, cr, uid, ids, c={}: ids, ['product_backlog_id'], 10),
-                'scrum.product.backlog': (_get_task, ['sprint_id'], 10)
+                'project.scrum.product.backlog': (_get_task, ['sprint_id'], 10)
             }),
     }
 
     def onchange_backlog_id(self, cr, uid, backlog_id):
         if not backlog_id:
             return {}
-        project_id = self.pool.get('scrum.product.backlog').browse(cr, uid, backlog_id).project_id.id
+        project_id = self.pool.get('project.scrum.product.backlog').browse(cr, uid, backlog_id).project_id.id
         return {'value': {'project_id': project_id}}
-scrum_task()
+project_scrum_task()
 
-class scrum_meeting(osv.osv):
-    _name = 'scrum.meeting'
+class project_scrum_meeting(osv.osv):
+    _name = 'project.scrum.meeting'
     _description = 'Scrum Meeting'
     _order = 'date desc'
     _columns = {
         'name' : fields.char('Meeting Name', size=64),
         'date': fields.date('Meeting Date', required=True),
-        'sprint_id': fields.many2one('scrum.sprint', 'Sprint', required=True),
+        'sprint_id': fields.many2one('project.scrum.sprint', 'Sprint', required=True),
         'project_id': fields.many2one('project.project', 'Project'),
         'question_yesterday': fields.text('Tasks since yesterday'),
         'question_today': fields.text('Tasks for today'),
@@ -357,5 +359,5 @@ class scrum_meeting(osv.osv):
             return False
         return True
 
-scrum_meeting()
+project_scrum_meeting()
 
diff --git a/addons/scrum/scrum_demo.xml b/addons/project_scrum/project_scrum_demo.xml
similarity index 90%
rename from addons/scrum/scrum_demo.xml
rename to addons/project_scrum/project_scrum_demo.xml
index 9e97e635cf3..a4fad8eb307 100644
--- a/addons/scrum/scrum_demo.xml
+++ b/addons/project_scrum/project_scrum_demo.xml
@@ -13,9 +13,9 @@
             <field model="res.users" name="product_owner_id" search="[('login','=','demo')]"/>
         </record>
 
-        <!-- Resource: scrum.sprint -->
+        <!-- Resource: project_scrum.sprint -->
 
-        <record id="scrum_sprint_0" model="scrum.sprint">
+        <record id="scrum_sprint_0" model="project.scrum.sprint">
             <field name="date_stop">2005-12-20</field>
             <field name="name">Sprint for V3.2.0</field>
             <field model="res.users" name="scrum_master_id" search="[('login','=','demo')]"/>
@@ -26,7 +26,7 @@
 
         <!-- Resource: project.product.backlog -->
 
-        <record id="scrum_product_backlog_0" model="scrum.product.backlog">
+        <record id="scrum_product_backlog_0" model="project.scrum.product.backlog">
             <field name="priority">3</field>
             <field name="name">Automatic migration system</field>
             <field name="expected_hours">6.0</field>
@@ -35,54 +35,54 @@
             <field name="state">done</field>
             <field name="project_id" ref="scrum_project_1"/>
         </record>
-        <record id="scrum_product_backlog_1" model="scrum.product.backlog">
+        <record id="scrum_product_backlog_1" model="project.scrum.product.backlog">
             <field name="priority">3</field>
             <field name="name">New accounting module</field>
             <field name="expected_hours">111.0</field>
             <field name="note">The accounting module of Open ERP (financial accounting and management accounting) is being reshaped. New functionnalities will be added: intangible assets, a new way of presenting ledgers and bookings, new stock valuation calculation, and lots of predefined reports. </field>
             <field name="sprint_id" ref="scrum_sprint_0"/>
-			<field name="state">open</field>            
+			<field name="state">open</field>
             <field name="project_id" ref="scrum_project_1"/>
         </record>
-        <record id="scrum_product_backlog_2" model="scrum.product.backlog">
+        <record id="scrum_product_backlog_2" model="project.scrum.product.backlog">
             <field name="priority">3</field>
             <field name="name">Automated Plugin System to install/uninstall modules</field>
             <field name="expected_hours">4.0</field>
             <field name="note">We have to develop a plug-in system which will enable to install/remove modules. The basic version of Open ERP will include only the required minimum, and you will select the modules thanks to the plug-in manager. This allows you to limit your system to your real needs: quality management, localisations, project and service management, marketing campaigns, and so on... </field>
             <field name="sprint_id" ref="scrum_sprint_0"/>
-            <field name="state">open</field>     
+            <field name="state">open</field>
             <field name="project_id" ref="scrum_project_1"/>
         </record>
-        <record id="scrum_product_backlog_3" model="scrum.product.backlog">
+        <record id="scrum_product_backlog_3" model="project.scrum.product.backlog">
             <field name="name">Review all terms</field>
             <field name="expected_hours">8.0</field>
             <field name="sprint_id" ref="scrum_sprint_0"/>
-            <field name="state">done</field>     
+            <field name="state">done</field>
             <field name="project_id" ref="scrum_project_1"/>
         </record>
-        <record id="scrum_product_backlog_4" model="scrum.product.backlog">
+        <record id="scrum_product_backlog_4" model="project.scrum.product.backlog">
             <field name="name">Bugfixes</field>
             <field name="expected_hours">6.0</field>
             <field name="sprint_id" ref="scrum_sprint_0"/>
-            <field name="state">open</field>  
+            <field name="state">open</field>
             <field name="project_id" ref="scrum_project_1"/>
         </record>
-        <record id="scrum_product_backlog_5" model="scrum.product.backlog">
+        <record id="scrum_product_backlog_5" model="project.scrum.product.backlog">
             <field name="name">Test for 3.2.0 Publishing</field>
             <field name="expected_hours">5.0</field>
             <field name="note">Test Open ERP to release stable 3.2.0 version. (may be 3.2.0-pre1 ?)</field>
             <field name="sprint_id" ref="scrum_sprint_0"/>
             <field name="project_id" ref="scrum_project_1"/>
         </record>
-        <record id="scrum_product_backlog_6" model="scrum.product.backlog">
+        <record id="scrum_product_backlog_6" model="project.scrum.product.backlog">
             <field name="name">Reshape the complete menu</field>
             <field name="expected_hours">4.0</field>
             <field name="note">Restructure  the Open ERP menu to be more like others ERP.</field>
             <field name="sprint_id" ref="scrum_sprint_0"/>
-          	<field name="state">open</field>  
+          	<field name="state">open</field>
             <field name="project_id" ref="scrum_project_1"/>
         </record>
-        <record id="scrum_product_backlog_7" model="scrum.product.backlog">
+        <record id="scrum_product_backlog_7" model="project.scrum.product.backlog">
             <field name="name">Editable Trees</field>
             <field name="expected_hours">12.0</field>
             <field name="note">Editable trees in list and one2many_list widgets.</field>
@@ -98,7 +98,7 @@
             <field name="project_id" ref="scrum_project_1"/>
             <field name="name">Review all English Terms</field>
             <field name="state">done</field>
-            <field eval="time.strftime('%Y-%m-%d')" name="date_close"/>            
+            <field eval="time.strftime('%Y-%m-%d')" name="date_close"/>
             <field name="product_backlog_id" ref="scrum_product_backlog_3"/>
         </record>
         <record id="scrum_task_4" model="project.task">
@@ -107,7 +107,7 @@
             <field name="project_id" ref="scrum_project_1"/>
             <field name="name">Review all french terms</field>
           	<field name="state">done</field>
-            <field eval="time.strftime('%Y-%m-%d')" name="date_close"/>               
+            <field eval="time.strftime('%Y-%m-%d')" name="date_close"/>
             <field name="product_backlog_id" ref="scrum_product_backlog_3"/>
         </record>
         <record id="scrum_task_5" model="project.task">
@@ -116,7 +116,7 @@
             <field name="project_id" ref="scrum_project_1"/>
             <field name="name">Analytic Accounting features</field>
           	<field name="state">done</field>
-            <field eval="time.strftime('%Y-%m-%d')" name="date_close"/>             
+            <field eval="time.strftime('%Y-%m-%d')" name="date_close"/>
             <field name="product_backlog_id" ref="scrum_product_backlog_1"/>
         </record>
         <record id="scrum_task_6" model="project.task">
@@ -149,7 +149,7 @@
             <field name="description">Cash book, general ledger, accounts list, aged trial balance</field>
              <field name="name">Accounting Report General</field>
              <field name="state">open</field>
-			<field eval="[(6,0,[ref('scrum.scrum_task_8')])]" name="child_ids"/>             
+			<field eval="[(6,0,[ref('scrum_task_8')])]" name="child_ids"/>
             <field name="product_backlog_id" ref="scrum_product_backlog_1"/>
         </record>
         <record id="scrum_task_10" model="project.task">
@@ -164,7 +164,7 @@
             <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
             <field name="project_id" ref="scrum_project_1"/>
             <field name="name">Accounting Report Analytic</field>
- 			<field name="state">open</field>            
+ 			<field name="state">open</field>
             <field name="product_backlog_id" ref="scrum_product_backlog_1"/>
         </record>
         <record id="scrum_task_12" model="project.task">
@@ -173,7 +173,7 @@
             <field name="project_id" ref="scrum_project_1"/>
             <field name="name">Bugfix - memory leak</field>
           	<field name="state">done</field>
-            <field eval="time.strftime('%Y-%m-%d')" name="date_close"/>               
+            <field eval="time.strftime('%Y-%m-%d')" name="date_close"/>
             <field name="product_backlog_id" ref="scrum_product_backlog_4"/>
         </record>
         <record id="scrum_task_13" model="project.task">
@@ -181,8 +181,8 @@
             <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
             <field name="project_id" ref="scrum_project_1"/>
             <field name="name">Bugfix - Translations</field>
-			<field name="state">open</field>          
-			 <field eval="[(6,0,[ref('scrum.scrum_task_12')])]" name="child_ids"/>
+			<field name="state">open</field>
+			 <field eval="[(6,0,[ref('scrum_task_12')])]" name="child_ids"/>
             <field name="product_backlog_id" ref="scrum_product_backlog_4"/>
         </record>
         <record id="scrum_task_14" model="project.task">
@@ -205,7 +205,7 @@
             <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
             <field name="project_id" ref="scrum_project_1"/>
             <field name="name">Test 3.2.0 before releasing</field>
- 			<field name="state">open</field>    
+ 			<field name="state">open</field>
             <field name="product_backlog_id" ref="scrum_product_backlog_5"/>
         </record>
         <record id="scrum_task_17" model="project.task">
@@ -214,10 +214,10 @@
             <field name="project_id" ref="scrum_project_1"/>
             <field name="description">default values, onchange, required, add on top or bottom and shortcuts (Ctrl S, Ctrl X, ...)</field>
             <field name="name">Editable trees</field>
-			<field name="state">open</field>  
+			<field name="state">open</field>
             <field name="product_backlog_id" ref="scrum_product_backlog_7"/>
         </record>
-		<record id="scrum_meeting_0" model="scrum.meeting">
+		<record id="scrum_meeting_0" model="project.scrum.meeting">
 			<field name="question_yesterday">
 Admin: Worked on the Automatic migration system
 Demo: Worked on the Test 3.2.0 before releasing
@@ -228,7 +228,7 @@ Demo: Work on Editable trees</field>
 			<field name="question_blocks">
 Demo :Bugfix - memory leak
 			</field>
-			<field name="sprint_id" ref="scrum.scrum_sprint_0"/>
+			<field name="sprint_id" ref="scrum_sprint_0"/>
 			<field eval="time.strftime('%Y-%m-%d')" name="date"/>
 		</record>
 		<record id="project_task_work_scrum_task1" model="project.task.work">
@@ -247,7 +247,7 @@ Demo :Bugfix - memory leak
 			<field eval="5.0" name="hours"/>
 			<field eval="time.strftime('%Y-%m-%d')" name="date"/>
 		</record>
-				
+
 		<record id="project_task_work_scrum_task2" model="project.task.work">
 			<field name="user_id" ref="base.user_root"/>
 			<field name="name">Create a script for migration and testing</field>
@@ -264,6 +264,6 @@ Demo :Bugfix - memory leak
 			<field eval="10.0" name="hours"/>
 			<field eval="time.strftime('%Y-%m-%d')" name="date"/>
 		</record>
-		
+
     </data>
 </openerp>
diff --git a/addons/scrum/scrum_report.xml b/addons/project_scrum/project_scrum_report.xml
similarity index 62%
rename from addons/scrum/scrum_report.xml
rename to addons/project_scrum/project_scrum_report.xml
index 8d95d8bdc37..b958732d3c4 100644
--- a/addons/scrum/scrum_report.xml
+++ b/addons/project_scrum/project_scrum_report.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <report auto="False"  id="report_scrum_sprint_burndown_chart" model="scrum.sprint" name="scrum.sprint.burndown" string="Burndown Chart"/>
+        <report auto="False"  id="report_scrum_sprint_burndown_chart" model="project.scrum.sprint" name="scrum.sprint.burndown" string="Burndown Chart"/>
     </data>
 </openerp>
diff --git a/addons/scrum/scrum_view.xml b/addons/project_scrum/project_scrum_view.xml
similarity index 93%
rename from addons/scrum/scrum_view.xml
rename to addons/project_scrum/project_scrum_view.xml
index 86f92981fed..fd044427869 100644
--- a/addons/scrum/scrum_view.xml
+++ b/addons/project_scrum/project_scrum_view.xml
@@ -29,8 +29,8 @@
        -->
 
         <record id="view_scrum_product_backlog_tree" model="ir.ui.view">
-            <field name="name">scrum.product.backlog.tree</field>
-            <field name="model">scrum.product.backlog</field>
+            <field name="name">project.scrum.product.backlog.tree</field>
+            <field name="model">project.scrum.product.backlog</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree colors="grey:state in ('cancel','done');blue:state in ('pending')" string="Product Backlog">
@@ -52,8 +52,8 @@
         </record>
 
         <record id="view_scrum_product_backlog_form" model="ir.ui.view">
-            <field name="name">scrum.product.backlog.form</field>
-            <field name="model">scrum.product.backlog</field>
+            <field name="name">project.scrum.product.backlog.form</field>
+            <field name="model">project.scrum.product.backlog</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Product backlog">
@@ -124,8 +124,8 @@
         </record>
 
         <record model="ir.ui.view" id="view_scrum_product_backlog_search">
-            <field name="name">scrum.product.backlog.search</field>
-            <field name="model">scrum.product.backlog</field>
+            <field name="name">project.scrum.product.backlog.search</field>
+            <field name="model">project.scrum.product.backlog</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Product Backlogs">
@@ -177,7 +177,7 @@
 
         <record id="action_product_backlog_form" model="ir.actions.act_window">
             <field name="name">Product Backlogs</field>
-            <field name="res_model">scrum.product.backlog</field>
+            <field name="res_model">project.scrum.product.backlog</field>
             <field name="view_type">form</field>
             <field name="context">{'search_default_current': 1}</field>
             <field name="search_view_id" ref="view_scrum_product_backlog_search"/>
@@ -193,8 +193,8 @@
        -->
 
         <record id="view_scrum_sprint_tree" model="ir.ui.view">
-            <field name="name">scrum.sprint.tree</field>
-            <field name="model">scrum.sprint</field>
+            <field name="name">project.scrum.sprint.tree</field>
+            <field name="model">project.scrum.sprint</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree colors="blue:state in ('pending');grey:state in ('cancel','done')" string="Scrum Sprint">
@@ -215,8 +215,8 @@
             </field>
         </record>
         <record id="view_scrum_sprint_form" model="ir.ui.view">
-            <field name="name">scrum.sprint.form</field>
-            <field name="model">scrum.sprint</field>
+            <field name="name">project.scrum.sprint.form</field>
+            <field name="model">project.scrum.sprint</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Scrum Sprint">
@@ -265,8 +265,8 @@
         </record>
 
         <record model="ir.ui.view" id="view_scrum_sprint_search">
-            <field name="name">scrum.sprint.search</field>
-            <field name="model">scrum.sprint</field>
+            <field name="name">project.scrum.sprint.search</field>
+            <field name="model">project.scrum.sprint</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Sprints">
@@ -296,7 +296,7 @@
 
         <record id="action_sprint_all_tree" model="ir.actions.act_window">
             <field name="name">Sprints</field>
-            <field name="res_model">scrum.sprint</field>
+            <field name="res_model">project.scrum.sprint</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_scrum_sprint_tree"/>
@@ -312,8 +312,8 @@
        -->
 
         <record id="view_scrum_meeting_tree" model="ir.ui.view">
-            <field name="name">scrum.meeting.tree</field>
-            <field name="model">scrum.meeting</field>
+            <field name="name">project.scrum.meeting.tree</field>
+            <field name="model">project.scrum.meeting</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Scrum Sprint">
@@ -324,7 +324,7 @@
         </record>
         <record id="view_scrum_meeting_form" model="ir.ui.view">
             <field name="name">Scrum Meeting</field>
-            <field name="model">scrum.meeting</field>
+            <field name="model">project.scrum.meeting</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Scrum Sprint">
@@ -358,8 +358,8 @@
         </record>
 
         <record id="view_scrum_meeting_search" model="ir.ui.view">
-            <field name="name">scrum.meeting.search</field>
-            <field name="model">scrum.meeting</field>
+            <field name="name">project_scrum.meeting.search</field>
+            <field name="model">project.scrum.meeting</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Scrum Sprint">
@@ -383,7 +383,7 @@
 
         <record id="action_meeting_form" model="ir.actions.act_window">
             <field name="name">Scrum Meetings</field>
-            <field name="res_model">scrum.meeting</field>
+            <field name="res_model">project.scrum.meeting</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="context">{'search_default_scrum_daily':1}</field>
@@ -405,14 +405,14 @@
         </record>
         <record id="ir_scrum_sprint_open_task" model="ir.values">
             <field eval=" 'tree_but_open'" name="key2"/>
-            <field eval="'scrum.sprint'" name="model"/>
+            <field eval="'project.scrum.sprint'" name="model"/>
             <field name="name">View sprint tasks</field>
             <field eval="'ir.actions.act_window,'+str(action_sprint_task_open)" name="value"/>
             <field eval="True" name="object"/>
         </record>
 
         <record id="action_sprint_backlog_open" model="ir.actions.act_window">
-            <field name="res_model">scrum.product.backlog</field>
+            <field name="res_model">project.scrum.product.backlog</field>
             <field name="name">View sprint backlog</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
@@ -420,7 +420,7 @@
         </record>
         <record id="ir_scrum_sprint_open_sprint" model="ir.values">
             <field eval=" 'tree_but_open'" name="key2"/>
-            <field eval="'scrum.sprint'" name="model"/>
+            <field eval="'project.scrum.sprint'" name="model"/>
             <field name="name">View sprint backlog</field>
             <field eval="'ir.actions.act_window,'+str(action_sprint_backlog_open)" name="value"/>
             <field eval="True" name="object"/>
@@ -431,7 +431,7 @@
        -->
 
         <record id="dblc_proj" model="ir.actions.act_window">
-            <field name="res_model">scrum.product.backlog</field>
+            <field name="res_model">project.scrum.product.backlog</field>
             <field name="name">View project's backlog</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
@@ -439,7 +439,7 @@
         </record>
         <record id="ir_scrum_project_backlog" model="ir.values">
             <field eval=" 'tree_but_open'" name="key2"/>
-            <field eval="'scrum.project'" name="model"/>
+            <field eval="'project.scrum.project'" name="model"/>
             <field name="name">View project's backlog</field>
             <field eval="'ir.actions.act_window,'+str(dblc_proj)" name="value"/>
             <field eval="True" name="object"/>
@@ -453,7 +453,7 @@
         </record>
         <record id="ir_scrum_project_task" model="ir.values">
             <field eval=" 'tree_but_open'" name="key2"/>
-            <field eval="'scrum.project'" name="model"/>
+            <field eval="'project.scrum.project'" name="model"/>
             <field name="name">View project's tasks</field>
             <field eval="'ir.actions.act_window,'+str(dblc_proj2)" name="value"/>
             <field eval="True" name="object"/>
@@ -509,6 +509,7 @@
                 <field name="project_id" position="after">
                     <field name="sprint_id" context="{'sprint_invisible':False}">
                         <filter icon="terp-check" string="Current" context="{'sprint_invisible':False}" domain="[('sprint_id.state','in',('draft','open'))]" help="Current Sprints"/>
+                        <filter icon="terp-check" string="Current" context="{'sprint_invisible':False}" domain="[]" help="View Sprints"/>
                     </field>
                 </field>
             </field>
@@ -532,8 +533,8 @@
             domain="[('sprint_id', '=', active_id)]"
             id="act_scrum_sprint_2_product_backlog"
             name="Backlogs"
-            res_model="scrum.product.backlog"
-            src_model="scrum.sprint"
+            res_model="project.scrum.product.backlog"
+            src_model="project.scrum.sprint"
             view_mode="tree,form"
             view_type="form"/>
 
@@ -542,7 +543,7 @@
             id="act_scrum_sprint_2_project_task"
             name="Tasks"
             res_model="project.task"
-            src_model="scrum.sprint"
+            src_model="project.scrum.sprint"
             view_mode="tree,form"
             view_type="form"/>
 
diff --git a/addons/scrum/report/__init__.py b/addons/project_scrum/report/__init__.py
similarity index 100%
rename from addons/scrum/report/__init__.py
rename to addons/project_scrum/report/__init__.py
diff --git a/addons/scrum/report/_burndown.py b/addons/project_scrum/report/_burndown.py
similarity index 100%
rename from addons/scrum/report/_burndown.py
rename to addons/project_scrum/report/_burndown.py
diff --git a/addons/scrum/report/sprint_burndown.py b/addons/project_scrum/report/sprint_burndown.py
similarity index 94%
rename from addons/scrum/report/sprint_burndown.py
rename to addons/project_scrum/report/sprint_burndown.py
index cdc837fe96b..853986c9d5f 100644
--- a/addons/scrum/report/sprint_burndown.py
+++ b/addons/project_scrum/report/sprint_burndown.py
@@ -48,9 +48,9 @@ class report_tasks(report_int):
         canv = canvas.init(fname=io, format='pdf')
         canv.set_author("Open ERP")
 
-        cr.execute('select id,date_start,date_stop from scrum_sprint where id=%s', (datas['id'],))
+        cr.execute('select id,date_start,date_stop from project_scrum_sprint where id=%s', (datas['id'],))
         for (id,date_start,date_stop) in cr.fetchall():
-            cr.execute('select id from project_task where product_backlog_id in(select id from scrum_product_backlog where sprint_id=%s)', (id,))
+            cr.execute('select id from project_task where product_backlog_id in(select id from project_scrum_product_backlog where sprint_id=%s)', (id,))
 
             ids = map(lambda x: x[0], cr.fetchall())
             datas = _burndown.compute_burndown(cr, uid, ids, date_start, date_stop)
diff --git a/addons/scrum/report/task_burndown.py b/addons/project_scrum/report/task_burndown.py
similarity index 100%
rename from addons/scrum/report/task_burndown.py
rename to addons/project_scrum/report/task_burndown.py
diff --git a/addons/project_scrum/security/ir.model.access.csv b/addons/project_scrum/security/ir.model.access.csv
new file mode 100644
index 00000000000..752e834b1e0
--- /dev/null
+++ b/addons/project_scrum/security/ir.model.access.csv
@@ -0,0 +1,9 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_scrum_sprint","project_scrum.sprint","model_project_scrum_sprint","project.group_project_user",1,0,0,0
+"access_scrum_product_backlog","project_scrum.product.backlog","model_project_scrum_product_backlog","project.group_project_user",1,1,1,1
+"access_scrum_meeting","project_scrum.meeting","model_project_scrum_meeting","project.group_project_user",1,0,0,0
+"access_scrum_meeting_manager","project_scrum.meeting.manager","model_project_scrum_meeting","project.group_project_manager",1,1,1,1
+"access_scrum_sprint_manager","project_scrum.sprint.manager","model_project_scrum_sprint","project.group_project_manager",1,1,1,1
+"access_scrum_product_backlog_manager","project_scrum.product.backlog manager","model_project_scrum_product_backlog","project.group_project_manager",1,1,1,1
+"access_product_uom_project_manager","product.uom project manager","product.model_product_uom","project.group_project_manager",1,1,1,1
+"access_product_uom_project_user","product.uom project user","product.model_product_uom","project.group_project_user",1,0,0,0
diff --git a/addons/scrum/wizard/__init__.py b/addons/project_scrum/wizard/__init__.py
similarity index 90%
rename from addons/scrum/wizard/__init__.py
rename to addons/project_scrum/wizard/__init__.py
index bcced59f96b..92ed57d7d7e 100644
--- a/addons/scrum/wizard/__init__.py
+++ b/addons/project_scrum/wizard/__init__.py
@@ -19,9 +19,9 @@
 #
 ##############################################################################
 
-import scrum_backlog_create_task
-import scrum_backlog_sprint
-import scrum_backlog_merger
+import project_scrum_backlog_create_task
+import project_scrum_backlog_sprint
+import project_scrum_backlog_merger
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/scrum/wizard/scrum_backlog_create_task.py b/addons/project_scrum/wizard/project_scrum_backlog_create_task.py
similarity index 95%
rename from addons/scrum/wizard/scrum_backlog_create_task.py
rename to addons/project_scrum/wizard/project_scrum_backlog_create_task.py
index fcade59bc2f..9fcf104211e 100644
--- a/addons/scrum/wizard/scrum_backlog_create_task.py
+++ b/addons/project_scrum/wizard/project_scrum_backlog_create_task.py
@@ -21,7 +21,7 @@
 from osv import osv, fields
 
 class backlog_create_task(osv.osv_memory):
-    _name = 'backlog.create.task'
+    _name = 'project.scrum.backlog.create.task'
     _description = 'Create Tasks from Product Backlogs'
     _columns = {
         'user_id': fields.many2one('res.users', 'Assign To')
@@ -30,7 +30,7 @@ class backlog_create_task(osv.osv_memory):
     def do_create(self, cr, uid, ids, context=None):
         mod_obj = self.pool.get('ir.model.data')
         task = self.pool.get('project.task')
-        backlog_id = self.pool.get('scrum.product.backlog')
+        backlog_id = self.pool.get('project.scrum.product.backlog')
         ids_task = []
 
         if context is None:
diff --git a/addons/scrum/wizard/scrum_backlog_create_task_view.xml b/addons/project_scrum/wizard/project_scrum_backlog_create_task_view.xml
similarity index 77%
rename from addons/scrum/wizard/scrum_backlog_create_task_view.xml
rename to addons/project_scrum/wizard/project_scrum_backlog_create_task_view.xml
index 25cc78b873f..0ec3ab736af 100644
--- a/addons/scrum/wizard/scrum_backlog_create_task_view.xml
+++ b/addons/project_scrum/wizard/project_scrum_backlog_create_task_view.xml
@@ -3,8 +3,8 @@
     <data>
 
 		<record id="view_scrum_backlog_to_task" model="ir.ui.view">
-            <field name="name">backlog.create.task.form</field>
-            <field name="model">backlog.create.task</field>
+            <field name="name">project.scrum.backlog.create.task.form</field>
+            <field name="model">project.scrum.backlog.create.task</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
 			<form string="Create Tasks">
@@ -23,21 +23,21 @@
         <record id="action_scrum_backlog_to_task" model="ir.actions.act_window">
             <field name="name">Create Tasks</field>
             <field name="type">ir.actions.act_window</field>
-            <field name="res_model">backlog.create.task</field>
+            <field name="res_model">project.scrum.backlog.create.task</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="target">new</field>
         </record>
 
 		<record model="ir.values" id="scrum_backlog_to_task_values">
-            <field name="model_id" ref="model_scrum_product_backlog" />
+            <field name="model_id" ref="model_project_scrum_product_backlog" />
             <field name="object" eval="1" />
             <field name="name">Create Tasks</field>
             <field name="key2">client_action_multi</field>
             <field name="value" eval="'ir.actions.act_window,' + str(ref('action_scrum_backlog_to_task'))" />
             <field name="key">action</field>
-            <field name="model">scrum.product.backlog</field>
+            <field name="model">project.scrum.product.backlog</field>
         </record>
 
 	</data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/scrum/wizard/scrum_backlog_merger.py b/addons/project_scrum/wizard/project_scrum_backlog_merger.py
similarity index 93%
rename from addons/scrum/wizard/scrum_backlog_merger.py
rename to addons/project_scrum/wizard/project_scrum_backlog_merger.py
index 8d7d38633c7..eb31ebe031c 100644
--- a/addons/scrum/wizard/scrum_backlog_merger.py
+++ b/addons/project_scrum/wizard/project_scrum_backlog_merger.py
@@ -21,15 +21,15 @@
 from osv import osv, fields
 from tools.translate import _
 
-class scrum_backlog_merge(osv.osv_memory):
-    _name = 'scrum.backlog.merge'
+class project_scrum_backlog_merge(osv.osv_memory):
+    _name = 'project.scrum.backlog.merge'
     _description = 'Merge Product Backlogs'
     _columns = {
         'project_id': fields.many2one('project.project', 'Project', help="Select project for the new product backlog"),
                }
 
     def check_backlogs(self, cr, uid, ids, context=None):
-        backlog_obj = self.pool.get('scrum.product.backlog')
+        backlog_obj = self.pool.get('project.scrum.product.backlog')
         mod_obj = self.pool.get('ir.model.data')
         p_list = []
         if context is None:
@@ -50,7 +50,7 @@ class scrum_backlog_merge(osv.osv_memory):
                 'context': context,
                 'view_type': 'form',
                 'view_mode': 'form',
-                'res_model': 'scrum.backlog.merge',
+                'res_model': 'project.scrum.backlog.merge',
                 'views': [(resource_id,'form')],
                 'type': 'ir.actions.act_window',
                 'target': 'new',
@@ -58,7 +58,7 @@ class scrum_backlog_merge(osv.osv_memory):
         return self.do_merge(cr, uid, ids, context=context)
 
     def do_merge(self, cr, uid, ids, context=None):
-        backlog_obj = self.pool.get('scrum.product.backlog')
+        backlog_obj = self.pool.get('project.scrum.product.backlog')
         task_obj = self.pool.get('project.task')
         task_lines = []
         new_exp_hour = []
@@ -99,5 +99,5 @@ class scrum_backlog_merge(osv.osv_memory):
         backlog_obj.unlink(cr, uid, context['active_ids'], context=context)
         return {}
 
-scrum_backlog_merge()
+project_scrum_backlog_merge()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/scrum/wizard/scrum_backlog_merger_view.xml b/addons/project_scrum/wizard/project_scrum_backlog_merger_view.xml
similarity index 86%
rename from addons/scrum/wizard/scrum_backlog_merger_view.xml
rename to addons/project_scrum/wizard/project_scrum_backlog_merger_view.xml
index 849f6099908..9e374d9437b 100644
--- a/addons/scrum/wizard/scrum_backlog_merger_view.xml
+++ b/addons/project_scrum/wizard/project_scrum_backlog_merger_view.xml
@@ -3,7 +3,7 @@
     <data>
         <record id="scrum_backlog_merge_view" model="ir.ui.view">
             <field name="name">Merge Backlogs</field>
-            <field name="model">scrum.backlog.merge</field>
+            <field name="model">project.scrum.backlog.merge</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                <form string="Merge Backlogs">
@@ -19,7 +19,7 @@
         <record id="action_scrum_backlog_merge" model="ir.actions.act_window">
             <field name="name">Merge Backlogs</field>
             <field name="type">ir.actions.act_window</field>
-            <field name="res_model">scrum.backlog.merge</field>
+            <field name="res_model">project.scrum.backlog.merge</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="target">new</field>
@@ -27,18 +27,18 @@
         </record>
 
         <record model="ir.values" id="scrum_backlog_merge_values">
-            <field name="model_id" ref="model_scrum_product_backlog" />
+            <field name="model_id" ref="model_project_scrum_product_backlog" />
             <field name="object" eval="1" />
             <field name="name">Merge Backlogs</field>
             <field name="key2">client_action_multi</field>
             <field name="value" eval="'ir.actions.act_window,' + str(ref('action_scrum_backlog_merge'))" />
             <field name="key">action</field>
-            <field name="model">scrum.product.backlog</field>
+            <field name="model">project.scrum.product.backlog</field>
         </record>
 
         <record id="scrum_merge_project_id_view" model="ir.ui.view">
             <field name="name">Merge Backlogs</field>
-            <field name="model">scrum.backlog.merge</field>
+            <field name="model">project.scrum.backlog.merge</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                <form string="Merge Backlogs">
diff --git a/addons/scrum/wizard/scrum_backlog_sprint.py b/addons/project_scrum/wizard/project_scrum_backlog_sprint.py
similarity index 92%
rename from addons/scrum/wizard/scrum_backlog_sprint.py
rename to addons/project_scrum/wizard/project_scrum_backlog_sprint.py
index 308ac75795e..5d4a6831533 100644
--- a/addons/scrum/wizard/scrum_backlog_sprint.py
+++ b/addons/project_scrum/wizard/project_scrum_backlog_sprint.py
@@ -22,10 +22,10 @@ from osv import osv, fields
 from tools.translate import _
 
 class backlog_sprint_assign(osv.osv_memory):
-    _name = 'backlog.assign.sprint'
+    _name = 'project.scrum.backlog.assign.sprint'
     _description = 'Assign sprint to backlogs'
     _columns = {
-        'sprint_id': fields.many2one('scrum.sprint', 'Sprint Name', required=True),
+        'sprint_id': fields.many2one('project.scrum.sprint', 'Sprint Name', required=True),
         'state_open': fields.boolean('Set Open', help="Change the state of product backlogs to open if its in draft state"),
         'convert_to_task': fields.boolean('Convert To Task', help="Create Task for Product Backlog")
                }
@@ -35,8 +35,8 @@ class backlog_sprint_assign(osv.osv_memory):
                  }
 
     def assign_sprint(self, cr, uid, ids, context=None):
-        backlog_obj = self.pool.get('scrum.product.backlog')
-        sprint_obj = self.pool.get('scrum.sprint')
+        backlog_obj = self.pool.get('project.scrum.product.backlog')
+        sprint_obj = self.pool.get('project.scrum.sprint')
         task = self.pool.get('project.task')
         backlog_ids = []
         if context is None:
diff --git a/addons/scrum/wizard/scrum_backlog_sprint_view.xml b/addons/project_scrum/wizard/project_scrum_backlog_sprint_view.xml
similarity index 80%
rename from addons/scrum/wizard/scrum_backlog_sprint_view.xml
rename to addons/project_scrum/wizard/project_scrum_backlog_sprint_view.xml
index d9806d4aff0..b4942cf27a6 100644
--- a/addons/scrum/wizard/scrum_backlog_sprint_view.xml
+++ b/addons/project_scrum/wizard/project_scrum_backlog_sprint_view.xml
@@ -3,8 +3,8 @@
     <data>
 
 		<record id="view_scrum_backlog_to_sprint" model="ir.ui.view">
-			<field name="name">backlog.assign.sprint.form</field>
-			<field name="model">backlog.assign.sprint</field>
+			<field name="name">project.scrum.backlog.assign.sprint.form</field>
+			<field name="model">project.scrum.backlog.assign.sprint</field>
 			<field name="type">form</field>
 			<field name="arch" type="xml">
 				<form string="Assign Sprint">
@@ -30,20 +30,20 @@
         <record id="action_scrum_backlog_to_sprint" model="ir.actions.act_window">
             <field name="name">Assign Sprint</field>
             <field name="type">ir.actions.act_window</field>
-            <field name="res_model">backlog.assign.sprint</field>
+            <field name="res_model">project.scrum.backlog.assign.sprint</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="target">new</field>
         </record>
 
 		<record model="ir.values" id="scrum_backlog_to_sprint_values">
-            <field name="model_id" ref="model_scrum_product_backlog" />
+            <field name="model_id" ref="model_project_scrum_product_backlog" />
             <field name="object" eval="1" />
             <field name="name">Assign Sprint</field>
             <field name="key2">client_action_multi</field>
             <field name="value" eval="'ir.actions.act_window,' + str(ref('action_scrum_backlog_to_sprint'))" />
             <field name="key">action</field>
-            <field name="model">scrum.product.backlog</field>
+            <field name="model">project.scrum.product.backlog</field>
         </record>
 
 	</data>
diff --git a/addons/scrum/security/ir.model.access.csv b/addons/scrum/security/ir.model.access.csv
deleted file mode 100644
index 76ba229e952..00000000000
--- a/addons/scrum/security/ir.model.access.csv
+++ /dev/null
@@ -1,9 +0,0 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_scrum_sprint","scrum.sprint","model_scrum_sprint","project.group_project_user",1,0,0,0
-"access_scrum_product_backlog","scrum.product.backlog","model_scrum_product_backlog","project.group_project_user",1,1,1,1
-"access_scrum_meeting","scrum.meeting","model_scrum_meeting","project.group_project_user",1,0,0,0
-"access_scrum_meeting_manager","scrum.meeting.manager","model_scrum_meeting","project.group_project_manager",1,1,1,1
-"access_scrum_sprint_manager","scrum.sprint.manager","model_scrum_sprint","project.group_project_manager",1,1,1,1
-"access_scrum_product_backlog_manager","scrum.product.backlog manager","model_scrum_product_backlog","project.group_project_manager",1,1,1,1
-"access_product_uom_project_manager","product.uom project manager","product.model_product_uom","project.group_project_manager",1,1,1,1
-"access_product_uom_project_user","product.uom project user","product.model_product_uom","project.group_project_user",1,0,0,0