[MERGE] merge with trunk addons

bzr revid: mra@mra-laptop-20100702144735-1yb06k05686ob3pw
bzr revid: mra@mra-laptop-20100703070303-m9v6wh3jhd440u9e

13 files changed, 652 insertions, 234 deletions

diff --git a/addons/account/i18n/zh_CN.po b/addons/account/i18n/zh_CN.po
index 061747e8fcb..87c11dff871 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-02 03:32+0000\n"
+"PO-Revision-Date: 2010-07-03 03:39+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-07-02 03:32+0000\n"
+"X-Launchpad-Export-Date: 2010-07-03 03:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -277,8 +277,8 @@ msgid ""
 "date empty, it means direct payment. The payment term may compute several "
 "due dates, for example 50% now, 50% in one month."
 msgstr ""
-"如果你使用付款条件,到期日期将在自动生成会计分录. 如果付款条件和到期日期为空,则意味着直接付款. "
-"付款条件可以计算出几个到期日，例如现在先付50%,然后在一个月内支付余下的50%."
+"如果你使用付款条款, 到期将自动生成会计分录.  如果付款条款和到期日期为空, 则意味着直接付款. 付款条款可以计算出几个到期日, 例如现在先付50%, "
+"然后在一个月内支付余下的50%."
 
 #. module: account
 #: selection:account.tax,type:0
@@ -322,7 +322,7 @@ msgstr "参考"
 #. module: account
 #: wizard_view:account.subscription.generate,init:0
 msgid "Subscription Compute"
-msgstr "周期计算"
+msgstr "周期性分录计算"
 
 #. module: account
 #: rml:account.central.journal:0
@@ -352,13 +352,13 @@ msgstr "借方交易"
 #: field:account.move.line,analytic_account_id:0
 #: field:report.hr.timesheet.invoice.journal,account_id:0
 msgid "Analytic Account"
-msgstr "辅助核算科目"
+msgstr "辅助核算项"
 
 #. module: account
 #: field:account.tax,child_depend:0
 #: field:account.tax.template,child_depend:0
 msgid "Tax on Children"
-msgstr "子税"
+msgstr "基于子税"
 
 #. module: account
 #: rml:account.central.journal:0
@@ -375,7 +375,7 @@ msgstr "发票说明"
 #. module: account
 #: constraint:account.analytic.account:0
 msgid "Error! You can not create recursive analytic accounts."
-msgstr "错误! 你不能创建递归的辅助核算科目"
+msgstr "错误! 你不能创建递归的辅助核算项"
 
 #. module: account
 #: field:account.bank.statement.reconcile,total_entry:0
@@ -487,7 +487,7 @@ msgstr "税用在"
 msgid ""
 "Set if the amount of tax must be included in the base amount before "
 "computing the next taxes."
-msgstr "在下一个税额计算前，如果本税额必须包含在税基里，请设置"
+msgstr "如果这税额必须包含在计算下一个税的基础金额里, 请设置"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_periodical_processing
@@ -540,7 +540,7 @@ msgstr "递延方法"
 #. module: account
 #: field:account.tax.template,include_base_amount:0
 msgid "Include in Base Amount"
-msgstr "基础金额已包含"
+msgstr "包含在基础金额里"
 
 #. module: account
 #: field:account.tax,ref_base_code_id:0
@@ -602,7 +602,7 @@ msgstr "分录控制"
 msgid ""
 "The sequence field is used to order the resources from lower sequences to "
 "higher ones"
-msgstr "这序列字段使用从高到低排序"
+msgstr "这序列字段使用从低到高排序"
 
 #. module: account
 #: wizard_view:account.analytic.account.chart,init:0
@@ -624,7 +624,7 @@ msgstr "联系"
 #: selection:account.model.line,date:0
 #: selection:account.model.line,date_maturity:0
 msgid "Partner Payment Term"
-msgstr "业务伙伴付款条件"
+msgstr "业务伙伴付款条款"
 
 #. module: account
 #: view:account.move.reconcile:0
@@ -655,7 +655,7 @@ msgstr "如果这会计年度属于几个公司留空"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_analytic_accounting
 msgid "Analytic Accounting"
-msgstr "管理会计"
+msgstr "辅助核算会计"
 
 #. module: account
 #: rml:account.overdue:0
@@ -758,7 +758,7 @@ msgstr "部分支付"
 #. module: account
 #: wizard_view:account_use_models,create:0
 msgid "Move Lines Created."
-msgstr "创建凭证明细"
+msgstr "创建的凭证明细"
 
 #. module: account
 #: field:account.fiscalyear,state:0
@@ -840,7 +840,7 @@ msgstr "科目模板"
 #: model:ir.model,name:account.model_account_analytic_account
 #: model:ir.ui.menu,name:account.account_analytic_def_account
 msgid "Analytic Accounts"
-msgstr "辅助核算科目"
+msgstr "辅助核算项"
 
 #. module: account
 #: wizard_view:account.print.journal.report,init:0
@@ -1075,7 +1075,7 @@ msgstr "原始凭证编号"
 msgid ""
 "The sequence field is used to order the payment term lines from the lowest "
 "sequences to the higher ones"
-msgstr "这序列字段用于付款条款行的排序从低到高."
+msgstr "这序列字段用于付款条款的从低到高排序."
 
 #. module: account
 #: field:account.bank.statement.reconcile,total_new:0
@@ -1110,7 +1110,7 @@ msgstr "收入类科目"
 #: model:ir.actions.act_window,name:account.analytic_account_form
 #: model:ir.ui.menu,name:account.account_analytic_form
 msgid "New Analytic Account"
-msgstr "新辅助核算科目"
+msgstr "新辅助核算项"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
@@ -1220,7 +1220,7 @@ msgstr "财务结构模板科目一览"
 #. module: account
 #: field:account.analytic.account,parent_id:0
 msgid "Parent Analytic Account"
-msgstr "上级辅助核算科目"
+msgstr "上级辅助核算项"
 
 #. module: account
 #: wizard_button:account.move.line.reconcile,init_partial,addendum:0
@@ -1481,7 +1481,7 @@ msgstr "向导.公司.设置"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_account_line_extended_form
 msgid "account.analytic.line.extended"
-msgstr "科目.辅助核算.明细.延伸"
+msgstr "项.辅助核算.明细.延伸"
 
 #. module: account
 #: field:account.journal,refund_journal:0
@@ -1598,7 +1598,7 @@ msgstr "应收款与应付款科目"
 #: view:account.subscription:0
 #: field:account.subscription,lines_id:0
 msgid "Subscription Lines"
-msgstr "周期明细"
+msgstr "周期性分录明细"
 
 #. module: account
 #: selection:account.analytic.journal,type:0
@@ -1712,7 +1712,7 @@ msgstr "你确定创建分录?"
 #. module: account
 #: field:account.tax,include_base_amount:0
 msgid "Include in base amount"
-msgstr "含基本金额"
+msgstr "包含在基本金额里"
 
 #. module: account
 #: rml:account.analytic.account.analytic.check:0
@@ -1903,7 +1903,7 @@ msgstr "客户发票草稿"
 #. module: account
 #: model:ir.model,name:account.model_account_subscription_line
 msgid "Account Subscription Line"
-msgstr "科目周期明细"
+msgstr "周期性分录明细的科目"
 
 #. module: account
 #: selection:account.account.balance.report,checktype,state:0
@@ -2488,7 +2488,7 @@ msgstr "横向模式"
 #: model:process.transition,note:account.process_transition_analyticinvoice0
 #: model:process.transition,note:account.process_transition_supplieranalyticcost0
 msgid "From analytic accounts, Create invoice."
-msgstr "从辅助核目科目创建发票"
+msgstr "从辅助核算项创建发票"
 
 #. module: account
 #: wizard_button:account.account.balance.report,account_selection,end:0
@@ -2728,7 +2728,7 @@ msgstr "未完税"
 #: model:ir.actions.report.xml,name:account.account_analytic_account_inverted_balance
 #: model:ir.actions.wizard,name:account.account_analytic_account_inverted_balance_report
 msgid "Inverted Analytic Balance"
-msgstr "反向核算余额"
+msgstr "反向辅助核算余额"
 
 #. module: account
 #: field:account.tax,applicable_type:0
@@ -2852,7 +2852,7 @@ msgstr "最好的祝愿"
 #. module: account
 #: model:ir.model,name:account.model_report_hr_timesheet_invoice_journal
 msgid "Analytic account costs and revenues"
-msgstr "成本和收入辅助核算项"
+msgstr "辅助核算项成本和收入"
 
 #. module: account
 #: wizard_view:account.invoice.refund,init:0
@@ -3003,7 +3003,7 @@ msgid ""
 "The maturity date of the generated entries for this model. You can chosse "
 "between the date of the creation action or the the date of the creation of "
 "the entries plus the partner payment terms."
-msgstr "这月产生分录的应付款日期. 你能在创建日期到创建这分录加上业务伙伴付款条件里限期天数之间的选择一天."
+msgstr "这模型在到期日产生分录.  你能从创建日期到到付款期限间选择."
 
 #. module: account
 #: selection:account.analytic.journal,type:0
@@ -3127,7 +3127,7 @@ msgstr "确认"
 #: view:account.model:0
 #: field:account.model,legend:0
 msgid "Legend"
-msgstr "图表"
+msgstr "说明"
 
 #. module: account
 #: model:process.node,note:account.process_node_draftinvoices0
@@ -3201,7 +3201,7 @@ msgstr "税"
 #. module: account
 #: wizard_view:account.fiscalyear.close,init:0
 msgid "Close Fiscal Year with new entries"
-msgstr "关闭会计年度和新分录"
+msgstr "用新分录关闭会计年度"
 
 #. module: account
 #: selection:account.account,currency_mode:0
@@ -3308,7 +3308,7 @@ msgstr "凭证"
 #: field:account.fiscal.position.tax,tax_src_id:0
 #: field:account.fiscal.position.tax.template,tax_src_id:0
 msgid "Tax Source"
-msgstr "税来源"
+msgstr "源税"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_analytic_account_balance
@@ -3596,7 +3596,7 @@ msgstr "数字 #"
 msgid ""
 "This payment term will be used instead of the default one for the current "
 "partner"
-msgstr "当前业务伙伴将替代为这默认的付款条件"
+msgstr "当前业务伙伴将替代为这默认的付款条款"
 
 #. module: account
 #: wizard_field:account.invoice.pay,addendum,comment:0
@@ -3676,7 +3676,7 @@ msgstr "如果你想打印总账时打印所有分录, 勾选此项. 否则打�
 #. module: account
 #: model:ir.model,name:account.model_account_payment_term_line
 msgid "Payment Term Line"
-msgstr "付款条件明细"
+msgstr "付款条款明细"
 
 #. module: account
 #: selection:account.config.wizard,period:0
@@ -3858,7 +3858,7 @@ msgstr "手动报表"
 #: model:ir.actions.act_window,name:account.action_account_journal_form
 #: model:ir.ui.menu,name:account.menu_action_account_journal_form
 msgid "Financial Journals"
-msgstr "帐簿"
+msgstr "财务分录集合"
 
 #. module: account
 #: selection:account.account.balance.report,checktype,state:0
@@ -3894,7 +3894,7 @@ msgid ""
 "Gives the type of the analytic journal. When a document (eg: an invoice) "
 "needs to create analytic entries, Open ERP will look for a matching journal "
 "of the same type."
-msgstr "给出这辅助核算分录集的类型. 当单据(如发票)需要创建辅助核算分录. 系统将寻找匹配同一类型的分录集合."
+msgstr "给出这辅助核算分录集的类型. 当单据(如发票)需要创建辅助核算分录. 系统将寻找同一类型匹配的分录集合."
 
 #. module: account
 #: field:account.journal,groups_id:0
@@ -3988,7 +3988,7 @@ msgstr "贷方"
 msgid ""
 "Indicate if the tax computation is based on the value computed for the "
 "computation of child taxes or based on the total amount."
-msgstr "如果税计算是基于计算下级税或基于总金额, 显示"
+msgstr "如果税计算是基于计算子税或基于总金额, 显示"
 
 #. module: account
 #: field:account.tax,account_paid_id:0
@@ -4563,7 +4563,7 @@ msgstr "凭证列表"
 #. module: account
 #: wizard_view:account.analytic.account.chart,init:0
 msgid "Analytic Account Charts"
-msgstr "辅助核算项表"
+msgstr "辅助核算项目表"
 
 #. module: account
 #: wizard_field:account.aged.trial.balance,init,result_selection:0
@@ -4622,7 +4622,7 @@ msgstr "运行中"
 msgid ""
 "Indicate if the amount of tax must be included in the base amount for the "
 "computation of the next taxes"
-msgstr "表明如果税款必须被包含在计算下一个税的基础金额"
+msgstr "表明如果税额必须包含在计算下一个税的基础金额里"
 
 #. module: account
 #: model:process.node,name:account.process_node_draftstatement0
@@ -5323,7 +5323,7 @@ msgstr "可选信息"
 #: model:ir.actions.act_window,name:account.action_payment_term_form
 #: model:ir.ui.menu,name:account.menu_action_payment_term_form
 msgid "Payment Terms"
-msgstr "付款条件"
+msgstr "付款条款"
 
 #. module: account
 #: selection:account.aged.trial.balance,init,result_selection:0
@@ -5375,7 +5375,7 @@ msgstr "税适用"
 #: model:ir.actions.act_window,name:account.action_subscription_form
 #: model:ir.ui.menu,name:account.menu_action_subscription_form
 msgid "Subscription Entries"
-msgstr "周期性凭证"
+msgstr "周期性分录"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree6
@@ -5397,19 +5397,19 @@ msgstr "会计期间数"
 #: wizard_field:account.analytic.account.quantity_cost_ledger.report,init,date2:0
 #: wizard_field:account.automatic.reconcile,init,date2:0
 msgid "End of period"
-msgstr "期末日期"
+msgstr "结束会计期间"
 
 #. module: account
 #: view:account.move:0
 #: model:ir.model,name:account.model_account_move
 msgid "Account Entry"
-msgstr "凭证"
+msgstr "分录"
 
 #. module: account
 #: rml:account.general.journal:0
 #: model:ir.actions.report.xml,name:account.account_general_journal
 msgid "General Journal"
-msgstr "普通分类帐"
+msgstr "一般分录集合"
 
 #. module: account
 #: field:account.account,balance:0
@@ -5445,7 +5445,7 @@ msgstr "发票税"
 #: model:ir.actions.act_window,name:account.action_account_analytic_journal_form
 #: model:ir.ui.menu,name:account.account_def_analytic_journal
 msgid "Analytic Journal Definition"
-msgstr "定义辅助核算分类帐"
+msgstr "定义辅助核算分录集合"
 
 #. module: account
 #: model:ir.model,name:account.model_account_tax_template
@@ -5455,7 +5455,7 @@ msgstr "科目.税.模板"
 #. module: account
 #: field:wizard.multi.charts.accounts,bank_accounts_id:0
 msgid "Bank Accounts"
-msgstr "银行账号"
+msgstr "银行帐号"
 
 #. module: account
 #: constraint:account.period:0
@@ -5467,7 +5467,7 @@ msgstr "无效会计期间！一些会计期间重复或者会计期间不在这
 #. module: account
 #: help:account.journal,invoice_sequence_id:0
 msgid "The sequence used for invoice numbers in this journal."
-msgstr "这序列用于这分类帐发票号"
+msgstr "这序列用于这分录集合的发票号"
 
 #. module: account
 #: view:account.account:0
@@ -5484,12 +5484,12 @@ msgid ""
 "This field allow you to choose the accounting journals you want for "
 "filtering the invoices. If you left this field empty, it will search on all "
 "sale, purchase and cash journals."
-msgstr "这字段允许你选择会计分类帐要过滤的发票.如果你设为空将搜索所有销售采购和现金分类帐"
+msgstr "这字段允许你选择要过滤的发票的会计分录集合. 如果为空将搜索所有销售, 采购和现金分录集合."
 
 #. module: account
 #: constraint:account.fiscalyear:0
 msgid "Error ! The duration of the Fiscal Year is invalid. "
-msgstr "错误!会计年度无效 "
+msgstr "错误!会计年度的期限无效 "
 
 #. module: account
 #: selection:account.analytic.account,state:0
@@ -5499,7 +5499,7 @@ msgstr "关闭"
 #. module: account
 #: field:account.bank.statement.line,move_ids:0
 msgid "Moves"
-msgstr "凭证编号"
+msgstr "凭证"
 
 #. module: account
 #: selection:account.invoice,state:0
@@ -5532,7 +5532,7 @@ msgstr "成本分类账(只有数量)"
 #. module: account
 #: wizard_view:account.move.validate,init:0
 msgid "Validate Account Entries"
-msgstr "审核凭证"
+msgstr "确认"
 
 #. module: account
 #: selection:account.print.journal.report,init,sort_selection:0
@@ -5553,7 +5553,7 @@ msgstr "到"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_journal_open_form
 msgid "Entries of Open Analytic Journals"
-msgstr "待处理辅助核算分类帐"
+msgstr "打开的辅助核算分录集合分录"
 
 #. module: account
 #: view:account.invoice.tax:0
@@ -5568,7 +5568,7 @@ msgstr "当前日期"
 #. module: account
 #: selection:account.move,type:0
 msgid "Journal Sale"
-msgstr "销售分类帐"
+msgstr "销售分录集合"
 
 #. module: account
 #: wizard_field:account.fiscalyear.close,init,fy_id:0
@@ -5624,7 +5624,7 @@ msgstr "说明"
 msgid ""
 "This account will be used instead of the default one to value incoming stock "
 "for the current product"
-msgstr "这科目将用于当前产品的默认销售收入科目"
+msgstr "这科目将替换当前产品的默认进仓"
 
 #. module: account
 #: field:account.tax,child_ids:0
@@ -5639,12 +5639,12 @@ msgstr "上级右"
 #. module: account
 #: model:ir.ui.menu,name:account.account_account_menu
 msgid "Financial Accounts"
-msgstr "会计科目"
+msgstr "财务科目"
 
 #. module: account
 #: model:ir.model,name:account.model_account_chart_template
 msgid "Templates for Account Chart"
-msgstr "科目表"
+msgstr "科目表模板"
 
 #. module: account
 #: view:account.config.wizard:0
@@ -5656,7 +5656,7 @@ msgstr "科目设置"
 msgid ""
 "This account will be used instead of the default one as the payable account "
 "for the current partner"
-msgstr "这科目将用于当前业务伙伴的默认应付科目"
+msgstr "这科目将替换当前业务伙伴的默认支付科目"
 
 #. module: account
 #: field:account.tax.code,code:0
@@ -5683,7 +5683,7 @@ msgstr "打开/关闭会计期间"
 #. module: account
 #: rml:account.analytic.account.balance:0
 msgid "Analytic Balance -"
-msgstr "核算余额 -"
+msgstr "辅助核算余额 -"
 
 #. module: account
 #: wizard_field:account_use_models,init_form,model:0
@@ -5715,12 +5715,12 @@ msgstr "会计属性"
 #. module: account
 #: model:ir.model,name:account.model_account_sequence_fiscalyear
 msgid "account.sequence.fiscalyear"
-msgstr "科目.序号.会计年度"
+msgstr "科目.序列.会计年度"
 
 #. module: account
 #: wizard_field:account.print.journal.report,init,sort_selection:0
 msgid "Entries Sorted By"
-msgstr "凭证排序按"
+msgstr "分录排序按"
 
 #. module: account
 #: rml:account.journal.period.print:0
@@ -5732,13 +5732,13 @@ 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
 #: model:ir.ui.menu,name:account.menu_action_model_form
 msgid "Models Definition"
-msgstr "模型定义"
+msgstr "分录模型定义"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_cash_moves
@@ -5756,7 +5756,7 @@ msgstr "目标科目"
 #. module: account
 #: rml:account.overdue:0
 msgid "Maturity"
-msgstr "到期"
+msgstr "到期日期"
 
 #. module: account
 #: field:account.fiscalyear,name:0
@@ -5792,12 +5792,12 @@ msgstr "供应商退款"
 #: model:process.transition,note:account.process_transition_entriesreconcile0
 #: model:process.transition,note:account.process_transition_supplierentriesreconcile0
 msgid "Reconcile Entries."
-msgstr "对账凭证"
+msgstr "对账分录"
 
 #. module: account
 #: field:account.subscription.line,move_id:0
 msgid "Entry"
-msgstr "凭证"
+msgstr "分录"
 
 #. module: account
 #: model:process.node,note:account.process_node_paidinvoice0
@@ -5805,7 +5805,7 @@ msgstr "凭证"
 #: model:process.transition,note:account.process_transition_reconcilepaid0
 #: model:process.transition,note:account.process_transition_supplierreconcilepaid0
 msgid "Paid invoice when reconciled."
-msgstr "支付发票时对账"
+msgstr "对账时支付发票"
 
 #. module: account
 #: field:account.tax,python_compute_inv:0
@@ -5828,7 +5828,7 @@ msgstr "科目一览"
 msgid ""
 "This account will be used to value outgoing stock for the current product "
 "category"
-msgstr "这科目将用于当前产品分类的采购科目"
+msgstr "这科目将替换当前产品分类的默认出仓"
 
 #. module: account
 #: help:account.tax,base_sign:0
@@ -5850,7 +5850,7 @@ msgstr "银行详情"
 #. module: account
 #: field:account.chart.template,property_account_expense:0
 msgid "Expense Account on Product Template"
-msgstr "产品采购科目模板"
+msgstr "产品模板的费用科目"
 
 #. module: account
 #: rml:account.analytic.account.analytic.check:0
@@ -5860,7 +5860,7 @@ msgstr "一般借方"
 #. module: account
 #: field:account.analytic.account,code:0
 msgid "Account Code"
-msgstr "辅助核算代码"
+msgstr "辅助核算项代码"
 
 #. module: account
 #: help:account.config.wizard,name:0
@@ -5876,7 +5876,7 @@ msgstr "屏幕上显示的会计年度名称"
 #: model:ir.model,name:account.model_account_payment_term
 #: field:res.partner,property_payment_term:0
 msgid "Payment Term"
-msgstr "付款条件"
+msgstr "付款条款"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
@@ -5906,7 +5906,7 @@ msgstr "勾选此项"
 msgid ""
 "Check this if the price you use on the product and invoices includes this "
 "tax."
-msgstr "在产品和发票中使用含税价"
+msgstr "如果产品和发票你使用含税价. 勾选"
 
 #. module: account
 #: field:account.journal.column,name:0
@@ -5930,7 +5930,7 @@ msgstr "是"
 #: help:account.account,reconcile:0
 msgid ""
 "Check this if the user is allowed to reconcile entries in this account."
-msgstr "用户允许在这科目对账凭证"
+msgstr "如果用户可以在这科目去对账分录. 勾选"
 
 #. module: account
 #: wizard_button:account.subscription.generate,init,generate:0
@@ -5940,122 +5940,122 @@ msgstr "计算日期"
 #. module: account
 #: view:board.board:0
 msgid "Analytic accounts to close"
-msgstr ""
+msgstr "关闭辅助核算项"
 
 #. module: account
 #: view:board.board:0
 msgid "Draft invoices"
-msgstr ""
+msgstr "发票草稿"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.open_board_account
 #: model:ir.ui.menu,name:account.menu_board_account
 msgid "Accounting Dashboard"
-msgstr ""
+msgstr "会计控制台"
 
 #. module: account
 #: view:board.board:0
 #: model:ir.actions.act_window,name:account.act_my_account
 msgid "Accounts to invoice"
-msgstr ""
+msgstr "科目开发票"
 
 #. module: account
 #: view:board.board:0
 #: model:ir.actions.act_window,name:account.action_account_analytic_line_to_invoice
 msgid "Costs to invoice"
-msgstr ""
+msgstr "成本开发票"
 
 #. module: account
 #: view:board.board:0
 msgid "Aged receivables"
-msgstr ""
+msgstr "以前应收款"
 
 #. module: account
 #: model:ir.module.module,shortdesc:account.module_meta_information
 msgid "Board for accountant"
-msgstr ""
+msgstr "会计面板"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_aged_income
 msgid "Income Accounts"
-msgstr ""
+msgstr "收入科目"
 
 #. module: account
 #: view:board.board:0
 msgid "My indicators"
-msgstr ""
+msgstr "我的指标"
 
 #. module: account
 #: view:board.board:0
 msgid "Account Board"
-msgstr ""
+msgstr "科目面板"
 
 #. module: account
 #: view:board.board:0
 msgid "Aged income"
-msgstr ""
+msgstr "以前收入"
 
 #. module: account
 #: wizard_field:account.balance.account.balance.report,init,show_columns:0
 msgid "Show Debit/Credit Information"
-msgstr ""
+msgstr "显示借方/贷方信息"
 
 #. module: account
 #: selection:account.balance.account.balance.report,init,account_choice:0
 msgid "All accounts"
-msgstr ""
+msgstr "所有科目"
 
 #. module: account
 #: wizard_field:account.balance.account.balance.report,init,period_manner:0
 msgid "Entries Selection Based on"
-msgstr ""
+msgstr "分录选择基于"
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
 #: wizard_view:account.balance.account.balance.report,zero_years:0
 msgid "Notification"
-msgstr ""
+msgstr "通知"
 
 #. module: account
 #: selection:account.balance.account.balance.report,init,period_manner:0
 msgid "Financial Period"
-msgstr ""
+msgstr "财务会计期间"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_account_balance
 #: model:ir.actions.report.xml,name:account.account_account_balance_landscape
 msgid "Account balance"
-msgstr ""
+msgstr "科目余额"
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,init:0
 msgid "Select Period(s)"
-msgstr ""
+msgstr "选择会计期间"
 
 #. module: account
 #: selection:account.balance.account.balance.report,init,compare_pattern:0
 msgid "Percentage"
-msgstr ""
+msgstr "百分比"
 
 #. module: account
 #: wizard_field:account.balance.account.balance.report,init,compare_pattern:0
 msgid "Compare Selected Years In Terms Of"
-msgstr ""
+msgstr "比较选择的会计年度"
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,init:0
 msgid "Select Fiscal Year(s)(Maximum Three Years)"
-msgstr ""
+msgstr "选择会计年度(最大值为三年)"
 
 #. module: account
 #: wizard_field:account.balance.account.balance.report,init,select_account:0
 msgid "Select Reference Account(for  % comparision)"
-msgstr ""
+msgstr "选择参考科目(比较%)"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_account_balance_report
 msgid "Account balance-Compare Years"
-msgstr ""
+msgstr "科目结余会计年度比较"
 
 #. module: account
 #: model:ir.module.module,description:account.module_meta_information
@@ -6078,98 +6078,107 @@ msgid ""
 "    5. You have an option to print the desired report in Landscape format.\n"
 "    "
 msgstr ""
+"科目结余模块是一附加的财务管理模块\n"
+"    \n"
+"\t该模块为你提供各种可选择打印的资产负债表\n"
+"\t1.你能比较资产负债表的不同年份.\n"
+"\t2.你能设置两年的现金或百分比比较\n"
+"\t3.你能设置特别年份的参考科目的百分比比较\n"
+"\t4.你能选择会计期间的实际日期或在会计期间创建日期\n"
+"\t5.你可以选择打印要求的报表\n"
+"    "
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
 msgid "You have to select 'Landscape' option. Please Check it."
-msgstr ""
+msgstr "请勾选此项你能选择‘规定格式’选项"
 
 #. module: account
 #: wizard_field:account.balance.account.balance.report,init,landscape:0
 msgid "Show Report in Landscape Form"
-msgstr ""
+msgstr "显示固定格式的报表"
 
 #. module: account
 #: rml:account.account.balance.landscape:0
 #: rml:account.balance.account.balance:0
 msgid "Total :"
-msgstr ""
+msgstr "合计:"
 
 #. module: account
 #: wizard_field:account.balance.account.balance.report,init,format_perc:0
 msgid "Show Comparision in %"
-msgstr ""
+msgstr "显示对比 %"
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,init:0
 msgid "Select Period"
-msgstr "选会计期间"
+msgstr "选择会计期间"
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,init:0
 msgid "Report Options"
-msgstr ""
+msgstr "报表选项"
 
 #. module: account
 #: selection:account.balance.account.balance.report,init,compare_pattern:0
 msgid "Don't Compare"
-msgstr ""
+msgstr "不比较"
 
 #. module: account
 #: wizard_field:account.balance.account.balance.report,init,account_choice:0
 msgid "Show Accounts"
-msgstr ""
+msgstr "显示科目"
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
 msgid "1. You have selected more than 3 years in any case."
-msgstr ""
+msgstr "你必须要选择多于3年."
 
 #. module: account
 #: model:ir.module.module,shortdesc:account.module_meta_information
 msgid "Accounting and financial management-Compare Accounts"
-msgstr ""
+msgstr "会计和财务管理-科目比较"
 
 #. module: account
 #: rml:account.account.balance.landscape:0
 #: rml:account.balance.account.balance:0
 msgid "Year :"
-msgstr ""
+msgstr "会计年度:"
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
 msgid "You can select maximum 3 years. Please check again."
-msgstr ""
+msgstr "请勾选此项你最多能选择3年"
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
 msgid ""
 "3. You have selected 'Percentage' option with more than 2 years, but you "
 "have not selected landscape format."
-msgstr ""
+msgstr "你已经选择‘百分比’选项这要2年以上. 但你没选择规定格式."
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
 msgid ""
 "You might have done following mistakes. Please correct them and try again."
-msgstr ""
+msgstr "你可能存在以下错误. 请纠正后再试."
 
 #. module: account
 #: help:account.balance.account.balance.report,init,select_account:0
 msgid "Keep empty for comparision to its parent"
-msgstr ""
+msgstr "留空为比较母公司"
 
 #. module: account
 #: selection:account.balance.account.balance.report,init,period_manner:0
 msgid "Creation Date"
-msgstr ""
+msgstr "创建日期"
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
 msgid ""
 "2. You have not selected 'Percentage' option, but you have selected more "
 "than 2 years."
-msgstr ""
+msgstr "你选择2年以上, 但未选‘百分比’选项"
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,zero_years:0
@@ -6177,94 +6186,94 @@ msgid ""
 "You may have selected the compare options with more than 1 year with "
 "credit/debit columns and % option.This can lead contents to be printed out "
 "of the paper.Please try again."
-msgstr ""
+msgstr "你必须要选择比较选项一年以上的借方/贷方栏和%选项, 这才能产生打印的内容请再试."
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,zero_years:0
 msgid "You have to select at least 1 Fiscal Year. Try again."
-msgstr ""
+msgstr "你至少要选择一个会计年度再试"
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,init:0
 msgid "Customize Report"
-msgstr ""
+msgstr "自定义报表"
 
 #. module: account
 #: field:report.aged.receivable,name:0
 msgid "Month Range"
-msgstr ""
+msgstr "月度"
 
 #. module: account
 #: model:ir.actions.act_window,name:report_account.action_view_created_invoice_dashboard
 msgid "Invoices Created Within Past 15 Days"
-msgstr ""
+msgstr "发票建立要在15天前"
 
 #. module: account
 #: model:ir.model,name:report_account.model_report_invoice_created
 msgid "Report of Invoices Created within Last 15 days"
-msgstr ""
+msgstr "最近15天创建发票的报表"
 
 #. module: account
 #: view:report.invoice.created:0
 msgid "Total Amount"
-msgstr ""
+msgstr "金额合计"
 
 #. module: account
 #: view:report.account.receivable:0
 msgid "Accounts by type"
-msgstr ""
+msgstr "按类型划分的科目"
 
 #. module: account
 #: model:ir.model,name:report_account.model_report_aged_receivable
 msgid "Aged Receivable Till Today"
-msgstr ""
+msgstr "直到今天的应收款"
 
 #. module: account
 #: model:ir.model,name:report_account.model_report_account_receivable
 msgid "Receivable accounts"
-msgstr ""
+msgstr "应收款科目"
 
 #. module: account
 #: field:temp.range,name:0
 msgid "Range"
-msgstr ""
+msgstr "范围"
 
 #. module: account
 #: model:ir.module.module,description:report_account.module_meta_information
 msgid "A module that adds new reports based on the account module."
-msgstr ""
+msgstr "新的报表模块"
 
 #. module: account
 #: model:ir.module.module,shortdesc:report_account.module_meta_information
 msgid "Account Reporting - Reporting"
-msgstr ""
+msgstr "科目报表-报表"
 
 #. module: account
 #: model:ir.actions.act_window,name:report_account.action_account_receivable_graph
 #: model:ir.ui.menu,name:report_account.menu_account_receivable_graph
 msgid "Balance by Type of Account"
-msgstr ""
+msgstr "科目类型余额"
 
 #. module: account
 #: field:report.account.receivable,name:0
 msgid "Week of Year"
-msgstr ""
+msgstr "会计年度里的周"
 
 #. module: account
 #: field:report.invoice.created,create_date:0
 msgid "Create Date"
-msgstr ""
+msgstr "创建日期"
 
 #. module: account
 #: model:ir.actions.act_window,name:report_account.action_aged_receivable_graph
 #: view:report.aged.receivable:0
 msgid "Aged Receivable"
-msgstr ""
+msgstr "旧的应收款"
 
 #. module: account
 #: view:report.invoice.created:0
 msgid "Untaxed Amount"
-msgstr ""
+msgstr "未完税金额"
 
 #~ msgid "           Start date"
 #~ msgstr "           开始日期"
diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 882cb269d19..5bd0e01c113 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -214,7 +214,7 @@ class crm_case(object):
 
     def _history(self, cr, uid, cases, keyword, history=False, subject=None, email=False, details=None, email_from=False, message_id=False, attach=[], context={}):
         mailgate_pool = self.pool.get('mailgate.thread')
-        return mailgate_pool._history(cr, uid, cases, keyword, history=history,\
+        return mailgate_pool.history(cr, uid, cases, keyword, history=history,\
                                        subject=subject, email=email, \
                                        details=details, email_from=email_from,\
                                        message_id=message_id, attach=attach, \
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 60b682ae54a..c429810e31f 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -157,16 +157,17 @@
                  </page>
                  <page string="Emails" groups="base.group_extended">
                    <group colspan="4">
-                       <field colspan="4" name="email_cc" string="CC"/>
+                       <field colspan="4" name="email_cc" string="CC" widget="char" size="512"/>
                    </group>
                     <!-- TODO-->
                     <field name="message_ids" colspan="4" nolabel="1" mode="form,tree">
                         <form string="Communication history">
-                            <group col="6" colspan="4">
+                            <group col="4" colspan="4">
                                 <field name="email_from"/>
-                                <field name="email_to"/>
                                 <field name="date"/>
-                                <field name="name" colspan="6"/>
+                                <field name="email_to" widget="char" size="512"/>
+                                <field name="email_cc" widget="char" size="512"/>
+                                <field name="name" colspan="4" widget="char" size="512"/>
                             </group>
                             <notebook colspan="4">
                                 <page string="Details">
@@ -177,7 +178,7 @@
                                 </page>
                             </notebook>
                             <button colspan="4"
-                            string="Reply to Last Email"
+                            string="Reply"
                             name="%(crm.action_crm_send_mail)d"
                             context="{'mail':'reply', 'model': 'crm.lead', 'include_original' : True}"
                             icon="gtk-undo" type="action" />
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 3a04be60a93..ea959f7bd1a 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -116,14 +116,16 @@
 
                         <page string="Emails" groups="base.group_extended">
                             <group colspan="4">
-                                <field colspan="4" name="email_cc" string="CC"/>
+                                <field colspan="4" name="email_cc" string="Cc" widget="char" size="512"/>
                             </group>
                             <field name="message_ids" colspan="4" nolabel="1" mode="form,tree" height="280">
                                 <form string="Communication history">
-                                    <group col="6" colspan="4">
-                                        <field name="date"/>
-                                        <field name="email_to"/>
+                                    <group col="4" colspan="4">
                                         <field name="email_from"/>
+                                        <field name="date"/>
+                                        <field name="email_to" widget="char" size="512"/>
+                                        <field name="email_cc" widget="char" size="512"/>
+                                        <field name="name" colspan="4" widget="char" size="512"/>
                                     </group>
                                     <notebook colspan="4">
                                         <page string="Details">
diff --git a/addons/crm/wizard/crm_forward_to_partner.py b/addons/crm/wizard/crm_forward_to_partner.py
index 60dbace1e53..fb607eefdbc 100644
--- a/addons/crm/wizard/crm_forward_to_partner.py
+++ b/addons/crm/wizard/crm_forward_to_partner.py
@@ -217,7 +217,7 @@ class crm_lead_forward_to_partner(osv.osv_memory):
         )
 
         if result:
-            case_pool._history(cr, uid, [case], _('Forward'), history=True, email=this.email_to, subject=this.subject, details=body, email_from=email_from, attach=attach)
+            case_pool.history(cr, uid, [case], _('Forward'), history=True, email=this.email_to, subject=this.subject, details=body, email_from=email_from, attach=attach)
         else:
             raise osv.except_osv(_('Error!'), _('Unable to send mail. Please check SMTP is configured properly.'))
 
diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py
index 5560ec507bf..a77f553b173 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity.py
+++ b/addons/crm/wizard/crm_lead_to_opportunity.py
@@ -82,7 +82,7 @@ class crm_lead2opportunity(osv.osv_memory):
                 'type': 'opportunity'
             }
             lead_obj.write(cr, uid, lead.id, vals, context=context)
-            lead_obj._history(cr, uid, [lead], _('Opportunity'), details='Converted to Opportunity', context=context)
+            lead_obj.history(cr, uid, [lead], _('Opportunity'), details='Converted to Opportunity', context=context)
             if lead.partner_id:
                 msg_ids = [ x.id for x in lead.message_ids]
                 self.pool.get('mailgate.message').write(cr, uid, msg_ids, {'partner_id': lead.partner_id.id}, context=context)
diff --git a/addons/crm/wizard/crm_send_email.py b/addons/crm/wizard/crm_send_email.py
index bcb52e9bd48..08395834115 100644
--- a/addons/crm/wizard/crm_send_email.py
+++ b/addons/crm/wizard/crm_send_email.py
@@ -23,7 +23,6 @@
 from osv import osv, fields
 from tools.translate import _
 import base64
-import time
 import tools
 from crm import crm
 
@@ -45,17 +44,17 @@ class crm_send_new_email_attachment(osv.osv_memory):
 
 crm_send_new_email_attachment()
 
-class crm_send_new_email(osv.osv_memory):
+class crm_send_new_email2(osv.osv_memory):
     """ Sends new email for the case"""
     _name = "crm.send.mail"
     _description = "Send new email"
 
     _columns = {
-        'email_to' : fields.char('To', size=64, required=True),
-        'email_from' : fields.char('From', size=64, required=True),
-        'email_cc' : fields.char('CC', size=128, help="Carbon Copy: list of recipients that will receive"\
+        'email_to' : fields.char('To', size=512, required=True),
+        'email_from' : fields.char('From', size=128, required=True),
+        'email_cc' : fields.char('CC', size=512, help="Carbon Copy: list of recipients that will receive"\
                                     " a copy of this mail, and future communication related to this case"),
-        'subject': fields.char('Subject', size=128, required=True),
+        'subject': fields.char('Subject', size=512, required=True),
         'text': fields.text('Message', required=True),
         'state': fields.selection(crm.AVAILABLE_STATES, string='Set New State To', required=True),
 
@@ -72,7 +71,6 @@ class crm_send_new_email(osv.osv_memory):
         """
 
         hist_obj = self.pool.get('mailgate.message')
-        smtp_pool = self.pool.get('email.smtpclient')
 
         if not context:
             context = {}
@@ -130,10 +128,11 @@ class crm_send_new_email(osv.osv_memory):
             if not flag:
                 raise osv.except_osv(_('Error!'), _('Unable to send mail. Please check SMTP is configured properly.'))
             if flag:
-                case_pool._history(cr, uid, [case], _('Send'), history=True, \
+                case_pool.history(cr, uid, [case], _('Send'), history=True, \
                                 email=obj.email_to, details=body, \
                                 subject=obj.subject, email_from=email_from, \
-                                message_id=message_id, references=ref_id or message_id, attach=attach)
+                                email_cc=email_cc, message_id=message_id, \
+                                references=ref_id or message_id, attach=attach)
                 if obj.state == 'unchanged':
                     pass
                 elif obj.state == 'done':
@@ -157,7 +156,7 @@ class crm_send_new_email(osv.osv_memory):
         if not context.get('model'):
             raise osv.except_osv(_('Error'), _('Can not send mail!'))
 
-        res = super(crm_send_new_email, self).default_get(cr, uid, fields, context=context)
+        res = super(crm_send_new_email2, self).default_get(cr, uid, fields, context=context)
 
         if context.get('mail') == 'reply':
             res.update(self.get_reply_defaults(cr, uid, fields, context=context))
@@ -248,13 +247,7 @@ class crm_send_new_email(osv.osv_memory):
 
         if not context.get('model'):
             raise osv.except_osv(_('Error'), _('Can not send mail!'))
-        model = context.get('model')
-        mod_obj = self.pool.get(model)
-        if context.get('mail') == 'reply':
-            return True
-        if tools.config.get('email_from'):
-            return True
         return True
 
-crm_send_new_email()
+crm_send_new_email2()
 
diff --git a/addons/mail_gateway/mail_gateway.py b/addons/mail_gateway/mail_gateway.py
index e893e3648d5..2c778241daf 100644
--- a/addons/mail_gateway/mail_gateway.py
+++ b/addons/mail_gateway/mail_gateway.py
@@ -69,8 +69,9 @@ class mailgate_thread(osv.osv):
     def msg_send(self, cr, uid, id, *args, **argv):
         raise Exception, _('Method is not implemented')
 
-    def _history(self, cr, uid, cases, keyword, history=False, subject=None, email=False, details=None, \
-                    email_from=False, message_id=False, references=None, attach=None, context=None):
+    def history(self, cr, uid, cases, keyword, history=False, subject=None, email=False, details=None, \
+                    email_from=False, message_id=False, references=None, attach=None, email_cc=None, \
+                    email_bcc=None, email_date=None, context=None):
         """
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
@@ -78,8 +79,12 @@ class mailgate_thread(osv.osv):
         @param cases: a browse record list
         @param keyword: Case action keyword e.g.: If case is closed "Close" keyword is used
         @param history: Value True/False, If True it makes entry in case History otherwise in Case Log
-        @param email: Email address if any
-        @param details: Details of case history if any 
+        @param email: Email-To / Recipient address
+        @param email_from: Email From / Sender address if any
+        @param email_cc: Comma-Separated list of Carbon Copy Emails To addresse if any
+        @param email_bcc: Comma-Separated list of Blind Carbon Copy Emails To addresses if any
+        @param email_date: Email Date string if different from now, in server Timezone
+        @param details: Description, Ddtails of case history if any
         @param atach: Attachment sent in email
         @param context: A standard dictionary for contextual values"""
         if context is None:
@@ -97,35 +102,39 @@ class mailgate_thread(osv.osv):
 
         for case in cases:
             data = {
-                'name': keyword, 
-                'user_id': uid, 
-                'model' : case._name, 
-                'res_id': case.id, 
-                'date': time.strftime('%Y-%m-%d %H:%M:%S'), 
-                'message_id': message_id, 
+                'name': keyword,
+                'user_id': uid,
+                'model' : case._name,
+                'res_id': case.id,
+                'date': time.strftime('%Y-%m-%d %H:%M:%S'),
+                'message_id': message_id,
             }
             attachments = []
             if history:
                 for att in attach:
                     attachments.append(att_obj.create(cr, uid, {'name': att[0], 'datas': base64.encodestring(att[1])}))
+                    
+                for param in (email, email_cc, email_bcc):
+                    if isinstance(param, list):
+                        param = ", ".join(param)
 
                 data = {
-                    'name': subject or 'History', 
-                    'history': True, 
-                    'user_id': uid, 
-                    'model' : case._name, 
+                    'name': subject or 'History',
+                    'history': True,
+                    'user_id': uid,
+                    'model' : case._name,
                     'res_id': case.id,
-                    'date': time.strftime('%Y-%m-%d %H:%M:%S'), 
-                    'description': details or (hasattr(case, 'description') and case.description or False), 
-                    'email_to': email or \
-                        (hasattr(case, 'user_id') and case.user_id and case.user_id.address_id and \
-                         case.user_id.address_id.email) or tools.config.get('email_from', False), 
+                    'date': email_date or time.strftime('%Y-%m-%d %H:%M:%S'),
+                    'description': details or (hasattr(case, 'description') and case.description or False),
+                    'email_to': email,
                     'email_from': email_from or \
                         (hasattr(case, 'user_id') and case.user_id and case.user_id.address_id and \
-                         case.user_id.address_id.email) or tools.config.get('email_from', False), 
-                    'partner_id': hasattr(case, 'partner_id') and (case.partner_id and case.partner_id.id or False) or False, 
-                    'references': references, 
-                    'message_id': message_id, 
+                         case.user_id.address_id.email),
+                    'email_cc': email_cc,
+                    'email_bcc': email_bcc,
+                    'partner_id': hasattr(case, 'partner_id') and (case.partner_id and case.partner_id.id or False) or False,
+                    'references': references,
+                    'message_id': message_id,
                     'attachment_ids': [(6, 0, attachments)]
                 }
             obj.create(cr, uid, data, context=context)
@@ -140,7 +149,7 @@ class mailgate_message(osv.osv):
     _description = 'Mailgateway Message'
     _order = 'id desc'
     _columns = {
-        'name':fields.char('Subject', size=128),
+        'name':fields.text('Subject'),
         'model': fields.char('Object Name', size=128, select=1),
         'res_id': fields.integer('Resource ID', select=1),
         'ref_id': fields.char('Reference Id', size=256, readonly=True, help="Message Id in Email Server.", select=True),
@@ -148,12 +157,12 @@ class mailgate_message(osv.osv):
         'history': fields.boolean('Is History?'),
         'user_id': fields.many2one('res.users', 'User Responsible', readonly=True),
         'message': fields.text('Description'),
-        'email_from': fields.char('Email From', size=84),
-        'email_to': fields.char('Email To', size=84),
-        'email_cc': fields.char('Email CC', size=84),
-        'email_bcc': fields.char('Email BCC', size=84),
+        'email_from': fields.char('From', size=128, help="Email From"),
+        'email_to': fields.text('To', help="Email Recipients"),
+        'email_cc': fields.text('Cc', help="Carbon Copy Email Recipients"),
+        'email_bcc': fields.text('Bcc', help='Blind Carbon Copy Email Recipients'),
         'message_id': fields.char('Message Id', size=1024, readonly=True, help="Message Id on Email.", select=True),
-        'references': fields.text('References', readonly=True, help="Referencess emails."),
+        'references': fields.text('References', readonly=True, help="References emails."),
         'description': fields.text('Description'),
         'partner_id': fields.many2one('res.partner', 'Partner', required=False),
         'attachment_ids': fields.many2many('ir.attachment', 'message_attachment_rel', 'message_id', 'attachment_id', 'Attachments'),
@@ -421,12 +430,13 @@ class mailgate_tool(osv.osv_memory):
 
         # Store messages
         context.update({'model' : model})
-        if hasattr(model_pool, '_history'):
-            model_pool._history(cr, uid, res_ids, _('receive'), history=True,
+        if hasattr(model_pool, 'history'):
+            model_pool.history(cr, uid, res_ids, _('receive'), history=True,
                             subject = msg.get('subject'),
                             email = msg.get('to'),
                             details = msg.get('body'),
                             email_from = msg.get('from'),
+                            email_cc = msg.get('cc'),
                             message_id = msg.get('message-id'),
                             references = msg.get('references', False),
                             attach = attachments.items(),
diff --git a/addons/mail_gateway/mail_gateway_view.xml b/addons/mail_gateway/mail_gateway_view.xml
index 05dd1e32e34..415dc192e50 100644
--- a/addons/mail_gateway/mail_gateway_view.xml
+++ b/addons/mail_gateway/mail_gateway_view.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
                 <form string="mailgate message">
                     <group colspan="4" col="6">
-                        <field name="name" string="Subject" required="1" select="1"/>
+                        <field name="name" string="Subject" required="1" select="1"  widget="char" size="512"/>
                         <field name="date" required="1" select="1"/>
                         <field name="user_id" string="Responsible" select="1"/>
                         <field name="partner_id" readonly="1" />
@@ -18,9 +18,9 @@
                             <group col="2" colspan="2">
                                 <separator string="Email Details" colspan="4"/>
                                 <field name="email_from" />
-                                <field name="email_to" />
-                                <field name="email_cc" />
-                                <field name="email_bcc" groups="base.group_extended"/>
+                                <field name="email_to" widget="char" size="512"/>
+                                <field name="email_cc" widget="char" size="512"/>
+                                <field name="email_bcc" widget="char" size="512" groups="base.group_extended"/>
                            </group>
                            <group col="2" colspan="2">
                                 <separator string="Message Details" colspan="4"/>
@@ -86,7 +86,7 @@
                             <field name="date" />
                         </tree>
                         <form string="Mailgate Logs">
-                            <field name="name" />
+                            <field name="name"  widget="char" size="512"/>
                             <field name="date" />
                             <field name="user_id" />
                             <field name="message_id" />
@@ -95,9 +95,9 @@
                                     <group col="4" colspan="4">
                                         <separator string="Email Details" colspan="4"/>
                                         <field name="email_from" />
-                                        <field name="email_to" />
-                                        <field name="email_cc" />
-                                        <field name="email_bcc" />
+                                        <field name="email_to" widget="char" size="512"/>
+                                        <field name="email_cc" widget="char" size="512"/>
+                                        <field name="email_bcc" widget="char" size="512"/>
                                    </group>
                                    <separator string="Description" colspan="4"/>
                                     <field name="description" nolabel="1" colspan="4" />
@@ -109,14 +109,14 @@
                             </notebook>
                         </form>
                     </field>
-                    <separator string="Histories" colspan="4"/>
+                    <separator string="History" colspan="4"/>
                     <field name="message_ids" nolabel="1" colspan="4" domain="[('history', '=', True)]">
-                        <tree string="Mailgateway Histories">
+                        <tree string="Mailgateway History">
                             <field name="name" select="1" />
                             <field name="date" />
                         </tree>
-                        <form string="Mailgate Histories">
-                            <field name="name" />
+                        <form string="Mailgate History">
+                            <field name="name" widget="char" size="512"/>
                             <field name="date" />
                             <field name="user_id" />
                             <field name="message_id" />
@@ -126,9 +126,9 @@
                                     <group col="4" colspan="4">
                                         <separator string="Email Details" colspan="4"/>
                                         <field name="email_from" />
-                                        <field name="email_to" />
-                                        <field name="email_cc" />
-                                        <field name="email_bcc" />
+                                        <field name="email_to" widget="char" size="512"/>
+                                        <field name="email_cc" widget="char" size="512"/>
+                                        <field name="email_bcc" widget="char" size="512"/>
                                    </group>
                                 </page>
                                 <page string="Attachments">
diff --git a/addons/marketing_campaign/marketing_campaign.py b/addons/marketing_campaign/marketing_campaign.py
index dbb547af410..3b72f183f89 100644
--- a/addons/marketing_campaign/marketing_campaign.py
+++ b/addons/marketing_campaign/marketing_campaign.py
@@ -666,7 +666,7 @@ class marketing_campaign_workitem(osv.osv):
                 'type': 'ir.actions.act_window',
                 'target': 'new',
                 'nodestroy':True,
-                'context': "{'template_id':%d,'rel_model_ref':%d}"%
+                'context': "{'template_id':%d,'default_rel_model_ref':%d}"%
                                 (wi_obj.activity_id.email_template_id.id,
                                  wi_obj.res_id)
             }
@@ -691,21 +691,6 @@ class email_template(osv.osv):
     }
 email_template()
 
-class email_template_preview(osv.osv_memory):
-    _inherit = "email_template.preview"
-
-    def _default_rel_model(self, cr, uid, context=None):
-        if 'rel_model_ref' in context :
-            return context['rel_model_ref']
-        else :
-            return False
-
-    _defaults = {
-        'rel_model_ref' : _default_rel_model
-    }
-
-email_template_preview()
-
 class report_xml(osv.osv):
     _inherit = 'ir.actions.report.xml'
     def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False):
diff --git a/addons/multi_company/i18n/sl.po b/addons/multi_company/i18n/sl.po
index 81c947adfee..21e94b67eb1 100644
--- a/addons/multi_company/i18n/sl.po
+++ b/addons/multi_company/i18n/sl.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-01-26 11:01+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2010-07-02 12:11+0000\n"
+"Last-Translator: Simon Vidmar <Unknown>\n"
 "Language-Team: Slovenian <sl@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-06-22 04:20+0000\n"
+"X-Launchpad-Export-Date: 2010-07-03 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: multi_company
@@ -27,22 +27,23 @@ msgstr ""
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
+"Naziv objekta se mora začeti z 'x_' in ne sme vsebovati posebnih znakov!"
 
 #. module: multi_company
 #: constraint:product.template:0
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
-msgstr ""
+msgstr "Napaka: Privzeta EM in nabavna EM morata biti v isti kategoriji."
 
 #. module: multi_company
 #: constraint:res.partner:0
 msgid "The VAT doesn't seem to be correct."
-msgstr ""
+msgstr "Napaka pri obračunu DDV"
 
 #. module: multi_company
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Napačno ime modela v definiciji dejanja."
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
@@ -59,18 +60,18 @@ msgstr ""
 #. module: multi_company
 #: field:multi_company.default,company_dest_id:0
 msgid "Default Company"
-msgstr ""
+msgstr "Privzeto podjetje"
 
 #. module: multi_company
 #: field:multi_company.default,object_id:0
 msgid "Object"
-msgstr ""
+msgstr "Predmet"
 
 #. module: multi_company
 #: model:ir.module.module,shortdesc:multi_company.module_meta_information
 #: view:multi_company.default:0
 msgid "Multi Company"
-msgstr ""
+msgstr "Za več podjetij"
 
 #. module: multi_company
 #: model:ir.module.module,description:multi_company.module_meta_information
@@ -83,12 +84,12 @@ msgstr ""
 #. module: multi_company
 #: field:multi_company.default,company_id:0
 msgid "Main Company"
-msgstr ""
+msgstr "Glavna družba"
 
 #. module: multi_company
 #: view:multi_company.default:0
 msgid "Condition"
-msgstr ""
+msgstr "Pogoj"
 
 #. module: multi_company
 #: help:multi_company.default,company_dest_id:0
@@ -98,17 +99,17 @@ msgstr ""
 #. module: multi_company
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Neveljaven XML za arhitekturo pogleda!"
 
 #. module: multi_company
 #: field:multi_company.default,name:0
 msgid "Name"
-msgstr ""
+msgstr "Ime"
 
 #. module: multi_company
 #: constraint:product.template:0
 msgid "Error: UOS must be in a different category than the UOM"
-msgstr ""
+msgstr "Napaka: Prodajna EM mora biti v drugi kategoriji, kot je EM"
 
 #. module: multi_company
 #: model:product.category,name:multi_company.Odoo1
@@ -118,7 +119,7 @@ msgstr ""
 #. module: multi_company
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Napaka. Ne morete ustvariti rekurzivnih družb."
 
 #. module: multi_company
 #: help:multi_company.default,name:0
@@ -128,7 +129,7 @@ msgstr ""
 #. module: multi_company
 #: model:ir.ui.menu,name:multi_company.menu_custom_multicompany
 msgid "Multi company"
-msgstr ""
+msgstr "Za več podjetij"
 
 #. module: multi_company
 #: model:ir.model,name:multi_company.model_multi_company_default
diff --git a/addons/product_visible_discount/i18n/sl.po b/addons/product_visible_discount/i18n/sl.po
new file mode 100644
index 00000000000..6ea1da38a59
--- /dev/null
+++ b/addons/product_visible_discount/i18n/sl.po
@@ -0,0 +1,47 @@
+# Slovenian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-03-25 12:11+0000\n"
+"PO-Revision-Date: 2010-07-02 12:04+0000\n"
+"Last-Translator: Simon Vidmar <Unknown>\n"
+"Language-Team: Slovenian <sl@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-03 03:48+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: product_visible_discount
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Neveljaven XML za arhitekturo pogleda!"
+
+#. module: product_visible_discount
+#: model:ir.module.module,description:product_visible_discount.module_name_translation
+msgid ""
+"\n"
+"    This module lets you calculate discounts on Sale Order lines and Invoice "
+"lines base on the partner's pricelist.\n"
+"    To this end, a new check box named \"Visible Discount\" is added to the "
+"pricelist form.\n"
+"    Example:\n"
+"        For the product PC1 and the partner \"Asustek\": if listprice=450, "
+"and the price calculated using Asustek's pricelist is 225\n"
+"        If the check box is checked, we will have on the sale order line: "
+"Unit price=450, Discount=50,00, Net price=225\n"
+"        If the check box is unchecked, we will have on Sale Order and "
+"Invoice lines: Unit price=225, Discount=0,00, Net price=225\n"
+"    "
+msgstr ""
+
+#. module: product_visible_discount
+#: model:ir.module.module,shortdesc:product_visible_discount.module_name_translation
+#: field:product.pricelist,visible_discount:0
+msgid "Visible Discount"
+msgstr "Vidni popust"
diff --git a/addons/sale_margin/i18n/sl.po b/addons/sale_margin/i18n/sl.po
new file mode 100644
index 00000000000..0b59e7db3f6
--- /dev/null
+++ b/addons/sale_margin/i18n/sl.po
@@ -0,0 +1,370 @@
+# Slovenian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-11-25 14:28+0000\n"
+"PO-Revision-Date: 2010-07-02 12:17+0000\n"
+"Last-Translator: Simon Vidmar <Unknown>\n"
+"Language-Team: Slovenian <sl@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-03 03:48+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: sale_margin
+#: selection:report.account.invoice,type:0
+#: selection:report.account.invoice.category,type:0
+#: selection:report.account.invoice.partner,type:0
+#: selection:report.account.invoice.partner.product,type:0
+#: selection:report.account.invoice.product,type:0
+msgid "Customer Refund"
+msgstr "Dobropis kupcu"
+
+#. module: sale_margin
+#: model:ir.model,name:sale_margin.model_report_account_invoice_product
+msgid "report.account.invoice.product"
+msgstr ""
+
+#. module: sale_margin
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Naziv objekta se mora začeti z 'x_' in ne sme vsebovati posebnih znakov!"
+
+#. module: sale_margin
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_all_invoice_by_product
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_invoice_by_product
+msgid "Invoices by Product"
+msgstr "Računi po proizvodih"
+
+#. module: sale_margin
+#: selection:report.account.invoice,type:0
+#: selection:report.account.invoice.category,type:0
+#: selection:report.account.invoice.partner,type:0
+#: selection:report.account.invoice.partner.product,type:0
+#: selection:report.account.invoice.product,type:0
+msgid "Customer Invoice"
+msgstr "Izdan račun"
+
+#. module: sale_margin
+#: wizard_view:stock.invoice_onshipping,init:0
+msgid "Create invoices"
+msgstr "Ustvari račune"
+
+#. module: sale_margin
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Neveljaven XML za arhitekturo pogleda!"
+
+#. module: sale_margin
+#: model:ir.model,name:sale_margin.model_report_account_invoice_partner_product
+msgid "report.account.invoice.partner.product"
+msgstr ""
+
+#. module: sale_margin
+#: selection:report.account.invoice,type:0
+#: selection:report.account.invoice.category,type:0
+#: selection:report.account.invoice.partner,type:0
+#: selection:report.account.invoice.partner.product,type:0
+#: selection:report.account.invoice.product,type:0
+msgid "Supplier Invoice"
+msgstr "Račun dobavitelja"
+
+#. module: sale_margin
+#: field:report.account.invoice,state:0
+#: field:report.account.invoice.category,state:0
+#: field:report.account.invoice.partner,state:0
+#: field:report.account.invoice.partner.product,state:0
+#: field:report.account.invoice.product,state:0
+msgid "State"
+msgstr ""
+
+#. module: sale_margin
+#: view:stock.picking:0
+msgid "Create Invoice"
+msgstr "Ustvari račun"
+
+#. module: sale_margin
+#: selection:report.account.invoice,state:0
+#: selection:report.account.invoice.category,state:0
+#: selection:report.account.invoice.partner,state:0
+#: selection:report.account.invoice.partner.product,state:0
+#: selection:report.account.invoice.product,state:0
+msgid "Draft"
+msgstr "Osnutek"
+
+#. module: sale_margin
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Napačno ime modela v definiciji dejanja."
+
+#. module: sale_margin
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_all_month_product
+msgid "All Months"
+msgstr "Vsi meseci"
+
+#. module: sale_margin
+#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_partner_product_tree
+#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_partner_product_tree_all
+msgid "report.account.invoice.partner.product.tree"
+msgstr ""
+
+#. module: sale_margin
+#: field:report.account.invoice,type:0
+#: field:report.account.invoice.category,type:0
+#: field:report.account.invoice.partner,type:0
+#: field:report.account.invoice.partner.product,type:0
+#: field:report.account.invoice.product,type:0
+#: wizard_field:stock.invoice_onshipping,init,type:0
+msgid "Type"
+msgstr "Vrsta"
+
+#. module: sale_margin
+#: wizard_field:stock.invoice_onshipping,init,journal_id:0
+msgid "Destination Journal"
+msgstr ""
+
+#. module: sale_margin
+#: view:stock.picking:0
+msgid "Supplier Invoices"
+msgstr "Računi dobaviteljev"
+
+#. module: sale_margin
+#: field:report.account.invoice.partner.product,product_id:0
+#: field:report.account.invoice.product,product_id:0
+msgid "Product"
+msgstr "Proizvod"
+
+#. module: sale_margin
+#: view:report.account.invoice.partner:0
+msgid "Invoices by partner"
+msgstr "Računi po partnerjih"
+
+#. module: sale_margin
+#: view:report.account.invoice.category:0
+msgid "Invoices by category"
+msgstr "Računi po vrstah"
+
+#. module: sale_margin
+#: selection:report.account.invoice,state:0
+#: selection:report.account.invoice.category,state:0
+#: selection:report.account.invoice.partner,state:0
+#: selection:report.account.invoice.partner.product,state:0
+#: selection:report.account.invoice.product,state:0
+msgid "Paid"
+msgstr "Plačano"
+
+#. module: sale_margin
+#: model:ir.actions.wizard,name:sale_margin.wizard_picking_invoice_create
+#: wizard_button:stock.invoice_onshipping,init,create_invoice:0
+msgid "Create invoice"
+msgstr "Ustvari račun"
+
+#. module: sale_margin
+#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_category_tree
+#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_category_tree_all
+msgid "report.account.invoice.category.tree"
+msgstr ""
+
+#. module: sale_margin
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_all_invoice_by_partner_product
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_invoice_by_partner_product
+msgid "Invoices by Partner and Product"
+msgstr "Računi po partnerjih in proizvodih"
+
+#. module: sale_margin
+#: model:ir.model,name:sale_margin.model_report_account_invoice_category
+msgid "report.account.invoice.category"
+msgstr ""
+
+#. module: sale_margin
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_this_month_product
+msgid "This Month"
+msgstr "Ta mesec"
+
+#. module: sale_margin
+#: field:report.account.invoice.category,categ_id:0
+msgid "Categories"
+msgstr "Kategorije"
+
+#. module: sale_margin
+#: field:account.invoice.line,cost_price:0
+#: field:report.account.invoice,cost_price:0
+#: field:report.account.invoice.category,cost_price:0
+#: field:report.account.invoice.partner,cost_price:0
+#: field:report.account.invoice.partner.product,cost_price:0
+#: field:report.account.invoice.product,cost_price:0
+#: field:sale.order.line,purchase_price:0
+msgid "Cost Price"
+msgstr "Lastna cena"
+
+#. module: sale_margin
+#: wizard_field:stock.invoice_onshipping,init,group:0
+msgid "Group by partner"
+msgstr "Združi po partnerjih"
+
+#. module: sale_margin
+#: model:ir.model,name:sale_margin.model_report_account_invoice_partner
+msgid "report.account.invoice.partner"
+msgstr ""
+
+#. module: sale_margin
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_all_invoice_by_partner
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_invoice_by_partner
+msgid "Invoices by Partner"
+msgstr "Računi po partnerju"
+
+#. module: sale_margin
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_all_invoice_by_category
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_invoice_by_category
+msgid "Invoices by Category"
+msgstr "Računi po kategorijah"
+
+#. module: sale_margin
+#: view:report.account.invoice.partner.product:0
+msgid "Invoices by partner and product"
+msgstr "Računi po partnerjih in proizvodih"
+
+#. module: sale_margin
+#: field:report.account.invoice,amount:0
+#: field:report.account.invoice.category,amount:0
+#: field:report.account.invoice.partner,amount:0
+#: field:report.account.invoice.partner.product,amount:0
+#: field:report.account.invoice.product,amount:0
+msgid "Amount"
+msgstr "Znesek"
+
+#. module: sale_margin
+#: wizard_field:stock.invoice_onshipping,init,invoice_date:0
+msgid "Invoiced date"
+msgstr "Datum izdaje računa"
+
+#. module: sale_margin
+#: selection:report.account.invoice,type:0
+#: selection:report.account.invoice.category,type:0
+#: selection:report.account.invoice.partner,type:0
+#: selection:report.account.invoice.partner.product,type:0
+#: selection:report.account.invoice.product,type:0
+msgid "Supplier Refund"
+msgstr "Dobropis dobavitelja"
+
+#. module: sale_margin
+#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_partner_tree
+#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_partner_tree_all
+msgid "report.account.invoice.partner.tree"
+msgstr ""
+
+#. module: sale_margin
+#: field:report.account.invoice,margin:0
+#: field:report.account.invoice.category,margin:0
+#: field:report.account.invoice.partner,margin:0
+#: field:report.account.invoice.partner.product,margin:0
+#: field:report.account.invoice.product,margin:0
+#: field:sale.order,margin:0
+#: field:sale.order.line,margin:0
+msgid "Margin"
+msgstr "Rob"
+
+#. module: sale_margin
+#: field:report.account.invoice,quantity:0
+#: field:report.account.invoice.category,quantity:0
+#: field:report.account.invoice.partner,quantity:0
+#: field:report.account.invoice.partner.product,quantity:0
+#: field:report.account.invoice.product,quantity:0
+msgid "Quantity"
+msgstr "Količina"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "Invoices by product"
+msgstr "Računi po proizvodih"
+
+#. module: sale_margin
+#: model:ir.module.module,shortdesc:sale_margin.module_meta_information
+msgid "Margins in Sale Orders"
+msgstr ""
+
+#. module: sale_margin
+#: model:ir.model,name:sale_margin.model_report_account_invoice
+msgid "report.account.invoice"
+msgstr ""
+
+#. module: sale_margin
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_all_invoice_by_invoices
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_invoice_by_invoices
+#: view:report.account.invoice:0
+#: view:stock.picking:0
+#: field:stock.picking,invoice_ids:0
+msgid "Invoices"
+msgstr "Računi"
+
+#. module: sale_margin
+#: selection:report.account.invoice,state:0
+#: selection:report.account.invoice.category,state:0
+#: selection:report.account.invoice.partner,state:0
+#: selection:report.account.invoice.partner.product,state:0
+#: selection:report.account.invoice.product,state:0
+msgid "Pro-forma"
+msgstr "Pro-forma"
+
+#. module: sale_margin
+#: field:report.account.invoice,name:0
+#: field:report.account.invoice.category,name:0
+#: field:report.account.invoice.partner,name:0
+#: field:report.account.invoice.partner.product,name:0
+#: field:report.account.invoice.product,name:0
+msgid "Month"
+msgstr "Mesec"
+
+#. module: sale_margin
+#: selection:report.account.invoice,state:0
+#: selection:report.account.invoice.category,state:0
+#: selection:report.account.invoice.partner,state:0
+#: selection:report.account.invoice.partner.product,state:0
+#: selection:report.account.invoice.product,state:0
+msgid "Canceled"
+msgstr "Preklicano"
+
+#. module: sale_margin
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_invoice_product
+msgid "Invoice"
+msgstr "Račun"
+
+#. module: sale_margin
+#: wizard_button:stock.invoice_onshipping,init,end:0
+msgid "Cancel"
+msgstr "Prekliči"
+
+#. module: sale_margin
+#: field:report.account.invoice.partner,partner_id:0
+#: field:report.account.invoice.partner.product,partner_id:0
+msgid "Partner"
+msgstr "Partner"
+
+#. module: sale_margin
+#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_tree
+#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_tree_all
+msgid "report.account.invoice.tree"
+msgstr ""
+
+#. module: sale_margin
+#: selection:report.account.invoice,state:0
+#: selection:report.account.invoice.category,state:0
+#: selection:report.account.invoice.partner,state:0
+#: selection:report.account.invoice.partner.product,state:0
+#: selection:report.account.invoice.product,state:0
+msgid "Open"
+msgstr "Odpri"
+
+#. module: sale_margin
+#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_product_tree
+#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_product_tree_all
+msgid "report.account.invoice.product.tree"
+msgstr ""