From 925c3d4680986cd49052c51afb224b609f1735e4 Mon Sep 17 00:00:00 2001 From: Launchpad Code Hosting Date: Fri, 16 Jul 2010 04:39:12 +0100 Subject: [PATCH 01/17] Launchpad automatic translations update. bzr revid: codehost@crowberry-20100716033912-gwowyaw0o0nwbx73 --- addons/account/i18n/zh_CN.po | 12 +- addons/auction/i18n/zh_CN.po | 486 ++++++++++++++++---------------- addons/audittrail/i18n/zh_CN.po | 8 +- addons/hr_attendance/i18n/it.po | 40 +-- addons/purchase/i18n/pt_BR.po | 85 +++++- 5 files changed, 343 insertions(+), 288 deletions(-) diff --git a/addons/account/i18n/zh_CN.po b/addons/account/i18n/zh_CN.po index 58fbb3b1ac4..169283ae387 100644 --- a/addons/account/i18n/zh_CN.po +++ b/addons/account/i18n/zh_CN.po @@ -7,13 +7,13 @@ 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-07-13 03:12+0000\n" +"PO-Revision-Date: 2010-07-16 01:13+0000\n" "Last-Translator: Black Jack \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-14 03:37+0000\n" +"X-Launchpad-Export-Date: 2010-07-16 03:39+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account @@ -1182,7 +1182,7 @@ msgstr "银行收据" #. module: account #: view:res.partner:0 msgid "Bank account" -msgstr "银行账号" +msgstr "银行帐号" #. module: account #: field:account.chart.template,tax_template_ids:0 @@ -4555,7 +4555,7 @@ msgstr "辅助核算项统计" msgid "" "This will automatically configure your chart of accounts, bank accounts, " "taxes and journals according to the selected template" -msgstr "将根据选择的模板自动设置你的科目一览表、银行帐号、税和记录集合" +msgstr "将根据选择的模板自动设置你的科目一览表、银行科目、税和记录集合" #. module: account #: view:account.bank.statement:0 @@ -5463,7 +5463,7 @@ msgstr "科目.税.模板" #. module: account #: field:wizard.multi.charts.accounts,bank_accounts_id:0 msgid "Bank Accounts" -msgstr "银行帐号" +msgstr "银行科目" #. module: account #: constraint:account.period:0 @@ -5739,7 +5739,7 @@ msgstr "打印记录集合 -" #: field:account.chart.template,bank_account_view_id:0 #: field:account.invoice,partner_bank:0 msgid "Bank Account" -msgstr "银行帐号" +msgstr "银行科目" #. module: account #: model:ir.actions.act_window,name:account.action_model_form diff --git a/addons/auction/i18n/zh_CN.po b/addons/auction/i18n/zh_CN.po index 03e5ffa4234..9d1072ee87a 100644 --- a/addons/auction/i18n/zh_CN.po +++ b/addons/auction/i18n/zh_CN.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-07-15 03:34+0000\n" +"PO-Revision-Date: 2010-07-15 11:03+0000\n" "Last-Translator: Black Jack \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-15 03:36+0000\n" +"X-Launchpad-Export-Date: 2010-07-16 03:39+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: auction @@ -944,7 +944,7 @@ msgstr "净利润" #. module: auction #: field:auction.lots,vnd_lim_net:0 msgid "Net limit ?" -msgstr "净限额?" +msgstr "净极限?" #. module: auction #: rml:auction.total.rml:0 @@ -1141,7 +1141,7 @@ msgstr "" #. module: auction #: selection:auction.deposit,method:0 msgid "Decrease limit of 10%" -msgstr "减少10%限制" +msgstr "减少10%极限" #. module: auction #: field:auction.dates,adj_total:0 @@ -1186,13 +1186,13 @@ msgstr "" #. module: auction #: view:auction.deposit:0 msgid "Photos" -msgstr "" +msgstr "相片" #. module: auction #: wizard_field:auction.lots.make_invoice,init,number:0 #: wizard_field:auction.lots.make_invoice_buyer,init,number:0 msgid "Invoice Number" -msgstr "" +msgstr "发票编号" #. module: auction #: field:report.buyer.auction,date:0 @@ -1201,22 +1201,22 @@ msgstr "" #: field:report.object.encoded.manager,date:0 #: field:report.seller.auction,date:0 msgid "Create Date" -msgstr "" +msgstr "创建日期" #. module: auction #: model:ir.ui.menu,name:auction.menu_buyer_allmonth_view1 msgid "Buyer's Summary" -msgstr "" +msgstr "买家综述" #. module: auction #: xsl:report.auction.ach_bordereau:0 msgid "Customer Reference" -msgstr "" +msgstr "客户参考" #. module: auction #: rml:bids.lots:0 msgid "Name" -msgstr "" +msgstr "名称" #. module: auction #: field:auction.deposit,name:0 @@ -1225,13 +1225,13 @@ msgstr "" #: field:report.deposit.border,bord:0 #: field:report.unclassified.objects,bord_vnd_id:0 msgid "Depositer Inventory" -msgstr "" +msgstr "押金目录" #. module: auction #: model:ir.ui.menu,name:auction.menu_report_deposit_tree_m #: model:ir.ui.menu,name:auction.menu_report_deposit_tree_member msgid "Depositer's Statistics" -msgstr "" +msgstr "押金统计" #. module: auction #: view:report.object.encoded.manager:0 @@ -1245,38 +1245,38 @@ msgstr "" #: wizard_field:auction.lots.send.aie.results,init,uname:0 #: wizard_field:auction.lots.sms_send,init,user:0 msgid "Login" -msgstr "" +msgstr "登录" #. module: auction #: rml:buyer.list:0 msgid "To pay" -msgstr "" +msgstr "支付" #. module: auction #: wizard_button:auction.lots.enable,init,go:0 msgid "Enable Taken away" -msgstr "" +msgstr "允许带走" #. module: auction #: selection:auction.lot.category,aie_categ:0 msgid "Antique/Others" -msgstr "" +msgstr "古董/ 其它" #. module: auction #: model:ir.actions.report.xml,name:auction.seller_lots_3 msgid "Seller Form" -msgstr "" +msgstr "卖家单" #. module: auction #: field:auction.lots,lot_type:0 #: field:report.unclassified.objects,lot_type:0 msgid "Object category" -msgstr "" +msgstr "物品类别" #. module: auction #: wizard_view:auction.taken,init:0 msgid "Mark Lots" -msgstr "" +msgstr "建立批" #. module: auction #: field:auction.lots,obj_num:0 @@ -1284,64 +1284,64 @@ msgstr "" #: wizard_field:auction.lots.numerotate,search,obj_num:0 #: field:report.unclassified.objects,obj_num:0 msgid "Catalog Number" -msgstr "" +msgstr "目录号" #. module: auction #: view:report.auction.view2:0 msgid "Auction Reporting tree view2" -msgstr "" +msgstr "拍卖报表树视图2" #. module: auction #: view:report.buyer.auction2:0 msgid "Auction buyer reporting form view2" -msgstr "" +msgstr "拍卖买家报表视图2" #. module: auction #: model:ir.actions.report.xml,name:auction.bid_phone msgid "Bids phones" -msgstr "" +msgstr "出价电话" #. module: auction #: model:ir.actions.act_window,name:auction.action_report_object_by_auction msgid "Auction dates" -msgstr "" +msgstr "拍卖日期" #. module: auction #: view:report.seller.auction2:0 msgid "Auction seller reporting2 graph view" -msgstr "" +msgstr "拍卖卖家报表图形视图" #. module: auction #: model:ir.ui.menu,name:auction.menu_report_auction_object_date_tree msgid "Encoded Objects Per Day" -msgstr "" +msgstr "每天编号的物品" #. module: auction #: model:ir.model,name:auction.model_report_buyer_auction #: model:ir.model,name:auction.model_report_buyer_auction2 msgid "Auction Reporting on buyer view" -msgstr "" +msgstr "拍卖报表买家视图" #. module: auction #: rml:auction.total.rml:0 msgid "Debit:" -msgstr "" +msgstr "借方:" #. module: auction #: field:auction.lots,author_right:0 msgid "Author rights" -msgstr "" +msgstr "作者" #. module: auction #: view:auction.lots:0 msgid "Payment's history" -msgstr "" +msgstr "付款日志" #. module: auction #: xsl:report.auction.ach_bordereau:0 #: xsl:report.auction.vnd_bordereau:0 msgid "Document" -msgstr "" +msgstr "文档" #. module: auction #: xsl:report.auction.lots.list.landscape:0 @@ -1351,39 +1351,39 @@ msgstr "" #. module: auction #: view:report.auction.view:0 msgid "Auction results" -msgstr "" +msgstr "拍卖结果" #. module: auction #: model:ir.ui.menu,name:auction.menu_auction_allmonth_view2 msgid "Auction's Revenues" -msgstr "" +msgstr "拍卖收入" #. module: auction #: view:report.object.encoded.manager:0 msgid "Total net rev." -msgstr "" +msgstr "净收入合计" #. module: auction #: wizard_button:auction.lots.buyer_map,check,set_buyer:0 msgid "Update" -msgstr "" +msgstr "更新" #. module: auction #: rml:auction.total.rml:0 #: model:ir.ui.menu,name:auction.auction_report_seller_menu #: model:ir.ui.menu,name:auction.auction_seller_menu msgid "Sellers" -msgstr "" +msgstr "卖家" #. module: auction #: selection:auction.lot.category,aie_categ:0 msgid "Antique/Metal Ware" -msgstr "" +msgstr "古董/ 金属制品" #. module: auction #: model:ir.actions.report.xml,name:auction.res_w_buyer msgid "Results with buyer" -msgstr "" +msgstr "结果与买家" #. module: auction #: selection:auction.lots.send.aie,date_ask,lang:0 @@ -1393,22 +1393,22 @@ msgstr "" #. module: auction #: wizard_button:auction.lots.auction_move,init,set_date:0 msgid "Move to Auction date" -msgstr "" +msgstr "移动到拍卖日" #. module: auction #: model:ir.actions.act_window,name:auction.action_auction_dates_old msgid "Old Auctions" -msgstr "" +msgstr "以前的拍卖" #. module: auction #: rml:auction.total.rml:0 msgid "# of unsold items:" -msgstr "" +msgstr "# 未售出项" #. module: auction #: selection:auction.lot.category,aie_categ:0 msgid "Cont. Art/Curiosa" -msgstr "" +msgstr "艺术品/ 珍品" #. module: auction #: field:auction.bid,auction_id:0 @@ -1419,7 +1419,7 @@ msgstr "" #: wizard_field:auction.lots.send.aie.results,date_ask,dates:0 #: wizard_field:auction.lots.send.aie.results,init,dates:0 msgid "Auction Date" -msgstr "" +msgstr "拍卖日期" #. module: auction #: rml:auction.code_bar_lot:0 @@ -1429,109 +1429,109 @@ msgstr "" #. module: auction #: model:ir.module.module,shortdesc:auction.module_meta_information msgid "Auction module" -msgstr "" +msgstr "拍卖模块" #. module: auction #: field:auction.bid_line,auction:0 msgid "Auction Name" -msgstr "" +msgstr "拍卖名" #. module: auction #: model:ir.ui.menu,name:auction.menu_report_auction_sign_in_out_manager_tree1 #: model:ir.ui.menu,name:auction.menu_report_auction_sign_in_out_member_tree1 msgid "Attendance" -msgstr "" +msgstr "出席" #. module: auction #: view:auction.lots:0 msgid "Seller information" -msgstr "" +msgstr "卖家信息" #. module: auction #: field:auction.lots,ach_login:0 #: wizard_field:auction.lots.buyer_map,check,ach_login:0 #: field:report.unclassified.objects,ach_login:0 msgid "Buyer Username" -msgstr "" +msgstr "买家用户名" #. module: auction #: selection:auction.lot.category,aie_categ:0 msgid "Cont. Art/Jewelry" -msgstr "" +msgstr "艺术品/ 珠宝" #. module: auction #: xsl:report.auction.deposit:0 #: xsl:report.auction.vnd_bordereau:0 msgid "Inventory" -msgstr "" +msgstr "目录" #. module: auction #: model:ir.actions.act_window,name:auction.action_auction_dates_next msgid "Next Auctions" -msgstr "" +msgstr "下一拍卖" #. module: auction #: rml:buyer.list:0 msgid "#" -msgstr "" +msgstr "#" #. module: auction #: field:auction.lots,ach_emp:0 msgid "Taken Away" -msgstr "" +msgstr "带走" #. module: auction #: view:report.object.encoded.manager:0 msgid "Total gross rev." -msgstr "" +msgstr "未打折收入合计" #. module: auction #: selection:auction.lot.category,aie_categ:0 msgid "Antique/Miniatures / Collections" -msgstr "" +msgstr "古董/ 袖珍/ 收藏" #. module: auction #: wizard_view:auction.lots.numerotate,not_exist:0 msgid "This lot does not exist !" -msgstr "" +msgstr "这批不存在!" #. module: auction #: view:auction.dates:0 msgid "End of auction" -msgstr "" +msgstr "拍卖结束" #. module: auction #: field:auction.bid_line,call:0 msgid "To be Called" -msgstr "" +msgstr "被称为" #. module: auction #: model:ir.actions.act_window,name:auction.action_report_auction_estimation_adj_category_manager_tree #: model:ir.actions.act_window,name:auction.action_report_auction_estimation_adj_category_member_tree #: view:report.auction.estimation.adj.category:0 msgid "Min est/Adj/Max est" -msgstr "" +msgstr "最少估价/ 最终结果/ 最高估价" #. module: auction #: model:ir.actions.report.xml,name:auction.lot_list_inv msgid "Lots List - Landscape" -msgstr "" +msgstr "批列表 - Landscape" #. module: auction #: view:report.seller.auction:0 msgid "Auction reporting tree view" -msgstr "" +msgstr "拍卖报表树视图" #. module: auction #: wizard_view:auction.lots.auction_move,init:0 #: model:ir.actions.wizard,name:auction.wizard_change_auction msgid "Change Auction Date" -msgstr "" +msgstr "修改拍卖日期" #. module: auction #: selection:auction.lot.category,aie_categ:0 msgid "Cont. Art/Photo" -msgstr "" +msgstr "艺术品/ 照片" #. module: auction #: field:auction.deposit,method:0 @@ -1541,77 +1541,77 @@ msgstr "" #. module: auction #: rml:auction.total.rml:0 msgid "Max Estimate:" -msgstr "" +msgstr "最高估计" #. module: auction #: model:ir.model,name:auction.model_auction_bid msgid "Bid auctions" -msgstr "" +msgstr "拍卖出价" #. module: auction #: field:report.auction.view2,obj_margin:0 msgid "Avg margin" -msgstr "" +msgstr "平均利润" #. module: auction #: selection:auction.lot.category,aie_categ:0 msgid "Antique/Art from the Ivory Coast" -msgstr "" +msgstr "古董/ 象牙海岸的艺术品" #. module: auction #: selection:auction.lot.category,aie_categ:0 msgid "Antique/Religiosa" -msgstr "" +msgstr "古董/ 宗教" #. module: auction #: wizard_button:auction.lots.make_invoice,init,invoice:0 #: wizard_button:auction.lots.make_invoice_buyer,init,invoice:0 msgid "Create invoices" -msgstr "" +msgstr "创建发票" #. module: auction #: 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 msgid "Lot" -msgstr "" +msgstr "批号" #. module: auction #: model:ir.ui.menu,name:auction.menu_all_objects_unplanned1 msgid "Unplanned objects" -msgstr "" +msgstr "无计划的物品" #. module: auction #: selection:auction.lot.category,aie_categ:0 msgid "Cont. Art/Sculpture" -msgstr "" +msgstr "艺术品/ 雕像" #. module: auction #: model:ir.model,name:auction.model_auction_artists msgid "auction.artists" -msgstr "" +msgstr "拍卖.艺术家" #. module: auction #: field:auction.dates,journal_id:0 msgid "Buyer Journal" -msgstr "" +msgstr "买家记录集合" #. module: auction #: selection:auction.lots,state:0 #: selection:report.object.encoded,state:0 #: selection:report.unclassified.objects,state:0 msgid "Paid" -msgstr "" +msgstr "已付" #. module: auction #: rml:bids.lots:0 #: rml:bids.phones.details:0 msgid "Phone" -msgstr "" +msgstr "电话" #. module: auction #: selection:auction.lot.category,aie_categ:0 @@ -1622,48 +1622,48 @@ msgstr "" #: wizard_button:auction.pay.buy,init,pay:0 #: wizard_button:auction.payer.sel,init,pay2:0 msgid "Pay" -msgstr "" +msgstr "支付" #. module: auction #: field:auction.lot.category,active:0 msgid "Active" -msgstr "" +msgstr "有效" #. module: auction #: selection:auction.lot.category,aie_categ:0 msgid "Antique/Lightings" -msgstr "" +msgstr "古董/ 灯饰" #. module: auction #: selection:auction.lot.category,aie_categ:0 msgid "Antique/Sculpture, bronze, eso." -msgstr "" +msgstr "古董/ 雕塑, 青铜" #. module: auction #: rml:buyer.list:0 msgid "Total:" -msgstr "" +msgstr "合计:" #. module: auction #: model:account.tax,name:auction.auction_tax2 msgid "TVA1" -msgstr "" +msgstr "增值税1" #. module: auction #: view:report.auction.object.date:0 msgid "Objects per Day" -msgstr "" +msgstr "每天的物品" #. module: auction #: xsl:report.auction.deposit:0 msgid "Document Number" -msgstr "" +msgstr "文档编号" #. module: auction #: field:report.object.encoded.manager,obj_margin:0 #: field:report.seller.auction2,net_margin:0 msgid "Net margin" -msgstr "" +msgstr "净利润" #. module: auction #: wizard_button:auction.lots.numerotate,search,set_number:0 @@ -1673,7 +1673,7 @@ msgstr "" #. module: auction #: xsl:report.auction.lots.list.landscape:0 msgid "Buyer, Price" -msgstr "" +msgstr "买家, 价格" #. module: auction #: rml:auction.code_bar_lot:0 @@ -1688,17 +1688,17 @@ msgstr "" #. module: auction #: field:auction.lots,vnd_lim:0 msgid "Seller limit" -msgstr "" +msgstr "卖家极限" #. module: auction #: wizard_view:auction.lots.buyer_map,done:0 msgid "All objects are assigned to buyers !" -msgstr "" +msgstr "所有物品分配给买家" #. module: auction #: wizard_button:auction.lots.able,init,go:0 msgid "Able Taken away" -msgstr "" +msgstr "能带走" #. module: auction #: constraint:ir.model:0 @@ -1709,28 +1709,28 @@ msgstr "对象名称必须以“x_”开头且不能包含任何特殊字符！" #. module: auction #: field:auction.deposit,transfer:0 msgid "Transfer" -msgstr "" +msgstr "转移" #. module: auction #: view:report.auction.adjudication:0 #: field:report.seller.auction,total_price:0 msgid "Total adjudication" -msgstr "" +msgstr "最终结果合计" #. module: auction #: field:auction.lots,artist2_id:0 msgid "Artist/Author 2" -msgstr "" +msgstr "艺术家/ 作者2" #. module: auction #: model:ir.ui.menu,name:auction.menu_seller_allmonth_view1 msgid "Seller's Summary" -msgstr "" +msgstr "卖家摘要" #. module: auction #: view:report.seller.auction:0 msgid "Auction reporting graph view" -msgstr "" +msgstr "拍卖报表图形视图" #. module: auction #: wizard_field:auction.taken,init,lot_ids:0 @@ -1741,17 +1741,17 @@ msgstr "" #: wizard_button:auction.lots.send.aie,date_ask,send:0 #: wizard_button:auction.lots.send.aie.results,date_ask,send:0 msgid "Send on your website" -msgstr "" +msgstr "发送到你的网站" #. module: auction #: field:auction.lots,net_margin:0 msgid "Net Margin (%)" -msgstr "" +msgstr "净利润(%)" #. module: auction #: field:report.auction.object.date,month:0 msgid "Month" -msgstr "" +msgstr "月" #. module: auction #: model:ir.actions.act_window,name:auction.auction_lots_open @@ -1761,50 +1761,50 @@ msgstr "" #. module: auction #: field:auction.lots,product_id:0 msgid "Product" -msgstr "" +msgstr "产品" #. module: auction #: model:ir.model,name:auction.model_report_auction_view msgid "Auction Reporting on view1" -msgstr "" +msgstr "拍卖报表视图1" #. module: auction #: field:report.seller.auction2,sum_adj:0 msgid "Sum Adjustication" -msgstr "" +msgstr "最终结果合计" #. module: auction #: selection:auction.lot.category,aie_categ:0 msgid "Antique/Porcelain, Ceramics, Glassmaking, ..." -msgstr "" +msgstr "古董/ 瓷器, 陶器, 玻璃工艺品" #. module: auction #: xsl:report.auction.ach_bordereau:0 msgid "Plate Number:" -msgstr "" +msgstr "版号:" #. module: auction #: view:auction.deposit:0 #: field:auction.deposit,lot_id:0 #: model:ir.ui.menu,name:auction.auction_objects_menu msgid "Objects" -msgstr "对象" +msgstr "物品" #. module: auction #: wizard_view:auction.lots.numerotate,init:0 #: wizard_view:auction.lots.numerotate,search:0 msgid "Object Reference" -msgstr "" +msgstr "物品参考" #. module: auction #: rml:auction.total.rml:0 msgid "Paid:" -msgstr "" +msgstr "已付：" #. module: auction #: field:auction.deposit,total_neg:0 msgid "Allow Negative Amount" -msgstr "" +msgstr "允许负数金额" #. module: auction #: rml:auction.bids:0 @@ -1812,12 +1812,12 @@ msgstr "" #: rml:auction.total.rml:0 #: model:ir.ui.menu,name:auction.auction_report_auction_menu msgid "Auction" -msgstr "" +msgstr "拍卖" #. module: auction #: selection:auction.lot.category,aie_categ:0 msgid "Cont. Art/Shows" -msgstr "" +msgstr "艺术品/ 展示" #. module: auction #: field:auction.dates,name:0 @@ -1833,17 +1833,17 @@ msgstr "" #: field:report.seller.auction2,date:0 #: field:report.unclassified.objects,auction:0 msgid "Auction date" -msgstr "" +msgstr "拍卖日期" #. module: auction #: model:ir.ui.menu,name:auction.menu_all_objects_unsold msgid "Unsold Objects" -msgstr "" +msgstr "未售出物品" #. module: auction #: field:report.buyer.auction,avg_price:0 msgid "Avg Adj." -msgstr "" +msgstr "平均最终结果" #. module: auction #: model:ir.model,name:auction.model_auction_deposit_cost @@ -1853,17 +1853,17 @@ msgstr "" #. module: auction #: wizard_field:auction.lots.numerotate,search,bord_vnd_id:0 msgid "Object Inventory" -msgstr "" +msgstr "物品目录" #. module: auction #: selection:auction.lot.category,aie_categ:0 msgid "Antique/Art from the Ivory Coast/African Arts" -msgstr "" +msgstr "古董/ 象牙海岸艺术品/ 非洲艺术品" #. module: auction #: field:auction.dates,auction1:0 msgid "First Auction Day" -msgstr "" +msgstr "首日拍卖" #. module: auction #: view:report.attendance:0 @@ -1873,67 +1873,67 @@ msgstr "" #. module: auction #: view:auction.lot.category:0 msgid "Lot Category" -msgstr "" +msgstr "批类别" #. module: auction #: model:ir.ui.menu,name:auction.auction_report_manager_menu msgid "Manager" -msgstr "" +msgstr "经理" #. module: auction #: view:auction.dates:0 msgid "Names" -msgstr "" +msgstr "名称" #. module: auction #: view:auction.artists:0 msgid "Artists" -msgstr "" +msgstr "艺术家" #. module: auction #: field:report.attendance,total_attendance:0 msgid "Total" -msgstr "" +msgstr "合计" #. module: auction #: model:ir.actions.act_window,name:auction.act_auction_lot_line_open msgid "Open lots" -msgstr "" +msgstr "打开批" #. module: auction #: view:report.seller.auction:0 msgid "Auction reporting form view" -msgstr "" +msgstr "拍卖报表表格视图" #. module: auction #: view:auction.lots:0 msgid "Lots" -msgstr "" +msgstr "批" #. module: auction #: model:ir.actions.wizard,name:auction.wizard_send msgid "Send to website" -msgstr "" +msgstr "发送到网站" #. module: auction #: model:ir.ui.menu,name:auction.menu_auction_dates_old msgid "Old Auction Dates" -msgstr "" +msgstr "旧拍卖日期" #. module: auction #: field:auction.lots,seller_price:0 msgid "Seller price" -msgstr "" +msgstr "卖家价格" #. module: auction #: model:ir.model,name:auction.model_report_seller_auction2 msgid "Auction Reporting on seller view2" -msgstr "" +msgstr "拍卖视图卖家视图2" #. module: auction #: model:ir.actions.report.xml,name:auction.buy_id_list msgid "Buyer List" -msgstr "" +msgstr "买家列表" #. module: auction #: rml:buyer.list:0 @@ -1945,12 +1945,12 @@ msgstr "" #: wizard_field:auction.pay.buy,init,statement_id2:0 #: wizard_field:auction.pay.buy,init,statement_id3:0 msgid "Statement" -msgstr "" +msgstr "对帐单" #. module: auction #: selection:auction.lot.category,aie_categ:0 msgid "Antique/Engravings" -msgstr "" +msgstr "古董/ 版画" #. module: auction #: model:account.tax,name:auction.auction_tax20 @@ -1962,7 +1962,7 @@ msgstr "" #: wizard_view:auction.lots.numerotate_cont,init:0 #: wizard_field:auction.lots.numerotate_cont,init,number:0 msgid "First Number" -msgstr "" +msgstr "第一编号" #. module: auction #: model:account.tax,name:auction.auction_tax @@ -1972,28 +1972,28 @@ msgstr "" #. module: auction #: model:ir.model,name:auction.model_report_auction_view2 msgid "Auction Reporting on view2" -msgstr "" +msgstr "拍卖报表视图2" #. module: auction #: field:auction.dates,expo1:0 msgid "First Exposition Day" -msgstr "" +msgstr "展览会首日" #. module: auction #: wizard_view:auction.lots.auction_move,init:0 msgid "" "Warning, this will erase the object adjudication price and its buyer !" -msgstr "" +msgstr "警告, 这将删除物品的最终结果和它的买家" #. module: auction #: field:report.auction.object.date,name:0 msgid "Created date" -msgstr "" +msgstr "创建日期" #. module: auction #: view:auction.bid:0 msgid "Bid information" -msgstr "" +msgstr "出价信息" #. module: auction #: xsl:report.auction.lots.list.landscape:0 @@ -2003,7 +2003,7 @@ msgstr "" #. module: auction #: field:auction.dates,acc_income:0 msgid "Income Account" -msgstr "" +msgstr "收入科目" #. module: auction #: field:auction.lots,net_revenue:0 @@ -2011,91 +2011,91 @@ msgstr "" #: field:report.object.encoded.manager,net_revenue:0 #: field:report.seller.auction2,net_revenue:0 msgid "Net revenue" -msgstr "" +msgstr "净收入" #. module: auction #: xsl:report.auction.deposit:0 #: xsl:report.auction.lots.list.landscape:0 msgid "Limit" -msgstr "" +msgstr "极限" #. module: auction #: model:ir.ui.menu,name:auction.menu_report_latest_doposit_tree_manager msgid "Latest Deposits" -msgstr "" +msgstr "最近押金" #. module: auction #: rml:auction.total.rml:0 msgid "# of items:" -msgstr "" +msgstr "# 项" #. module: auction #: selection:auction.lot.category,aie_categ:0 msgid "Antique/Musical Instruments" -msgstr "" +msgstr "古董/ 乐器" #. module: auction #: field:report.object.encoded,estimation:0 #: field:report.object.encoded.manager,estimation:0 msgid "Estimation" -msgstr "" +msgstr "估价" #. module: auction #: selection:auction.lot.category,aie_categ:0 msgid "Antique/Graphic Arts" -msgstr "" +msgstr "古董/ 印艺" #. module: auction #: model:ir.actions.report.xml,name:auction.buyer_form_id msgid "Buyer Form" -msgstr "" +msgstr "买家表格" #. module: auction #: model:ir.actions.wizard,name:auction.wizard_invoice msgid "Invoice Seller objects" -msgstr "" +msgstr "发票卖家物品" #. module: auction #: selection:auction.lot.category,aie_categ:0 msgid "Antique/Oriental Arts" -msgstr "" +msgstr "古董/ 东方艺术" #. module: auction #: field:auction.bid,partner_id:0 msgid "Buyer Name" -msgstr "" +msgstr "买家姓名" #. module: auction #: field:report.auction.view2,sum_adj:0 msgid "Sum of adjudication" -msgstr "" +msgstr "最终结果合计" #. module: auction #: model:ir.actions.wizard,name:auction.auction_wizard_enable_taken msgid "Unmark as taken away" -msgstr "" +msgstr "取消带走标记" #. module: auction #: field:auction.lots,gross_margin:0 msgid "Gross Margin (%)" -msgstr "" +msgstr "毛利(%)" #. module: auction #: selection:auction.dates,state:0 #: selection:report.auction.adjudication,state:0 msgid "Closed" -msgstr "" +msgstr "关闭" #. module: auction #: field:auction.lots,obj_comm:0 #: field:report.unclassified.objects,obj_comm:0 msgid "Commission" -msgstr "" +msgstr "佣金" #. module: auction #: wizard_field:auction.lots.numerotate,init,lot_num:0 msgid "Lot Number" -msgstr "" +msgstr "批号" #. module: auction #: constraint:res.partner:0 @@ -2105,13 +2105,13 @@ msgstr "这增值税似乎不正确" #. module: auction #: field:report.attendance,employee_id:0 msgid "Employee" -msgstr "" +msgstr "员工" #. module: auction #: xsl:report.auction.ach_bordereau:0 #: xsl:report.auction.vnd_bordereau:0 msgid "Adj.(EUR)" -msgstr "" +msgstr "最终结果(EUR)" #. module: auction #: xsl:report.auction.lots.list.landscape:0 @@ -2121,22 +2121,22 @@ msgstr "" #. module: auction #: model:ir.ui.menu,name:auction.auction_report_menu msgid "Reporting" -msgstr "内部报表" +msgstr "报表" #. module: auction #: view:auction.lots:0 msgid "Catalog" -msgstr "" +msgstr "目录" #. module: auction #: field:auction.deposit.cost,account:0 msgid "Destination Account" -msgstr "" +msgstr "目标帐号" #. module: auction #: model:ir.model,name:auction.model_report_deposit_border msgid "Report deposit border" -msgstr "" +msgstr "报告押金边界" #. module: auction #: model:ir.ui.menu,name:auction.auction_config_menu @@ -2151,19 +2151,19 @@ msgstr "" #. module: auction #: field:auction.deposit.cost,deposit_id:0 msgid "Deposit" -msgstr "" +msgstr "押金" #. module: auction #: field:auction.dates,expo2:0 msgid "Last Exposition Day" -msgstr "" +msgstr "最后展览会日期" #. module: auction #: model:ir.actions.act_window,name:auction.action_auction_report_allmonth_view1 #: model:ir.actions.act_window,name:auction.action_auction_report_allmonth_view2 #: model:ir.actions.act_window,name:auction.action_auction_report_thismonth_view2 msgid "Auction report" -msgstr "" +msgstr "拍卖报表" #. module: auction #: model:ir.model,name:auction.model_auction_lot_category @@ -2173,50 +2173,50 @@ msgstr "" #. module: auction #: field:auction.artists,name:0 msgid "Artist/Author Name" -msgstr "" +msgstr "艺术家/ 作者姓名" #. module: auction #: field:auction.lots,image:0 msgid "Image" -msgstr "" +msgstr "图像" #. module: auction #: selection:report.object.encoded,state:0 msgid "Invoiced" -msgstr "" +msgstr "已开票" #. module: auction #: view:auction.lots:0 #: selection:auction.lots,state:0 msgid "Taken away" -msgstr "" +msgstr "带走" #. module: auction #: selection:auction.lot.category,aie_categ:0 msgid "Antique/Collectible & art objects" -msgstr "" +msgstr "古董/ 收藏品&艺术品" #. module: auction #: xsl:report.auction.lots.list.landscape:0 msgid "BID:" -msgstr "" +msgstr "出价:" #. module: auction #: model:ir.actions.act_window,name:auction.action_auction_buyer_reporting #: model:ir.actions.act_window,name:auction.action_auction_buyer_reporting2 #: model:ir.actions.act_window,name:auction.action_auction_buyer_reporting_all1 msgid "Buyer's auction" -msgstr "" +msgstr "买家拍卖" #. module: auction #: view:report.seller.auction2:0 msgid "Auction reporting2 tree view" -msgstr "" +msgstr "拍卖报表2树视图" #. module: auction #: view:auction.deposit:0 msgid "Deposit Costs" -msgstr "" +msgstr "押金成本" #. module: auction #: constraint:res.partner:0 @@ -2231,7 +2231,7 @@ msgstr "错误！您不能创建递归的相关成员。" #: selection:report.seller.auction,state:0 #: selection:report.unclassified.objects,state:0 msgid "Draft" -msgstr "" +msgstr "草稿" #. module: auction #: rml:buyer.list:0 @@ -2241,38 +2241,38 @@ msgstr "" #. module: auction #: xsl:report.auction.ach_bordereau:0 msgid "Buyer Cost:" -msgstr "" +msgstr "买家费用:" #. module: auction #: xsl:report.auction.lots.list.landscape:0 msgid "NET" -msgstr "" +msgstr "净值" #. module: auction #: rml:report.auction.buyer.result:0 msgid "Adj" -msgstr "" +msgstr "最终结果" #. module: auction #: view:auction.dates:0 #: model:ir.ui.menu,name:auction.auction_date_menu msgid "Auction Dates" -msgstr "" +msgstr "拍卖日期" #. module: auction #: selection:auction.lot.category,aie_categ:0 msgid "Antique/Furnitures" -msgstr "" +msgstr "古董/ 家具" #. module: auction #: xsl:report.auction.ach_bordereau:0 msgid "Customer Contact" -msgstr "" +msgstr "客户联系" #. module: auction #: xsl:report.auction.lots.list.landscape:0 msgid "Inv, Name" -msgstr "" +msgstr "发票名称" #. module: auction #: field:report.auction.adjudication,user_id:0 @@ -2281,38 +2281,38 @@ msgstr "" #: field:report.object.encoded,user_id:0 #: field:report.object.encoded.manager,user_id:0 msgid "User" -msgstr "" +msgstr "用户" #. module: auction #: view:report.unplanned.object:0 msgid "Unplanned Objects" -msgstr "" +msgstr "无计划的物品" #. module: auction #: field:report.buyer.auction2,gross_revenue:0 msgid "Gross Revenue" -msgstr "" +msgstr "总收入" #. module: auction #: field:auction.artists,pseudo:0 msgid "Pseudo" -msgstr "" +msgstr "赝品" #. module: auction #: field:auction.lots,important:0 msgid "To be Emphatized" -msgstr "" +msgstr "加强" #. module: auction #: view:auction.lots:0 msgid "Not sold" -msgstr "" +msgstr "未售出" #. module: auction #: model:account.tax,name:auction.auction_tax3 #: field:auction.dates,buyer_costs:0 msgid "Buyer Costs" -msgstr "" +msgstr "买家费用" #. module: auction #: model:ir.actions.wizard,name:auction.wizard_numerotate_automatic @@ -2322,27 +2322,27 @@ msgstr "" #. module: auction #: rml:auction.total.rml:0 msgid "Auction Date:" -msgstr "" +msgstr "拍卖日期:" #. module: auction #: field:auction.lots,ach_inv_id:0 msgid "Buyer Invoice" -msgstr "" +msgstr "买家发票" #. module: auction #: rml:auction.bids:0 msgid "Tel" -msgstr "" +msgstr "Tel" #. module: auction #: wizard_field:auction.pay.buy,init,total:0 msgid "Amount to paid" -msgstr "" +msgstr "支付金额" #. module: auction #: field:auction.lots,artist_id:0 msgid "Artist/Author" -msgstr "" +msgstr "艺术家/ 作者" #. module: auction #: model:account.tax,name:auction.auction_tax1 @@ -2352,12 +2352,12 @@ msgstr "" #. module: auction #: model:ir.actions.report.xml,name:auction.total_result1 msgid "Auction Totals with lists" -msgstr "" +msgstr "拍卖列表合计" #. module: auction #: wizard_button:auction.lots.buyer_map,done,end:0 msgid "Close" -msgstr "" +msgstr "关闭" #. module: auction #: model:ir.model,name:auction.model_report_object_encoded @@ -2373,32 +2373,32 @@ msgstr "" #. module: auction #: field:report.auction.view,nbuyer:0 msgid "No of buyers" -msgstr "" +msgstr "没买家" #. module: auction #: field:report.seller.auction,avg_price:0 msgid "Avg adjudication" -msgstr "" +msgstr "平均最终结果" #. module: auction #: view:report.object.encoded.manager:0 msgid "Object statistic" -msgstr "" +msgstr "物品统计" #. module: auction #: field:auction.dates,auction2:0 msgid "Last Auction Day" -msgstr "" +msgstr "最后拍卖日" #. module: auction #: model:ir.ui.menu,name:auction.menu_auction_dates_next1 msgid "Next Auction Dates" -msgstr "" +msgstr "下一个拍卖日" #. module: auction #: model:ir.model,name:auction.model_report_attendance msgid "Report Sign In/Out" -msgstr "" +msgstr "报告登进/ 登出" #. module: auction #: view:auction.deposit:0 @@ -2407,29 +2407,29 @@ msgstr "" #: wizard_field:auction.lots.numerotate,search,obj_desc:0 #: rml:bids.phones.details:0 msgid "Description" -msgstr "" +msgstr "说明" #. module: auction #: selection:auction.lot.category,aie_categ:0 msgid "Cont. Art/Arts" -msgstr "" +msgstr "艺术品/ 艺术家" #. module: auction #: field:auction.lots,obj_price:0 #: field:report.auction.view,adj_price:0 #: field:report.unclassified.objects,obj_price:0 msgid "Adjudication price" -msgstr "" +msgstr "最终结果价格" #. module: auction #: model:ir.ui.menu,name:auction.menu_all_objects_to_sell msgid "Objects to sell" -msgstr "" +msgstr "物品销售" #. module: auction #: xsl:flagey.huissier:0 msgid "Ref." -msgstr "" +msgstr "参考" #. module: auction #: wizard_field:auction.lots.send.aie,date_ask,password:0 @@ -2438,196 +2438,196 @@ msgstr "" #: wizard_field:auction.lots.send.aie.results,init,password:0 #: wizard_field:auction.lots.sms_send,init,password:0 msgid "Password" -msgstr "" +msgstr "密码" #. module: auction #: field:auction.lots,ach_avance:0 msgid "Buyer Advance" -msgstr "" +msgstr "买家进展" #. module: auction #: field:auction.lots,name:0 #: wizard_field:auction.lots.numerotate,search,name:0 #: field:report.unclassified.objects,name:0 msgid "Short Description" -msgstr "" +msgstr "简短说明" #. module: auction #: model:ir.ui.menu,name:auction.auction_report_employees_menu msgid "Employees" -msgstr "" +msgstr "员工" #. module: auction #: selection:auction.lot.category,aie_categ:0 msgid "Antique/Clocks and watches" -msgstr "" +msgstr "古董/ 钟表" #. module: auction #: selection:auction.lot.category,aie_categ:0 msgid "Antique/Scientific Instruments" -msgstr "" +msgstr "古董/ 科学仪器" #. module: auction #: wizard_view:auction.lots.enable,init:0 msgid "Confirmation enable taken away" -msgstr "" +msgstr "设置允许带走" #. module: auction #: wizard_view:auction.pay.buy,init:0 msgid "Pay objects" -msgstr "" +msgstr "物品付款" #. module: auction #: view:report.object.encoded:0 #: view:report.object.encoded.manager:0 msgid "# objects" -msgstr "" +msgstr "# 物品" #. module: auction #: rml:auction.total.rml:0 msgid "Adjudication:" -msgstr "" +msgstr "最终结果:" #. module: auction #: field:report.buyer.auction2,sumadj:0 msgid "Sum of adjustication" -msgstr "" +msgstr "最终结果总计" #. module: auction #: model:ir.actions.report.xml,name:auction.details_bids_phones msgid "Bids per lot (phone)" -msgstr "" +msgstr "每次出价(电话)" #. module: auction #: field:report.buyer.auction,buyer_login:0 #: field:report.buyer.auction2,buyer_login:0 msgid "Buyer Login" -msgstr "" +msgstr "买家登录" #. module: auction #: field:auction.deposit,tax_id:0 msgid "Expenses" -msgstr "" +msgstr "费用" #. module: auction #: selection:auction.lot.category,aie_categ:0 msgid "Antique/Wine" -msgstr "" +msgstr "古董/ 酒" #. module: auction #: rml:auction.total.rml:0 msgid "Auction name:" -msgstr "" +msgstr "拍卖名称:" #. module: auction #: selection:auction.lot.category,aie_categ:0 msgid "Antique/African Arts" -msgstr "" +msgstr "古董/ 非洲艺术" #. module: auction #: model:ir.actions.report.xml,name:auction.art2 msgid "Artists Biography" -msgstr "" +msgstr "艺术家简历" #. module: auction #: selection:auction.lot.category,aie_categ:0 msgid "Antique/Posters" -msgstr "" +msgstr "古董/ 海报" #. module: auction #: field:auction.lots,history_ids:0 msgid "Auction history" -msgstr "" +msgstr "拍卖日志" #. module: auction #: xsl:report.auction.lots.list.landscape:0 msgid "Orders" -msgstr "" +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." diff --git a/addons/audittrail/i18n/zh_CN.po b/addons/audittrail/i18n/zh_CN.po index 6573c20e894..b554277f990 100644 --- a/addons/audittrail/i18n/zh_CN.po +++ b/addons/audittrail/i18n/zh_CN.po @@ -7,13 +7,13 @@ 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:34+0000\n" +"PO-Revision-Date: 2010-07-15 17:26+0000\n" "Last-Translator: Black Jack \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:16+0000\n" +"X-Launchpad-Export-Date: 2010-07-16 03:39+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: audittrail @@ -35,7 +35,7 @@ msgstr "日志" #. module: audittrail #: selection:audittrail.rule,state:0 msgid "Subscribed" -msgstr "订阅" +msgstr "已订阅" #. module: audittrail #: view:audittrail.log:0 @@ -105,7 +105,7 @@ msgstr "资源ID" #. module: audittrail #: selection:audittrail.log,method:0 msgid "Write" -msgstr "写" +msgstr "写入" #. module: audittrail #: model:ir.ui.menu,name:audittrail.menu_action_audittrail diff --git a/addons/hr_attendance/i18n/it.po b/addons/hr_attendance/i18n/it.po index 657a7385ba2..58810049fda 100644 --- a/addons/hr_attendance/i18n/it.po +++ b/addons/hr_attendance/i18n/it.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: 2009-09-08 15:55+0000\n" -"Last-Translator: Mario Riva \n" +"PO-Revision-Date: 2010-07-15 07:49+0000\n" +"Last-Translator: Salvatore Udda \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-16 03:39+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: hr_attendance @@ -97,7 +97,7 @@ msgstr "Stampa Rapporto Errori Presenze" #. module: hr_attendance #: constraint:ir.actions.act_window:0 msgid "Invalid model name in the action definition." -msgstr "" +msgstr "Nome di modello non valido nella definizione dell'azione." #. module: hr_attendance #: model:ir.actions.wizard,name:hr_attendance.print_week @@ -140,17 +140,17 @@ msgstr "Motivi Azione" #. module: hr_attendance #: selection:hr.attendance.print_month,init,month:0 msgid "March" -msgstr "" +msgstr "Marzo" #. module: hr_attendance #: selection:hr.attendance.print_month,init,month:0 msgid "August" -msgstr "" +msgstr "Agosto" #. module: hr_attendance #: selection:hr.attendance.print_month,init,month:0 msgid "May" -msgstr "" +msgstr "Maggio" #. module: hr_attendance #: wizard_field:hr.si_so,so_ask_si,last_time:0 @@ -160,7 +160,7 @@ msgstr "Ultima Entrata" #. module: hr_attendance #: selection:hr.attendance.print_month,init,month:0 msgid "June" -msgstr "" +msgstr "Giugno" #. module: hr_attendance #: model:ir.actions.wizard,name:hr_attendance.print_month @@ -203,7 +203,7 @@ msgstr "Data" #. module: hr_attendance #: selection:hr.attendance.print_month,init,month:0 msgid "July" -msgstr "" +msgstr "Luglio" #. module: hr_attendance #: wizard_view:hr.si_so,si_ask_so:0 @@ -238,12 +238,12 @@ msgstr "Assente" #. module: hr_attendance #: selection:hr.attendance.print_month,init,month:0 msgid "February" -msgstr "" +msgstr "Febbraio" #. module: hr_attendance #: selection:hr.attendance.print_month,init,month:0 msgid "October" -msgstr "" +msgstr "Ottobre" #. module: hr_attendance #: wizard_field:hr.si_so,si_ask_so,last_time:0 @@ -285,12 +285,12 @@ msgstr "Stato Attuale" #. module: hr_attendance #: selection:hr.attendance.print_month,init,month:0 msgid "January" -msgstr "" +msgstr "Gennaio" #. module: hr_attendance #: selection:hr.attendance.print_month,init,month:0 msgid "April" -msgstr "" +msgstr "Aprile" #. module: hr_attendance #: model:ir.actions.act_window,name:hr_attendance.open_view_attendance @@ -324,7 +324,7 @@ msgstr "Motivazioni Presenza" #. module: hr_attendance #: selection:hr.attendance.print_month,init,month:0 msgid "November" -msgstr "" +msgstr "Novembre" #. module: hr_attendance #: wizard_view:hr.attendance.report,init:0 @@ -334,7 +334,7 @@ msgstr "" #. module: hr_attendance #: wizard_field:hr.attendance.report,init,max_delay:0 msgid "Max. Delay (Min)" -msgstr "" +msgstr "Ritardo Massimo (min.)" #. module: hr_attendance #: wizard_view:hr.attendance.print_week,init:0 @@ -359,12 +359,12 @@ msgstr "" #. module: hr_attendance #: selection:hr.attendance.print_month,init,month:0 msgid "September" -msgstr "" +msgstr "Settembre" #. module: hr_attendance #: selection:hr.attendance.print_month,init,month:0 msgid "December" -msgstr "" +msgstr "Dicembre" #. module: hr_attendance #: view:hr.attendance:0 @@ -374,12 +374,12 @@ msgstr "Presenza Dipendente" #. module: hr_attendance #: wizard_view:hr.attendance.print_month,init:0 msgid "Select a month" -msgstr "" +msgstr "Selezionare un mese" #. module: hr_attendance #: wizard_field:hr.attendance.print_month,init,month:0 msgid "Month" -msgstr "" +msgstr "Mese" #. module: hr_attendance #: model:ir.module.module,description:hr_attendance.module_meta_information @@ -394,7 +394,7 @@ msgstr "Report Errori Presenze" #. module: hr_attendance #: wizard_field:hr.attendance.print_month,init,year:0 msgid "Year" -msgstr "" +msgstr "Anno" #. module: hr_attendance #: wizard_button:hr.attendance.print_month,init,end:0 diff --git a/addons/purchase/i18n/pt_BR.po b/addons/purchase/i18n/pt_BR.po index 6109fb02cbf..9df1b629088 100644 --- a/addons/purchase/i18n/pt_BR.po +++ b/addons/purchase/i18n/pt_BR.po @@ -8,13 +8,14 @@ msgstr "" "Project-Id-Version: pt_BR\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-10-02 17:40+0000\n" -"Last-Translator: Cristiano Korndörfer \n" +"PO-Revision-Date: 2010-07-15 22:07+0000\n" +"Last-Translator: Renato Lima - http://www.akretion.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 03:57+0000\n" +"X-Launchpad-Export-Date: 2010-07-16 03:39+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: purchase @@ -30,42 +31,42 @@ msgstr "" #. module: purchase #: field:purchase.order,location_id:0 msgid "Destination" -msgstr "" +msgstr "Destino" #. module: purchase #: selection:purchase.order,invoice_method:0 msgid "From Picking" -msgstr "" +msgstr "Da Lista de Separação" #. module: purchase #: rml:purchase.order:0 msgid "Validated By" -msgstr "" +msgstr "Validado Por" #. module: purchase #: constraint:ir.actions.act_window:0 msgid "Invalid model name in the action definition." -msgstr "" +msgstr "Nome de modelo inválido na definição da ação" #. module: purchase #: field:purchase.order,partner_id:0 msgid "Supplier" -msgstr "" +msgstr "Fornecedor" #. module: purchase #: view:purchase.order:0 msgid "Delivery" -msgstr "" +msgstr "Entrega" #. module: purchase #: field:purchase.order.line,product_qty:0 msgid "Quantity" -msgstr "" +msgstr "Quantidade" #. module: purchase #: selection:purchase.order,invoice_method:0 msgid "From Order" -msgstr "" +msgstr "Da Ordem" #. module: purchase #: model:process.node,name:purchase.process_node_confirmpurchaseorder0 @@ -97,7 +98,7 @@ msgstr "" #. module: purchase #: rml:purchase.order:0 msgid "Fax :" -msgstr "" +msgstr "Fax :" #. module: purchase #: model:process.transition,note:purchase.process_transition_productrecept0 @@ -114,12 +115,12 @@ msgstr "" #. module: purchase #: model:process.process,name:purchase.process_process_purchaseprocess0 msgid "Purchase Process" -msgstr "" +msgstr "Processo de Compras" #. module: purchase #: model:process.transition,name:purchase.process_transition_invoicefrompackinglist0 msgid "Invoice from Packing list" -msgstr "" +msgstr "Faturar a partir da lista de Separação" #. module: purchase #: view:purchase.order:0 @@ -153,6 +154,7 @@ msgstr "Notas" #. module: purchase #: rml:purchase.order:0 #: field:purchase.order,amount_tax:0 +#: view:purchase.order.line:0 #: field:purchase.order.line,taxes_id:0 msgid "Taxes" msgstr "" @@ -293,7 +295,7 @@ msgstr "" #: model:process.node,name:purchase.process_node_draftpurchaseorder0 #: model:process.node,name:purchase.process_node_draftpurchaseorder1 msgid "RFQ" -msgstr "" +msgstr "RFQ" #. module: purchase #: selection:purchase.order,state:0 @@ -876,3 +878,56 @@ msgstr "" #: view:purchase.order.line:0 msgid "Stock Moves" msgstr "" + +#, python-format +#~ msgid "No Pricelist !" +#~ msgstr "Sem Lista de Preços !" + +#, python-format +#~ msgid "Wrong Product UOM !" +#~ msgstr "UdM do Produto errada !" + +#, python-format +#~ msgid "Error !" +#~ msgstr "Erro !" + +#, python-format +#~ msgid "Invalid action !" +#~ msgstr "Ação Inválida !" + +#, python-format +#~ msgid "" +#~ "You have to select a product UOM in the same category than the purchase UOM " +#~ "of the product" +#~ msgstr "" +#~ "Deve-se selecionar uma UdM do produto da mesma categoria que a UdM de compra " +#~ "do produto" + +#, python-format +#~ msgid "Could not cancel this purchase order !" +#~ msgstr "Não é possível cancelar esta ordem de compra!" + +#, python-format +#~ msgid "No Partner!" +#~ msgstr "Sem Parceiro!" + +#, python-format +#~ msgid "Could not cancel purchase order !" +#~ msgstr "Não foi possível cancelar a ordem de compra!" + +#, python-format +#~ msgid "You must first cancel all invoices attached to this purchase order." +#~ msgstr "" +#~ "Primeiro deve-se cancelar todas as faturas associadas a esta ordem de " +#~ "compra." + +#, python-format +#~ msgid "There is no expense account defined for this product: \"%s\" (id:%d)" +#~ msgstr "" +#~ "No existe conta de despesas definida para este produto: \"%s\" (id:%d)" + +#, python-format +#~ msgid "You must first cancel all packing attached to this purchase order." +#~ msgstr "" +#~ "Primeiramente deve-se cancelar todas as embalagens associadas a esta ordem " +#~ "de compra." From ddfa27794db72b40013f1b39ad6463887e62dd0a Mon Sep 17 00:00:00 2001 From: "psi(OpenERP)" <> Date: Fri, 16 Jul 2010 10:38:56 +0530 Subject: [PATCH 02/17] [FIX] scrum: Demo data bzr revid: mra@mra-laptop-20100716050856-yxmd77pubp1mr649 --- addons/project_scrum/project_scrum_demo.xml | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/addons/project_scrum/project_scrum_demo.xml b/addons/project_scrum/project_scrum_demo.xml index a4fad8eb307..d162a396abe 100644 --- a/addons/project_scrum/project_scrum_demo.xml +++ b/addons/project_scrum/project_scrum_demo.xml @@ -247,16 +247,7 @@ Demo :Bugfix - memory leak - - - - Create a script for migration and testing - - - - - - + Add on top or bottom and shortcuts From e3606ed329a77235988b82c2185830160f907f86 Mon Sep 17 00:00:00 2001 From: Mustufa Rangwala Date: Fri, 16 Jul 2010 11:01:23 +0530 Subject: [PATCH 03/17] [FIX] account: Action number bzr revid: mra@mra-laptop-20100716053123-wpfqfc06sjo4qq5b --- addons/account/invoice.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/account/invoice.py b/addons/account/invoice.py index f3b62f0fd27..48a39a1bcfd 100644 --- a/addons/account/invoice.py +++ b/addons/account/invoice.py @@ -892,7 +892,7 @@ class account_invoice(osv.osv): self.write(cr, uid, [inv.id], {'move_id': move_id,'period_id':period_id, 'move_name':new_move_name}) self.pool.get('account.move').post(cr, uid, [move_id]) self._log_event(cr, uid, ids) - + return True def line_get_convert(self, cr, uid, x, part, date, context=None): @@ -925,11 +925,11 @@ class account_invoice(osv.osv): reference = obj_inv.reference if not number: tmp_context = { - 'fiscalyear_id': inv.period_id.fiscalyear_id.id + 'fiscalyear_id': obj_inv.period_id.fiscalyear_id.id } - if inv.journal_id.invoice_sequence_id: - sequence_id = inv.journal_id.invoice_sequence_id.id - number = self.pool.get('ir.sequence').get_id(cr, uid, + if obj_inv.journal_id.invoice_sequence_id: + sequence_id = obj_inv.journal_id.invoice_sequence_id.id + number = self.pool.get('ir.sequence').get_id(cr, uid, sequence_id, 'id', context=tmp_context) From b651a55c71a4e398e6e4c02f5b0cb9932027c6a2 Mon Sep 17 00:00:00 2001 From: "Harry (OpenERP)" Date: Fri, 16 Jul 2010 12:17:14 +0530 Subject: [PATCH 04/17] [IMP] Event: clean bzr revid: hmo@tinyerp.com-20100716064714-ivuu3ux3sayo28fh --- addons/event/__openerp__.py | 9 +- addons/event/board_association_demo.xml | 11 - addons/event/event.py | 273 +++++++++--------- addons/event/event_data.xml | 6 - addons/event/event_sequence.xml | 21 -- addons/event/event_view.xml | 101 +++---- addons/event/res_partner_view.xml | 9 +- addons/event/security/event_security.xml | 9 +- addons/event/wizard/event_confirm.py | 6 +- .../wizard/event_confirm_registration.py | 10 +- .../event_confirm_registration_view.xml | 1 - addons/event/wizard/event_make_invoice.py | 24 +- .../event/wizard/event_make_invoice_view.xml | 1 - .../wizard/partner_event_registration.py | 56 ++-- .../partner_event_registration_view.xml | 13 +- 15 files changed, 255 insertions(+), 295 deletions(-) delete mode 100644 addons/event/event_data.xml delete mode 100644 addons/event/event_sequence.xml diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py index 452e6577e73..e55d282ed9d 100644 --- a/addons/event/__openerp__.py +++ b/addons/event/__openerp__.py @@ -32,8 +32,6 @@ * ... A dashboard for associations that includes: * Registration by Events (graph) - * Next Events (list) - * Unpaid Invoices (list) Note that: - You can define new types of events in Events / Configuration / Types of Events @@ -42,15 +40,14 @@ """, 'author': 'Tiny', 'depends': ['crm', 'base_contact', 'account'], - 'init_xml': ['event_data.xml'], + 'init_xml': [], 'update_xml': [ + 'security/event_security.xml', + 'security/ir.model.access.csv', 'wizard/event_confirm_registration_view.xml', 'wizard/event_confirm_view.xml', 'event_view.xml', 'report/report_event_registration_view.xml', - 'event_sequence.xml', - 'security/event_security.xml', - 'security/ir.model.access.csv', 'wizard/event_make_invoice_view.xml', 'wizard/partner_event_registration_view.xml', 'board_association_view.xml', diff --git a/addons/event/board_association_demo.xml b/addons/event/board_association_demo.xml index c30dad64790..1e66696aa8b 100644 --- a/addons/event/board_association_demo.xml +++ b/addons/event/board_association_demo.xml @@ -2,17 +2,6 @@ - - - - - - - - diff --git a/addons/event/event.py b/addons/event/event.py index a26960639db..7d54b1bf359 100644 --- a/addons/event/event.py +++ b/addons/event/event.py @@ -28,34 +28,33 @@ import time import tools import decimal_precision as dp -class event_type(osv.osv): - """ Event Type """ +class event_type(osv.osv): + """ Event Type """ _name = 'event.type' _description = __doc__ _columns = { - 'name': fields.char('Event type', size=64, required=True), + 'name': fields.char('Event type', size=64, required=True), } event_type() -class event_event(osv.osv): - """Event""" +class event_event(osv.osv): + """Event""" _name = 'event.event' _description = __doc__ _order = 'date_begin' - - def copy(self, cr, uid, id, default=None, context=None): - """ Copy record of Given id + + def copy(self, cr, uid, id, default=None, context=None): + """ Copy record of Given id @param id: Id of Event record. @param context: A standard dictionary for contextual values """ if not default: default = {} default.update({ - 'code': self.pool.get('ir.sequence').get(cr, uid, 'event.event'), - 'state': 'draft' - }) + 'state': 'draft', + 'registration_ids': False, + }) return super(event_event, self).copy(cr, uid, id, default=default, context=context) - def onchange_product(self, cr, uid, ids, product_id): """This function returns value of product's unit price based on product id. @param self: The object pointer @@ -81,16 +80,16 @@ class event_event(osv.osv): def do_confirm(self, cr, uid, ids, context=None): """ Confirm Event and send confirmation email to all register peoples - """ + """ register_pool = self.pool.get('event.registration') for event in self.browse(cr, uid, ids, context=context): if event.mail_auto_confirm: #send reminder that will confirm the event for all the people that were already confirmed reg_ids = register_pool.search(cr, uid, [ - ('event_id', '=', event.id), + ('event_id', '=', event.id), ('state', 'not in', ['draft', 'cancel'])]) register_pool.mail_user_confirm(cr, uid, reg_ids) - + return self.write(cr, uid, ids, {'state': 'confirm'}) def button_confirm(self, cr, uid, ids, context=None): @@ -113,26 +112,26 @@ class event_event(osv.osv): view_id = view_data.res_id context['event_ids'] = unconfirmed_ids return { - 'name': _('Confirm Event'), - 'context': context, - 'view_type': 'form', - 'view_mode': 'tree,form', - 'res_model': 'event.confirm', - 'views': [(view_id, 'form')], - 'type': 'ir.actions.act_window', - 'target': 'new', + 'name': _('Confirm Event'), + 'context': context, + 'view_type': 'form', + 'view_mode': 'tree,form', + 'res_model': 'event.confirm', + 'views': [(view_id, 'form')], + 'type': 'ir.actions.act_window', + 'target': 'new', 'context': context, 'nodestroy': True } - return True + return True - def _get_register(self, cr, uid, ids, fields, args, context=None): + def _get_register(self, cr, uid, ids, fields, args, context=None): """Get Confirm or uncofirm register value. @param ids: List of Event registration type's id @param fields: List of function fields(register_current and register_prospect). @param context: A standard dictionary for contextual values - @return: Dictionary of function fields value. + @return: Dictionary of function fields value. """ register_pool = self.pool.get('event.registration') res = {} @@ -143,18 +142,18 @@ class event_event(osv.osv): state = [] if 'register_current' in fields: state += ['open', 'done'] - if 'register_prospect' in fields: + if 'register_prospect' in fields: state.append('draft') - + reg_ids = register_pool.search(cr, uid, [ - ('event_id', '=', event.id), + ('event_id', '=', event.id), ('state', 'in', state)]) - + if 'register_current' in fields: res[event.id]['register_current'] = len(reg_ids) - if 'register_prospect' in fields: + if 'register_prospect' in fields: res[event.id]['register_prospect'] = len(reg_ids) - + return res def write(self, cr, uid, ids, vals, context=None): @@ -195,31 +194,31 @@ class event_event(osv.osv): 'section_id': fields.many2one('crm.case.section', 'Sale Team', readonly=False, states={'done': [('readonly', True)]}), 'child_ids': fields.one2many('event.event', 'parent_id', 'Child Events', readonly=False, states={'done': [('readonly', True)]}), 'reply_to': fields.char('Reply-To', size=64, readonly=False, states={'done': [('readonly', True)]}, help="The email address put in the 'Reply-To' of all emails sent by Open ERP"), - 'type': fields.many2one('event.type', 'Type', help="Type of Event like Seminar, Exhibition, Conference, Training.", readonly=False, states={'done': [('readonly', True)]}), - 'register_max': fields.integer('Maximum Registrations', help="Provide Maximun Number of Registrations", readonly=True, states={'draft': [('readonly', False)]}), - 'register_min': fields.integer('Minimum Registrations', help="Providee Minimum Number of Registrations", readonly=True, states={'draft': [('readonly', False)]}), - 'register_current': fields.function(_get_register, method=True, string='Confirmed Registrations', multi='register_current', - help="Total of Open and Done Registrations"), - 'register_prospect': fields.function(_get_register, method=True, string='Unconfirmed Registrations', multi='register_prospect', + 'type': fields.many2one('event.type', 'Type', help="Type of Event like Seminar, Exhibition, Conference, Training.", readonly=False, states={'done': [('readonly', True)]}), + 'register_max': fields.integer('Maximum Registrations', help="Provide Maximun Number of Registrations", readonly=True, states={'draft': [('readonly', False)]}), + 'register_min': fields.integer('Minimum Registrations', help="Providee Minimum Number of Registrations", readonly=True, states={'draft': [('readonly', False)]}), + 'register_current': fields.function(_get_register, method=True, string='Confirmed Registrations', multi='register_current', + help="Total of Open and Done Registrations"), + 'register_prospect': fields.function(_get_register, method=True, string='Unconfirmed Registrations', multi='register_prospect', help="Total of Prospect Registrations"), 'registration_ids': fields.one2many('event.registration', 'event_id', 'Registrations', readonly=False, states={'done': [('readonly', True)]}), - 'date_begin': fields.datetime('Beginning date', required=True, help="Beginning Date of Event", readonly=True, states={'draft': [('readonly', False)]}), - 'date_end': fields.datetime('Closing date', required=True, help="Closing Date of Event", readonly=True, states={'draft': [('readonly', False)]}), + 'date_begin': fields.datetime('Beginning date', required=True, help="Beginning Date of Event", readonly=True, states={'draft': [('readonly', False)]}), + 'date_end': fields.datetime('Closing date', required=True, help="Closing Date of Event", readonly=True, states={'draft': [('readonly', False)]}), 'state': fields.selection([ - ('draft', 'Draft'), - ('confirm', 'Confirmed'), - ('done', 'Done'), - ('cancel', 'Cancelled')], - 'State', readonly=True, required=True, - help='If event is created, the state is \'Draft\'.If event is confirmed for the particular dates the state is set to \'Confirmed\'. If the event is over, the state is set to \'Done\'.If event is cancelled the state is set to \'Cancelled\'.'), - 'mail_auto_registr': fields.boolean('Mail Auto Register', readonly=False, states={'done': [('readonly', True)]}, help='Check this box if you want to use the automatic mailing for new registration'), - 'mail_auto_confirm': fields.boolean('Mail Auto Confirm', readonly=False, states={'done': [('readonly', True)]}, help='Check this box if you want ot use the automatic confirmation emailing or the reminder'), - 'mail_registr': fields.text('Registration Email', readonly=False, states={'done': [('readonly', True)]}, help='This email will be sent when someone subscribes to the event.'), - 'mail_confirm': fields.text('Confirmation Email', readonly=False, states={'done': [('readonly', True)]}, help="This email will be sent when the event gets confimed or when someone subscribes to a confirmed event. This is also the email sent to remind someone about the event."), + ('draft', 'Draft'), + ('confirm', 'Confirmed'), + ('done', 'Done'), + ('cancel', 'Cancelled')], + 'State', readonly=True, required=True, + help='If event is created, the state is \'Draft\'.If event is confirmed for the particular dates the state is set to \'Confirmed\'. If the event is over, the state is set to \'Done\'.If event is cancelled the state is set to \'Cancelled\'.'), + 'mail_auto_registr': fields.boolean('Mail Auto Register', readonly=False, states={'done': [('readonly', True)]}, help='Check this box if you want to use the automatic mailing for new registration'), + 'mail_auto_confirm': fields.boolean('Mail Auto Confirm', readonly=False, states={'done': [('readonly', True)]}, help='Check this box if you want ot use the automatic confirmation emailing or the reminder'), + 'mail_registr': fields.text('Registration Email', readonly=False, states={'done': [('readonly', True)]}, help='This email will be sent when someone subscribes to the event.'), + 'mail_confirm': fields.text('Confirmation Email', readonly=False, states={'done': [('readonly', True)]}, help="This email will be sent when the event gets confimed or when someone subscribes to a confirmed event. This is also the email sent to remind someone about the event."), 'product_id': fields.many2one('product.product', 'Product', required=True, readonly=True, states={'draft': [('readonly', False)]}, help="Product which is provided cost of event. Invoice of event will be created with this Product."), 'note': fields.text('Notes', help="Description or Summary of Event", readonly=False, states={'done': [('readonly', True)]}), 'pricelist_id': fields.many2one('product.pricelist', 'Pricelist', readonly=True, states={'draft': [('readonly', False)]}, help="Pricelist version for current event."), - "unit_price": fields.float('Registration Cost', digits_compute= dp.get_precision('Event Price'), readonly=True, states={'draft': [('readonly', False)]}), + 'unit_price': fields.related('product_id', 'list_price', type='float', string='Registration Cost', readonly=True, states={'draft':[('readonly',False)]}), 'main_speaker_id': fields.many2one('res.partner','Main Speaker', readonly=False, states={'done': [('readonly', True)]}), 'speaker_ids':fields.many2many('res.partner', 'event_speaker_rel', 'speaker_id', 'partner_id', 'Other Speakers', readonly=False, states={'done': [('readonly', True)]}), 'address_id': fields.many2one('res.partner.address','Location Address', readonly=False, states={'done': [('readonly', True)]}), @@ -229,13 +228,13 @@ class event_event(osv.osv): 'language': fields.char('Language',size=64, readonly=False, states={'done': [('readonly', True)]}), 'note': fields.text('Description', readonly=False, states={'done': [('readonly', True)]}), 'company_id': fields.many2one('res.company', 'Company', required=True, change_default=True, readonly=False, states={'done': [('readonly', True)]}), - + } _defaults = { - 'state': 'draft', + 'state': 'draft', 'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'event.event', context=c), - 'user_id': lambda obj, cr, uid, context: uid, + 'user_id': lambda obj, cr, uid, context: uid, } def _check_recursion(self, cr, uid, ids): @@ -260,7 +259,7 @@ class event_event(osv.osv): def do_team_change(self, cr, uid, ids, team_id, context=None): """ On Change Callback: when team change, this is call. - on this function, take value of reply_to from selected team. + on this function, take value of reply_to from selected team. """ if not team_id: return {} @@ -275,7 +274,7 @@ class event_event(osv.osv): event_event() -class event_registration(osv.osv): +class event_registration(osv.osv): """Event Registration""" _name= 'event.registration' _description = __doc__ @@ -293,20 +292,20 @@ class event_registration(osv.osv): return res _columns = { - 'name': fields.char('Summary', size=124, readonly=True, states={'draft': [('readonly', False)]}), - 'email_cc': fields.text('CC', size=252 , readonly=False, states={'done': [('readonly', True)]}, help="These people will receive a copy of the future communication between partner and users by email"), - 'nb_register': fields.integer('Quantity', required=True, readonly=True, states={'draft': [('readonly', False)]}, help="Number of Registrations or Tickets"), - 'event_id': fields.many2one('event.event', 'Event Related', required=True, readonly=True, states={'draft': [('readonly', False)]}), - "partner_invoice_id": fields.many2one('res.partner', 'Partner Invoiced', readonly=True, states={'draft': [('readonly', False)]}), + 'name': fields.char('Summary', size=124, readonly=True, states={'draft': [('readonly', False)]}), + 'email_cc': fields.text('CC', size=252 , readonly=False, states={'done': [('readonly', True)]}, help="These people will receive a copy of the future communication between partner and users by email"), + 'nb_register': fields.integer('Quantity', required=True, readonly=True, states={'draft': [('readonly', False)]}, help="Number of Registrations or Tickets"), + 'event_id': fields.many2one('event.event', 'Event Related', required=True, readonly=True, states={'draft': [('readonly', False)]}), + "partner_invoice_id": fields.many2one('res.partner', 'Partner Invoiced', readonly=True, states={'draft': [('readonly', False)]}), "contact_id": fields.many2one('res.partner.contact', 'Partner Contact', readonly=False, states={'done': [('readonly', True)]}), #TODO: filter only the contacts that have a function into the selected partner_id "unit_price": fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Event Price'), readonly=True, states={'draft': [('readonly', False)]}), - 'price_subtotal': fields.function(_amount_line, method=True, string='Subtotal', digits_compute= dp.get_precision('Event Price')), + 'price_subtotal': fields.function(_amount_line, method=True, string='Subtotal', digits_compute= dp.get_precision('Event Price')), "badge_ids": fields.one2many('event.registration.badge', 'registration_id', 'Badges', readonly=False, states={'done': [('readonly', True)]}), - "event_product": fields.char("Invoice Name", size=128, required=True, readonly=True, states={'draft': [('readonly', False)]}), - "tobe_invoiced": fields.boolean("To be Invoiced", readonly=True, states={'draft': [('readonly', False)]}), - "invoice_id": fields.many2one("account.invoice", "Invoice", readonly=True), - 'date_closed': fields.datetime('Closed', readonly=True), - 'ref': fields.reference('Reference', selection=crm._links_get, size=128), + "event_product": fields.char("Invoice Name", size=128, readonly=True, states={'draft': [('readonly', False)]}), + "tobe_invoiced": fields.boolean("To be Invoiced", readonly=True, states={'draft': [('readonly', False)]}), + "invoice_id": fields.many2one("account.invoice", "Invoice", readonly=True), + 'date_closed': fields.datetime('Closed', readonly=True), + 'ref': fields.reference('Reference', selection=crm._links_get, size=128), 'ref2': fields.reference('Reference 2', selection=crm._links_get, size=128), 'message_ids': fields.one2many('mailgate.message', 'res_id', 'Messages', domain=[('history', '=', True),('model','=',_name)]), 'log_ids': fields.one2many('mailgate.message', 'res_id', 'Logs', domain=[('history', '=', False),('model','=',_name)]), @@ -314,37 +313,37 @@ class event_registration(osv.osv): 'company_id': fields.related('event_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True, states={'draft':[('readonly',False)]}), } _defaults = { - 'nb_register': 1, - 'tobe_invoiced': True, + 'nb_register': 1, + 'tobe_invoiced': True, 'date': time.strftime('%Y-%m-%d %H:%M:%S') } def _make_invoice(self, cr, uid, reg, lines, context=None): """ Create Invoice from Invoice lines @param reg : Model of Event Registration - @param lines: Ids of Invoice lines + @param lines: Ids of Invoice lines """ if context is None: context = {} inv_pool = self.pool.get('account.invoice') inv_lines_pool = self.pool.get('account.invoice.line') - - val_invoice = inv_pool.onchange_partner_id(cr, uid, [], 'out_invoice', reg.partner_invoice_id.id, False, False) + + val_invoice = inv_pool.onchange_partner_id(cr, uid, [], 'out_invoice', reg.partner_invoice_id.id, False, False) val_invoice['value'].update({'partner_id': reg.partner_invoice_id.id}) partner_address_id = val_invoice['value']['address_invoice_id'] value = inv_lines_pool.product_id_change(cr, uid, [], reg.event_id.product_id.id, uom =False, partner_id=reg.partner_invoice_id.id, fposition_id=reg.partner_invoice_id.property_account_position.id) - + l = inv_lines_pool.read(cr, uid, lines) - + val_invoice['value'].update({ - 'origin': reg.event_product, - 'reference': False, - 'invoice_line': [(6, 0, lines)], - 'comment': "", + 'origin': reg.event_product, + 'reference': False, + 'invoice_line': [(6, 0, lines)], + 'comment': "", 'date_invoice': context.get('date_inv', False) }) - inv_id = inv_pool.create(cr, uid, val_invoice['value']) + inv_id = inv_pool.create(cr, uid, val_invoice['value']) inv_pool.button_compute(cr, uid, [inv_id]) self._history(cr, uid, [reg], _('Invoiced')) return inv_id @@ -367,16 +366,16 @@ class event_registration(osv.osv): context['date_inv'] = date_inv for reg in self.browse(cr, uid, ids, context=context): - + val_invoice = inv_pool.onchange_partner_id(cr, uid, [], 'out_invoice', reg.partner_invoice_id.id, False, False) - + val_invoice['value'].update({'partner_id': reg.partner_invoice_id.id}) partner_address_id = val_invoice['value']['address_invoice_id'] - + if not partner_address_id: raise osv.except_osv(_('Error !'), _("Registered partner doesn't have an address to make the invoice.")) - + value = inv_lines_pool.product_id_change(cr, uid, [], reg.event_id.product_id.id, uom =False, partner_id=reg.partner_invoice_id.id, fposition_id=reg.partner_invoice_id.property_account_position.id) product = product_pool.browse(cr, uid, reg.event_id.product_id.id, context=context) for tax in product.taxes_id: @@ -385,38 +384,38 @@ class event_registration(osv.osv): vals = value['value'] c_name = reg.contact_id and ('-' + contact_pool.name_get(cr, uid, [reg.contact_id.id])[0][1]) or '' vals.update({ - 'name': reg.event_product + '-' + c_name, - 'price_unit': reg.unit_price, - 'quantity': reg.nb_register, - 'product_id':reg.event_id.product_id.id, - 'invoice_line_tax_id': [(6, 0, tax_ids)], + 'name': reg.event_product + '-' + c_name, + 'price_unit': reg.unit_price, + 'quantity': reg.nb_register, + 'product_id':reg.event_id.product_id.id, + 'invoice_line_tax_id': [(6, 0, tax_ids)], }) inv_line_ids = self._create_invoice_lines(cr, uid, [reg.id], vals) invoices.setdefault(reg.partner_id.id, []).append((reg, inv_line_ids)) - + for val in invoices.values(): res = False if grouped: res = self._make_invoice(cr, uid, val[0][0], [v for k , v in val], context=context) - + for k , v in val: self.do_close(cr, uid, [k.id], context={'invoice_id': res}) - + else: for k , v in val: res = self._make_invoice(cr, uid, k, [v], context=context) self.do_close(cr, uid, [k.id], context={'invoice_id': res}) if res: new_invoice_ids.append(res) - + return new_invoice_ids def do_open(self, cr, uid, ids, context=None): """ Open Registration """ res = self.write(cr, uid, ids, {'state': 'open'}, context=context) - self.mail_user(cr, uid, ids) + self.mail_user(cr, uid, ids) self._history(cr, uid, ids, _('Open')) - return res + return res def do_close(self, cr, uid, ids, context=None): """ Close Registration @@ -427,7 +426,7 @@ class event_registration(osv.osv): values = {'state': 'done', 'date_closed': time.strftime('%Y-%m-%d %H:%M:%S')} msg = _('Done') if invoice_id: - values['invoice_id'] = invoice_id + values['invoice_id'] = invoice_id res = self.write(cr, uid, ids, values) self._history(cr, uid, ids, msg) return res @@ -452,22 +451,22 @@ class event_registration(osv.osv): view_id = view_data.res_id context['registration_ids'] = unconfirmed_ids return { - 'name': _('Confirm Registration'), - 'context': context, - 'view_type': 'form', - 'view_mode': 'tree,form', - 'res_model': 'event.confirm.registration', - 'views': [(view_id, 'form')], - 'type': 'ir.actions.act_window', - 'target': 'new', + 'name': _('Confirm Registration'), + 'context': context, + 'view_type': 'form', + 'view_mode': 'tree,form', + 'res_model': 'event.confirm.registration', + 'views': [(view_id, 'form')], + 'type': 'ir.actions.act_window', + 'target': 'new', 'context': context, 'nodestroy': True } - return True + return True def button_reg_close(self, cr, uid, ids, context=None): - """This Function Close Event Registration. - """ + """This Function Close Event Registration. + """ if not context: context = {} data_pool = self.pool.get('ir.model.data') @@ -483,22 +482,22 @@ class event_registration(osv.osv): view_id = view_data.res_id context['active_ids'] = unclosed_ids return { - 'name': _('Close Registration'), - 'context': context, - 'view_type': 'form', - 'view_mode': 'tree,form', - 'res_model': 'event.make.invoice', - 'views': [(view_id, 'form')], - 'type': 'ir.actions.act_window', - 'target': 'new', + 'name': _('Close Registration'), + 'context': context, + 'view_type': 'form', + 'view_mode': 'tree,form', + 'res_model': 'event.make.invoice', + 'views': [(view_id, 'form')], + 'type': 'ir.actions.act_window', + 'target': 'new', 'context': context, 'nodestroy': True } return True - + def button_reg_cancel(self, cr, uid, ids, *args): """This Function Cancel Event Registration. - """ + """ registrations = self.browse(cr, uid, ids) self._history(cr, uid, registrations, _('Cancel')) self.write(cr, uid, ids, {'state': 'cancel'}) @@ -518,7 +517,7 @@ class event_registration(osv.osv): def write(self, cr, uid, ids, values, context=None): """ Overrides orm write method. - """ + """ event_obj = self.pool.get('event.event') if 'event_id' in values: event = event_obj.browse(cr, uid, values['event_id'], context=context) @@ -528,11 +527,11 @@ class event_registration(osv.osv): def mail_user(self, cr, uid, ids, confirm=False, context=None): """ - Send email to user + Send email to user """ if not context: context = {} - + for regestration in self.browse(cr, uid, ids, context=context): src = regestration.event_id.reply_to or False email_to = [] @@ -560,30 +559,30 @@ class event_registration(osv.osv): self.history(cr, uid, [regestration], subject, history=True, \ email=email_to, details=body, \ subject=subject, email_from=src, \ - email_cc=', '.join(email_cc)) - + email_cc=', '.join(email_cc)) + return True def mail_user_confirm(self, cr, uid, ids, context=None): """ - Send email to user + Send email to user """ return self.mail_user(cr, uid, ids, confirm=True, context=context) def _create_invoice_lines(self, cr, uid, ids, vals): """ Create account Invoice line for Registration Id. """ - return self.pool.get('account.invoice.line').create(cr, uid, vals) + return self.pool.get('account.invoice.line').create(cr, uid, vals) def onchange_contact_id(self, cr, uid, ids, contact, partner): - + """This function returns value of Badge Name , Badge Title based on Partner contact. @param self: The object pointer @param cr: the current row, from the database cursor, @param uid: the current user’s ID for security checks, @param ids: List of Registration IDs @param contact: Patner Contact IDS - @param partner: Partner IDS + @param partner: Partner IDS """ data ={} if not contact: @@ -591,7 +590,7 @@ class event_registration(osv.osv): contact_obj = self.pool.get('res.partner.contact') addr_obj = self.pool.get('res.partner.address') job_obj = self.pool.get('res.partner.job') - + contact_id = contact_obj.browse(cr, uid, contact) if partner: partner_addresses = addr_obj.search(cr, uid, [('partner_id', '=', partner)]) @@ -607,16 +606,16 @@ class event_registration(osv.osv): @param uid: the current user’s ID for security checks, @param ids: List of Registration IDs @param event_id: Event ID - @param partner_invoice_id: Partner Invoice ID + @param partner_invoice_id: Partner Invoice ID """ context={} if not event_id: return {'value': {'unit_price': False, 'event_product': False}} - + event_obj = self.pool.get('event.event') prod_obj = self.pool.get('product.product') res_obj = self.pool.get('res.partner') - + data_event = event_obj.browse(cr, uid, event_id) res = {'value': {'unit_price': False, 'event_product': False, 'user_id': False}} if data_event.user_id.id: @@ -627,7 +626,7 @@ class event_registration(osv.osv): partner = res_obj.browse(cr, uid, partner_invoice_id, context=context) pricelist_id = pricelist_id or partner.property_product_pricelist.id unit_price = prod_obj._product_price(cr, uid, [data_event.product_id.id], False, False, {'pricelist': pricelist_id})[data_event.product_id.id] - res['value'].update({'unit_price': unit_price, 'event_product': data_event.product_id.name}) + res['value'].update({'unit_price': unit_price, 'event_product': data_event.product_id.name}) return res def onchange_partner_id(self, cr, uid, ids, part, event_id, email=False): @@ -641,7 +640,7 @@ class event_registration(osv.osv): """ job_obj = self.pool.get('res.partner.job') res_obj = self.pool.get('res.partner') - + data = {} data['contact_id'], data['partner_invoice_id'], data['email_from'] = (False, False, False) if not part: @@ -659,7 +658,7 @@ class event_registration(osv.osv): data['contact_id'] = job_obj.browse(cr, uid, job_ids[0]).contact_id.id d = self.onchange_contact_id(cr, uid, ids, data['contact_id'], part) data.update(d['value']) - partner_data = res_obj.browse(cr, uid, part) + partner_data = res_obj.browse(cr, uid, part) return {'value': data} def onchange_partner_invoice_id(self, cr, uid, ids, event_id, partner_invoice_id): @@ -676,7 +675,7 @@ class event_registration(osv.osv): event_obj = self.pool.get('event.event') prod_obj = self.pool.get('product.product') res_obj = self.pool.get('res.partner') - + data['unit_price']=False if not event_id: return {'value': data} @@ -687,7 +686,7 @@ class event_registration(osv.osv): if partner_invoice_id: partner = res_obj.browse(cr, uid, partner_invoice_id, context=context) pricelist_id = pricelist_id or partner.property_product_pricelist.id - data['unit_price'] = prod_obj._product_price(cr, uid, [data_event.product_id.id], False, False, {'pricelist': pricelist_id})[data_event.product_id.id] + data['unit_price'] = prod_obj._product_price(cr, uid, [data_event.product_id.id], False, False, {'pricelist': pricelist_id})[data_event.product_id.id] return {'value': data} event_registration() @@ -697,9 +696,9 @@ class event_registration_badge(osv.osv): _description = __doc__ _columns = { 'registration_id': fields.many2one('event.registration', 'Registration', required=True), - "title": fields.char('Title', size=128), - "name": fields.char('Name', size=128, required=True), - "address_id": fields.many2one('res.partner.address', 'Address'), + "title": fields.char('Title', size=128), + "name": fields.char('Name', size=128, required=True), + "address_id": fields.many2one('res.partner.address', 'Address'), } event_registration_badge() diff --git a/addons/event/event_data.xml b/addons/event/event_data.xml deleted file mode 100644 index ebfe70e4c50..00000000000 --- a/addons/event/event_data.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/addons/event/event_sequence.xml b/addons/event/event_sequence.xml deleted file mode 100644 index eb8d45137cf..00000000000 --- a/addons/event/event_sequence.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - # - # Sequences for crm.case.section - # - - - Section Code - event.event - - - Section Code - event.event - C/ - 3 - - - - diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml index f7586c31f1d..b199544345f 100644 --- a/addons/event/event_view.xml +++ b/addons/event/event_view.xml @@ -1,9 +1,9 @@ - - - + + + @@ -33,7 +33,7 @@ event.type form - + @@ -45,17 +45,17 @@
- + - + - + - + @@ -64,13 +64,13 @@ - + - - - - + + + + @@ -79,14 +79,14 @@