pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] Merged with main addons

Browse Source 
bzr revid: tde@openerp.com-20120207101731-8yysea15hs5co0f9
This commit is contained in:
Thibault Delavallée
2012-02-07 11:17:31 +01:00
parent b6739df297 4db8d52f74
commit 7a4f8ea0a1
73 changed files with 1764 additions and 1145 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/account.py
+1 -1
View File
@@ -1883,7 +1883,7 @@ class account_tax(osv.osv):
}
_sql_constraints = [
('name_company_uniq', 'unique(name, company_id)', 'Tax Name must be unique per company!'),
('description_company_uniq', 'unique(description, company_id)', 'The description must be unique per company!'),
]
def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=80):
addons/account/account_invoice.py
+1 -1
View File
@@ -289,7 +289,7 @@ class account_invoice(osv.osv):
'user_id': lambda s, cr, u, c: u,
}
_sql_constraints = [
('number_uniq', 'unique(number, company_id)', 'Invoice Number must be unique per Company!'),
('number_uniq', 'unique(number, company_id, journal_id, type)', 'Invoice Number must be unique per Company!'),
]
def fields_view_get(self, cr, uid, view_id=None, view_type=False, context=None, toolbar=False, submenu=False):
addons/account/account_invoice_view.xml
+3 -1
View File
@@ -291,7 +291,9 @@
</field>
</group>
<group col="4" colspan="2">
<button colspan="2" name="button_reset_taxes" states="draft,proforma2" string="Compute Taxes" type="object" groups="base.group_user" icon="terp-stock_format-scientific" help="This action will erase taxes"/>
<group colspan="2" col="1">
<button name="button_reset_taxes" states="draft,proforma2" string="Compute Taxes" type="object" groups="base.group_user" icon="terp-stock_format-scientific" help="This action will erase taxes"/>
</group>
<field name="amount_untaxed"/>
<label string="" colspan="2"/>
<field name="amount_tax"/>
addons/account/i18n/hr.po
+5 -5
View File
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2011-12-23 09:55+0000\n"
"PO-Revision-Date: 2011-12-22 07:14+0000\n"
"Last-Translator: Tomislav Bosnjakovic <Unknown>\n"
"PO-Revision-Date: 2012-02-06 13:38+0000\n"
"Last-Translator: Goran Kliska <gkliska@gmail.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: 2011-12-24 05:48+0000\n"
"X-Generator: Launchpad (build 14560)\n"
"X-Launchpad-Export-Date: 2012-02-07 04:53+0000\n"
"X-Generator: Launchpad (build 14747)\n"
#. module: account
#: view:account.invoice.report:0
@@ -8147,7 +8147,7 @@ msgstr ""
#. module: account
#: report:account.invoice:0
msgid "Net Total:"
msgstr "Ukupno netto:"
msgstr "Osnovica:"
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_generic_reporting
addons/account/i18n/zh_CN.po
+64 -61
View File
@@ -7,20 +7,20 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2011-12-23 09:55+0000\n"
"PO-Revision-Date: 2012-01-12 04:38+0000\n"
"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
"PO-Revision-Date: 2012-02-06 10:20+0000\n"
"Last-Translator: digitalsatori <digisatori@gmail.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: 2012-01-13 04:39+0000\n"
"X-Generator: Launchpad (build 14664)\n"
"X-Launchpad-Export-Date: 2012-02-07 04:53+0000\n"
"X-Generator: Launchpad (build 14747)\n"
#. module: account
#: view:account.invoice.report:0
#: view:analytic.entries.report:0
msgid "last month"
msgstr ""
msgstr "上月"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -48,7 +48,7 @@ msgstr "科目统计"
#. module: account
#: view:account.invoice:0
msgid "Proforma/Open/Paid Invoices"
msgstr ""
msgstr "形式/未结/已支付发票"
#. module: account
#: field:report.invoice.created,residual:0
@@ -108,7 +108,7 @@ msgstr "如果您反核销交易，您必须检查所有与这交易有关的操
msgid ""
"Configuration error! The currency chosen should be shared by the default "
"accounts too."
msgstr ""
msgstr "设置错误！所选币种应与默认科目共享。"
#. module: account
#: report:account.invoice:0
@@ -157,7 +157,7 @@ msgstr "警告！"
#: code:addons/account/account.py:3182
#, python-format
msgid "Miscellaneous Journal"
msgstr ""
msgstr "其它凭证簿"
#. module: account
#: field:account.fiscal.position.account,account_src_id:0
@@ -178,7 +178,7 @@ msgstr "过去15天开的发票"
#. module: account
#: field:accounting.report,label_filter:0
msgid "Column Label"
msgstr ""
msgstr "字段标签"
#. module: account
#: code:addons/account/wizard/account_move_journal.py:95
@@ -246,7 +246,7 @@ msgid ""
"Account Type is used for information purpose, to generate country-specific "
"legal reports, and set the rules to close a fiscal year and generate opening "
"entries."
msgstr ""
msgstr "科目类别用于生成合乎各国财税规范的报表，设置财年结帐的规则以及生成未登帐凭证"
#. module: account
#: report:account.overdue:0
@@ -417,7 +417,7 @@ msgstr "备选币种所示金额"
#. module: account
#: field:accounting.report,enable_filter:0
msgid "Enable Comparison"
msgstr ""
msgstr "允许比较"
#. module: account
#: help:account.journal.period,state:0
@@ -502,7 +502,7 @@ msgstr "选择科目一览表"
#. module: account
#: sql_constraint:res.company:0
msgid "The company name must be unique !"
msgstr ""
msgstr "公司名称必须唯一！"
#. module: account
#: model:ir.model,name:account.model_account_invoice_refund
@@ -583,12 +583,12 @@ msgstr "序号"
#: field:account.financial.report,account_report_id:0
#: selection:account.financial.report,type:0
msgid "Report Value"
msgstr ""
msgstr "报表数值"
#. module: account
#: view:account.entries.report:0
msgid "Journal Entries with period in current year"
msgstr ""
msgstr "本年度期间的凭证"
#. module: account
#: report:account.central.journal:0
@@ -604,7 +604,7 @@ msgstr "序列号必须唯一"
#: code:addons/account/account.py:3376
#, python-format
msgid "TAX-S-%s"
msgstr ""
msgstr "TAX-S-%s"
#. module: account
#: field:account.invoice.tax,tax_amount:0
@@ -685,12 +685,12 @@ msgstr "今天的与业务伙伴核销"
#. module: account
#: view:report.hr.timesheet.invoice.journal:0
msgid "Sale journal in this year"
msgstr ""
msgstr "本年度销售凭证簿"
#. module: account
#: selection:account.financial.report,display_detail:0
msgid "Display children with hierarchy"
msgstr ""
msgstr "以层级结构显示子项"
#. module: account
#: selection:account.payment.term.line,value:0
@@ -712,7 +712,7 @@ msgstr "辅助核算明细"
#. module: account
#: field:account.invoice.refund,filter_refund:0
msgid "Refund Method"
msgstr ""
msgstr "退款方式"
#. module: account
#: code:addons/account/wizard/account_change_currency.py:38
@@ -723,7 +723,7 @@ msgstr "你只能对发票草稿修改币种"
#. module: account
#: model:ir.ui.menu,name:account.menu_account_report
msgid "Financial Report"
msgstr ""
msgstr "财务报表"
#. module: account
#: view:account.analytic.journal:0
@@ -753,7 +753,7 @@ msgstr "该发票对应的业务伙伴单号"
#. module: account
#: view:account.invoice.report:0
msgid "Supplier Invoices And Refunds"
msgstr ""
msgstr "供应商发票和退款"
#. module: account
#: view:account.move.line.unreconcile.select:0
@@ -766,7 +766,7 @@ msgstr "反核销"
#. module: account
#: view:account.payment.term.line:0
msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
msgstr ""
msgstr "于第14个工作日支付总款2%，余款至30个工作日所在月之月末支付"
#. module: account
#: model:ir.model,name:account.model_account_analytic_journal_report
@@ -782,7 +782,7 @@ msgstr "自动核销"
#: code:addons/account/account_move_line.py:1250
#, python-format
msgid "No period found or period given is ambigous."
msgstr ""
msgstr "未设置财务期间或财务期间设置有冲突"
#. module: account
#: model:ir.actions.act_window,help:account.action_account_gain_loss
@@ -792,6 +792,7 @@ msgid ""
"or Loss you'd realized if those transactions were ended today. Only for "
"accounts having a secondary currency set."
msgstr ""
"多币种交易时，可能会因为汇率的变动而引起金额的上下浮动。本菜单项让你能了解如果交易于本日结算所引起的汇差损益。只对设置了第二币种的科目有效。"
#. module: account
#: selection:account.entries.report,month:0
@@ -834,7 +835,7 @@ msgstr "计算"
#. module: account
#: selection:account.invoice.refund,filter_refund:0
msgid "Cancel: refund invoice and reconcile"
msgstr ""
msgstr "取消：发票退款并核销"
#. module: account
#: field:account.cashbox.line,pieces:0
@@ -929,7 +930,7 @@ msgstr "如果这税科目是一个税编码科目，这字段金额要征税。
#: code:addons/account/account.py:2578
#, python-format
msgid "I can not locate a parent code for the template account!"
msgstr ""
msgstr "无法为该科目模板定位其父科目"
#. module: account
#: view:account.analytic.line:0
@@ -1004,12 +1005,12 @@ msgstr "横向模式"
msgid ""
"You cannot change the type of account from '%s' to '%s' type as it contains "
"journal items!"
msgstr ""
msgstr "无法将科目类别从 '%s' 改变为 '%s' ，因为已有凭证使用该科目"
#. module: account
#: field:account.report.general.ledger,sortby:0
msgid "Sort by"
msgstr ""
msgstr "排序"
#. module: account
#: help:account.fiscalyear.close,fy_id:0
@@ -1028,7 +1029,7 @@ msgstr "根据您国家定义这些类型,该类型包含有关科目及其具
#, python-format
msgid ""
"You have to provide an account for the write off/exchange difference entry !"
msgstr ""
msgstr "请设置注销科目！"
#. module: account
#: view:account.tax:0
@@ -1067,7 +1068,7 @@ msgstr "生成分录前："
#. module: account
#: view:account.move.line:0
msgid "Unbalanced Journal Items"
msgstr ""
msgstr "未平财务凭证"
#. module: account
#: model:account.account.type,name:account.data_account_type_bank
@@ -1090,7 +1091,7 @@ msgstr "确认报表"
msgid ""
"Total amount (in Secondary currency) for transactions held in secondary "
"currency for this account."
msgstr ""
msgstr "此科目上以第二币种发生交易的合计金额（第二币种）"
#. module: account
#: field:account.fiscal.position.tax,tax_dest_id:0
@@ -1106,7 +1107,7 @@ msgstr "贷方汇总"
#. module: account
#: view:report.account_type.sales:0
msgid "All Months Sales by type"
msgstr ""
msgstr "以销售类别划分的销售汇总"
#. module: account
#: model:ir.actions.act_window,help:account.action_invoice_tree2
@@ -1131,12 +1132,12 @@ msgstr "作废发票"
#. module: account
#: help:account.journal,code:0
msgid "The code will be displayed on reports."
msgstr ""
msgstr "该代码会在报表中显示"
#. module: account
#: view:account.tax.template:0
msgid "Taxes used in Purchases"
msgstr ""
msgstr "采购所适税种"
#. module: account
#: field:account.invoice.tax,tax_code_id:0
@@ -1167,7 +1168,7 @@ msgstr "分录明细的变动"
msgid ""
"You can not use this general account in this journal, check the tab 'Entry "
"Controls' on the related journal !"
msgstr ""
msgstr "在本凭证簿中不能使用该总账科目，请检查相关凭证簿的“科目控制”页"
#. module: account
#: field:account.move.line.reconcile,trans_nbr:0
@@ -1203,7 +1204,7 @@ msgstr "其它"
#. module: account
#: view:account.subscription:0
msgid "Draft Subscription"
msgstr ""
msgstr "循环凭证草稿"
#. module: account
#: view:account.account:0
@@ -1276,7 +1277,7 @@ msgstr "选择会计期间的开始和结束时间"
#. module: account
#: model:account.financial.report,name:account.account_financial_report_profitandloss0
msgid "Profit and Loss"
msgstr ""
msgstr "损益类"
#. module: account
#: model:ir.model,name:account.model_account_account_template
@@ -1426,7 +1427,7 @@ msgstr "# 分录 "
msgid ""
"By unchecking the active field, you may hide a fiscal position without "
"deleting it."
msgstr ""
msgstr "如不勾选该项，可以隐藏而不删除此应税条件"
#. module: account
#: model:ir.model,name:account.model_temp_range
@@ -1504,7 +1505,7 @@ msgstr "搜索银行对账单"
#. module: account
#: view:account.move.line:0
msgid "Unposted Journal Items"
msgstr ""
msgstr "未登帐凭证项"
#. module: account
#: view:account.chart.template:0
@@ -1568,7 +1569,7 @@ msgstr "发票"
msgid ""
"You can not validate a journal entry unless all journal items belongs to the "
"same chart of accounts !"
msgstr ""
msgstr "所有凭证行对应科目均属同一科目表时方可审核该凭证"
#. module: account
#: model:process.node,note:account.process_node_analytic0
@@ -1642,7 +1643,7 @@ msgstr "显示您公司每个会计年度的科目表和过滤的会计周期。
#. module: account
#: view:account.analytic.account:0
msgid "Pending Accounts"
msgstr ""
msgstr "Pending Accounts"
#. module: account
#: code:addons/account/account_move_line.py:835
@@ -1735,7 +1736,7 @@ msgstr "您不能在关闭的科目上建立分录。"
#: code:addons/account/account.py:428
#, python-format
msgid "Error!"
msgstr ""
msgstr "错误！"
#. module: account
#: sql_constraint:account.move.line:0
@@ -1767,7 +1768,7 @@ msgstr "按明细"
#. module: account
#: field:account.vat.declaration,based_on:0
msgid "Based on"
msgstr ""
msgstr "基于"
#. module: account
#: field:account.invoice,move_id:0
@@ -1838,7 +1839,7 @@ msgid ""
"This account is used for transferring Profit/Loss (If It is Profit: Amount "
"will be added, Loss : Amount will be deducted.), as calculated in Profit & "
"Loss Report"
msgstr ""
msgstr "该科目用于记录损益金额（如果为收益：金额增加，亏损：金额减少），与损益表一致"
#. module: account
#: model:process.node,note:account.process_node_reconciliation0
@@ -1856,7 +1857,7 @@ msgstr "税定义"
#: code:addons/account/account.py:3076
#, python-format
msgid "Deposit"
msgstr ""
msgstr "存款"
#. module: account
#: help:wizard.multi.charts.accounts,seq_journal:0
@@ -1889,7 +1890,7 @@ msgstr "图像"
#. module: account
#: model:ir.actions.act_window,help:account.action_account_financial_report_tree
msgid "Makes a generic system to draw financial reports easily."
msgstr ""
msgstr "使生成财务报表更容易"
#. module: account
#: view:account.invoice:0
@@ -1907,7 +1908,7 @@ msgstr "如果此字段设为False，您可以隐藏而不删除这税。"
#. module: account
#: view:account.analytic.line:0
msgid "Analytic Journal Items related to a sale journal."
msgstr ""
msgstr "与某销售凭证簿关联的分析凭证"
#. module: account
#: help:account.bank.statement,name:0
@@ -2033,6 +2034,8 @@ msgid ""
"Put a sequence in the journal definition for automatic numbering or create a "
"sequence manually for this piece."
msgstr ""
"无法为此项创建自动序号!\n"
"请为该凭证簿配置自动序号。"
#. module: account
#: code:addons/account/account.py:786
@@ -2040,12 +2043,12 @@ msgstr ""
msgid ""
"You can not modify the company of this journal as its related record exist "
"in journal items"
msgstr ""
msgstr "不能修改该凭证簿的公司设置，因为已存在凭证记录"
#. module: account
#: report:account.invoice:0
msgid "Customer Code"
msgstr ""
msgstr "客户编码"
#. module: account
#: view:account.installer:0
@@ -2078,7 +2081,7 @@ msgstr "说明"
#: code:addons/account/account.py:3375
#, python-format
msgid "Tax Paid at %s"
msgstr ""
msgstr "税额支付于 %s"
#. module: account
#: code:addons/account/account.py:3189
@@ -2189,7 +2192,7 @@ msgstr "留空为所有开启的会计年度"
#. module: account
#: field:account.invoice.report,account_line_id:0
msgid "Account Line"
msgstr ""
msgstr "发票明细"
#. module: account
#: code:addons/account/account.py:1465
@@ -2205,7 +2208,7 @@ msgid ""
"Setup your accounting journals. For bank accounts, it's better to use the "
"'Setup Your Bank Accounts' tool that will automatically create the accounts "
"and journals for you."
msgstr ""
msgstr "设置凭证簿。最好使用 '设置银行科目' 来自动创建和设置银行科目。"
#. module: account
#: model:ir.model,name:account.model_account_move
@@ -2215,7 +2218,7 @@ msgstr "凭证"
#. module: account
#: constraint:res.partner:0
msgid "Error ! You cannot create recursive associated members."
msgstr ""
msgstr "错误，您不能创建循环引用的会员用户"
#. module: account
#: field:account.sequence.fiscalyear,sequence_main_id:0
@@ -2228,7 +2231,7 @@ msgstr "主序列"
msgid ""
"In order to delete a bank statement, you must first cancel it to delete "
"related journal items."
msgstr ""
msgstr "要删除银行对帐单，必须先取消并删除相关凭证项"
#. module: account
#: field:account.invoice,payment_term:0
@@ -2307,7 +2310,7 @@ msgstr ""
#: model:account.payment.term,name:account.account_payment_term_advance
#: model:account.payment.term,note:account.account_payment_term_advance
msgid "30% Advance End 30 Days"
msgstr ""
msgstr "预付30%30天内支付余款"
#. module: account
#: view:account.entries.report:0
@@ -2390,7 +2393,7 @@ msgstr "进项税"
#. module: account
#: view:account.entries.report:0
msgid "entries"
msgstr ""
msgstr "凭证"
#. module: account
#: help:account.invoice,date_due:0
@@ -2435,7 +2438,7 @@ msgstr "这报表是您指定账簿的概述"
#. module: account
#: model:ir.model,name:account.model_account_move_line_reconcile_writeoff
msgid "Account move line reconcile (writeoff)"
msgstr ""
msgstr "凭证行核销（注销）"
#. module: account
#: report:account.invoice:0
@@ -2530,7 +2533,7 @@ msgstr "这科目可以是一个税基编码或税编码的科目。"
#. module: account
#: sql_constraint:account.model.line:0
msgid "Wrong credit or debit value in model, they must be positive!"
msgstr ""
msgstr "借贷数值不正确，必须为正值"
#. module: account
#: model:ir.ui.menu,name:account.menu_automatic_reconcile
@@ -2565,7 +2568,7 @@ msgstr "日期"
#. module: account
#: field:account.chart.template,parent_id:0
msgid "Parent Chart Template"
msgstr ""
msgstr "父科目表模板"
#. module: account
#: field:account.tax,parent_id:0
@@ -2577,7 +2580,7 @@ msgstr "父税科目"
#: code:addons/account/wizard/account_change_currency.py:59
#, python-format
msgid "New currency is not configured properly !"
msgstr ""
msgstr "新币种设置不正确"
#. module: account
#: view:account.subscription.generate:0
@@ -2602,7 +2605,7 @@ msgstr "会计分录"
#. module: account
#: field:account.invoice,reference_type:0
msgid "Communication Type"
msgstr ""
msgstr "沟通类型"
#. module: account
#: field:account.invoice.line,discount:0
@@ -2630,7 +2633,7 @@ msgstr "新公司财务设置"
#. module: account
#: view:account.installer:0
msgid "Configure Your Chart of Accounts"
msgstr ""
msgstr "科目表设置"
#. module: account
#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
@@ -2677,7 +2680,7 @@ msgstr "税编码"
#. module: account
#: view:account.account:0
msgid "Unrealized Gains and losses"
msgstr ""
msgstr "未确认损益"
#. module: account
#: model:ir.ui.menu,name:account.menu_account_customer
addons/account/report/account_journal.py
+4 -1
View File
@@ -60,12 +60,15 @@ class journal_print(report_sxw.rml_parse, common_report_header):
self.query_get_clause = ''
self.target_move = data['form'].get('target_move', 'all')
if (data['model'] == 'ir.ui.menu'):
self.period_ids = tuple(data['form']['periods'])
self.journal_ids = tuple(data['form']['journal_ids'])
new_ids = data['form'].get('active_ids', [])
self.query_get_clause = 'AND '
self.query_get_clause += obj_move._query_get(self.cr, self.uid, obj='l', context=data['form'].get('used_context', {}))
self.sort_selection = data['form'].get('sort_selection', 'date')
objects = self.pool.get('account.journal.period').browse(self.cr, self.uid, new_ids)
if new_ids:
elif new_ids:
#in case of direct access from account.journal.period object, we need to set the journal_ids and periods_ids
self.cr.execute('SELECT period_id, journal_id FROM account_journal_period WHERE id IN %s', (tuple(new_ids),))
res = self.cr.fetchall()
self.period_ids, self.journal_ids = zip(*res)
addons/account/report/account_journal.rml
+3 -3
View File
@@ -209,9 +209,9 @@
<para style="P9">
<font color="white"> </font>
</para>
<para style="Standard"><font color="white">[[lines(o.period_id.id, o.journal_id.id) or removeParentNode('story') ]][[ set_last_move_id(False)]]</font></para>
<para style="Standard"><font color="white">[[ set_last_move_id(False)]]</font></para>
<section>
<para style="Standard"><font color="white">[[ display_currency(data) == False or removeParentNode('section') ]]</font></para>
[[ display_currency(data) == False or removeParentNode('section') ]]
<blockTable rowHeights="0.55cm" colWidths="55.0,45.0,50.0,95.0,160.0,70.0,70.0" style="Table1">
<tr>
<td><para style="P10a">Move</para></td>
@@ -257,7 +257,7 @@
</section>
<section>
<para style="Standard"><font color="white">[[ display_currency(data) or removeParentNode('section') ]]</font></para>
[[ display_currency(data) or removeParentNode('section') ]]
<blockTable rowHeights="0.55cm" colWidths="55.0,45.0,50.0,70.0,130.0,70.0,70.0,70.0" style="Table1">
<tr>
<td><para style="P10a">Move</para></td>
addons/account/report/account_journal_sale_purchase.rml
+12 -12
View File
@@ -209,10 +209,10 @@
<para style="P9">
<font color="white"> </font>
</para>
<para style="Standard"><font color="white">[[lines(o.period_id.id, o.journal_id.id) or removeParentNode('story') ]][[ set_last_move_id(False)]]</font></para>
<para style="Standard"><font color="white">[[ set_last_move_id(False) ]]</font></para>
<section>
<para style="Standard"><font color="white">[[ display_currency(data) == False or removeParentNode('section') ]]</font></para>
<blockTable rowHeights="0.55cm" colWidths="55.0,45.0,50.0,80.0,110.0,15.0,50.0,70.0,70.0" style="Table1">
[[ display_currency(data) == False or removeParentNode('section') ]]
<blockTable rowHeights="0.55cm" colWidths="55.0,45.0,50.0,60.0,110.0,15.0,70.0,70.0,70.0" style="Table1">
<tr>
<td><para style="P10a">Move</para></td>
<td><para style="P10a">Date</para></td>
@@ -232,12 +232,12 @@
<td><para style="P8">[[ not check_last_move_id(line.move_id.id) and removeParentNode('blockTable') ]]</para></td>
</tr>
</blockTable>
<blockTable rowHeights="0.55cm" colWidths="55.0,45.0,50.0,80.0,110.0,15.0,50.0,70.0,70.0" style="Table_no_lines">
<blockTable rowHeights="0.55cm" colWidths="55.0,45.0,50.0,60.0,110.0,15.0,70.0,70.0,70.0" style="Table_no_lines">
<tr>
<td><para style="terp_default_8">[[ line.move_id.name &lt;&gt; '/' and line.move_id.name or ('*'+str(line.move_id.id)) ]]</para></td>
<td><para style="terp_default_8">[[ formatLang(line.date,date=True) ]]</para></td>
<td><para style="terp_default_8">[[ line.account_id.code ]]</para></td>
<td><para style="terp_default_8">[[ line.partner_id and strip_name(line.partner_id.name,17) ]]</para></td>
<td><para style="terp_default_8">[[ line.partner_id and strip_name(line.partner_id.name,15) ]]</para></td>
<td><para style="terp_default_8">[[ strip_name(line.name,25) ]]</para></td>
<td><para style="P8">[[ line.tax_code_id and (line.tax_code_id.code + ':') ]]</para></td>
<td><para style="terp_default_8">[[ line.tax_amount and formatLang(line.tax_amount, currency_obj=company.currency_id) ]]</para></td>
@@ -247,7 +247,7 @@
</blockTable>
<para style="terp_default_8">[[ set_last_move_id(line.move_id.id) ]]</para>
</section>
<blockTable rowHeights="0.55cm" colWidths="55.0,45.0,50.0,80.0,110.0,15.0,50.0,70.0,70.0" style="Table4Total">
<blockTable rowHeights="0.55cm" colWidths="55.0,45.0,50.0,60.0,110.0,15.0,70.0,70.0,70.0" style="Table4Total">
<tr>
<td><para style="P11"></para></td>
<td><para style="P11"></para></td>
@@ -263,8 +263,8 @@
</section>
<section>
<para style="Standard"><font color="white">[[ display_currency(data) or removeParentNode('section') ]]</font></para>
<blockTable rowHeights="0.55cm" colWidths="55.0,45.0,50.0,70.0,70.0,10.0,50.0,70.0,70.0,70.0" style="Table1">
[[ display_currency(data) or removeParentNode('section') ]]
<blockTable rowHeights="0.55cm" colWidths="55.0,45.0,50.0,50.0,70.0,10.0,70.0,70.0,70.0,70.0" style="Table1">
<tr>
<td><para style="P10a">Move</para></td>
<td><para style="P10a">Date</para></td>
@@ -285,13 +285,13 @@
<td><para style="P8">[[ not check_last_move_id(line.move_id.id) and removeParentNode('blockTable') ]]</para></td>
</tr>
</blockTable>
<blockTable rowHeights="0.55cm" colWidths="55.0,45.0,50.0,70.0,70.0,10.0,50.0,70.0,70.0,70.0" style="Table_no_lines">
<blockTable rowHeights="0.55cm" colWidths="55.0,45.0,50.0,50.0,70.0,10.0,70.0,70.0,70.0,70.0" style="Table_no_lines">
<tr>
<td><para style="terp_default_8">[[ line.move_id.name &lt;&gt; '/' and line.move_id.name or ('*'+str(line.move_id.id)) ]]</para></td>
<td><para style="terp_default_8">[[ formatLang(line.date,date=True) ]]</para></td>
<td><para style="terp_default_8">[[ line.account_id.code ]]</para></td>
<td><para style="terp_default_8">[[ line.partner_id and strip_name(line.partner_id.name,17) ]]</para></td>
<td><para style="terp_default_8">[[ strip_name(line.name,17) ]]</para></td>
<td><para style="terp_default_8">[[ line.partner_id and strip_name(line.partner_id.name,12) ]]</para></td>
<td><para style="terp_default_8">[[ strip_name(line.name,16) ]]</para></td>
<td><para style="terp_default_8">[[ line.tax_code_id and (line.tax_code_id.code + ':') ]]</para></td>
<td><para style="P8">[[ line.tax_amount and formatLang(line.tax_amount, currency_obj=company.currency_id) ]]</para></td>
<td><para style="P8">[[ formatLang(line.debit, currency_obj=company.currency_id) ]]</para></td>
@@ -301,7 +301,7 @@
</blockTable>
<para style="terp_default_8">[[ set_last_move_id(line.move_id.id) ]]</para>
</section>
<blockTable rowHeights="0.55cm" colWidths="55.0,45.0,50.0,70.0,70.0,10.0,50.0,70.0,70.0,70.0" style="Table4Total">
<blockTable rowHeights="0.55cm" colWidths="55.0,45.0,50.0,50.0,70.0,10.0,70.0,70.0,70.0,70.0" style="Table4Total">
<tr>
<td><para style="P11"></para></td>
<td><para style="P11"></para></td>
addons/account/wizard/account_report_common_journal.py
+5 -2
View File
@@ -29,13 +29,16 @@ class account_common_journal_report(osv.osv_memory):
'amount_currency': fields.boolean("With Currency", help="Print Report with the currency column if the currency is different then the company currency"),
}
def _build_context(self, cr, uid, ids, data, context=None):
def _build_contexts(self, cr, uid, ids, data, context=None):
if context is None:
context = {}
result = super(account_common_journal_report, self)._build_context(cr, uid, ids, data, context=context)
result = super(account_common_journal_report, self)._build_contexts(cr, uid, ids, data, context=context)
if data['form']['filter'] == 'filter_date':
cr.execute('SELECT period_id FROM account_move_line WHERE date >= %s AND date <= %s', (data['form']['date_from'], data['form']['date_to']))
result['periods'] = map(lambda x: x[0], cr.fetchall())
elif data['form']['filter'] == 'filter_period':
result['periods'] = self.pool.get('account.period').build_ctx_periods(cr, uid, data['form']['period_from'], data['form']['period_to'])
return result
def pre_print_report(self, cr, uid, ids, data, context=None):
addons/base_calendar/base_calendar.py
+1 -1
View File
@@ -1426,7 +1426,7 @@ rule or repeating pattern of time to exclude from the recurring rule."),
context = {}
fields2 = fields and fields[:] or None
EXTRAFIELDS = ('class','user_id','date','duration')
EXTRAFIELDS = ('class','user_id','duration')
for f in EXTRAFIELDS:
if fields and (f not in fields):
fields2.append(f)
addons/hr_evaluation/security/hr_evaluation_security.xml
+5
View File
@@ -50,5 +50,10 @@
<field name="groups" eval="[(4, ref('base.group_hr_user'))]"/>
</record>
<!-- make Employee users Survey users -->
<record id="base.group_user" model="res.groups">
<field name="implied_ids" eval="[(4, ref('base.group_survey_user'))]"/>
</record>
</data>
</openerp>
addons/hr_evaluation/security/ir.model.access.csv
+1 -1
View File
@@ -1,6 +1,6 @@
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
access_hr_evaluation_evaluation_user,hr_evaluation.evaluation.user,model_hr_evaluation_evaluation,base.group_hr_user,1,1,1,1
access_hr_evaluation_evaluation_employee,hr_evaluation.evaluation.employee,model_hr_evaluation_evaluation,base.group_user,1,0,0,0
access_hr_evaluation_evaluation_employee,hr_evaluation.evaluation.employee,model_hr_evaluation_evaluation,base.group_user,1,1,1,0
access_hr_evaluation_plan_user,hr_evaluation.plan.user,model_hr_evaluation_plan,base.group_hr_user,1,1,1,1
access_hr_evaluation_plan_phase_user,hr_evaluation.plan.phase.user,model_hr_evaluation_plan_phase,base.group_hr_user,1,1,1,1
access_hr_evaluation_interview_user,hr.evaluation.interview.user,model_hr_evaluation_interview,base.group_hr_user,1,1,1,1
1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
2 access_hr_evaluation_evaluation_user hr_evaluation.evaluation.user model_hr_evaluation_evaluation base.group_hr_user 1 1 1 1
3 access_hr_evaluation_evaluation_employee hr_evaluation.evaluation.employee model_hr_evaluation_evaluation base.group_user 1 0 1 0 1 0
4 access_hr_evaluation_plan_user hr_evaluation.plan.user model_hr_evaluation_plan base.group_hr_user 1 1 1 1
5 access_hr_evaluation_plan_phase_user hr_evaluation.plan.phase.user model_hr_evaluation_plan_phase base.group_hr_user 1 1 1 1
6 access_hr_evaluation_interview_user hr.evaluation.interview.user model_hr_evaluation_interview base.group_hr_user 1 1 1 1
addons/l10n_be/l10n_be_sequence.xml
+7 -6
View File
@@ -2,9 +2,10 @@
<openerp>
<data>
#
# Sequences for controlref will be used in wizard for "Listing of VAT Customers"..in creating xml file
#
<!--
Sequences for controlref will be used in wizard for "Listing of VAT Customers"..in creating xml file
-->
<record model="ir.sequence.type" id="seq_type_controlref">
<field name="name">Controlref</field>
<field name="code">controlref</field>
@@ -15,9 +16,9 @@
<field name="padding">4</field>
</record>
#
# Sequences for declarantnum will be used in wizard for "Listing of VAT Customers"..in creating xml file
#
<!--
Sequences for declarantnum will be used in wizard for "Listing of VAT Customers"..in creating xml file
-->
<record model="ir.sequence.type" id="seq_type_declarantnum">
<field name="name">Declarantnum</field>
<field name="code">declarantnum</field>
addons/l10n_ch/__openerp__.py
+44 -49
View File
@@ -19,9 +19,8 @@
#
##############################################################################
{
"name" : "Switzerland - Accounting",
"description" : """
{"name" : "Switzerland - Accounting",
"description" : """
Swiss localisation :
- DTA generation for a lot of payment types
- BVR management (number generation, report, etc..)
@@ -61,51 +60,47 @@ TODO :
""",
"version" : "6.1",
"author" : "Camptocamp",
'category': 'Localization/Account Charts',
"website": "http://www.camptocamp.com",
"version": "6.1",
"author": "Camptocamp",
'category': 'Localization/Account Charts',
"website": "http://www.camptocamp.com",
"depends" : [
"account_cancel",
"base_iban",
"account_payment",
"account_voucher",
"report_webkit",
],
"init_xml" : [
"dta_data.xml",
"journal_data.xml",
#FR sterchi chart data
'sterchi_chart/account.xml',
'sterchi_chart/vat.xml', #JUST REMOVE THIS FILE WHEN OBSOLETE. ALL REQUIERED DATA IN VAT2011.XML
'sterchi_chart/vat2011.xml',
'sterchi_chart/fiscal_position.xml',
],
"demo_xml" : [
"demo/demo.xml",
"demo/dta_demo.xml",
],
"update_xml" : [
"wizard.xml",
"wizard/bvr_import_view.xml",
"wizard/create_dta_view.xml",
"company_view.xml",
"account_invoice.xml",
"bank_view.xml",
"security/ir.model.access.csv",
"report/report_webkit_html_view.xml",
],
'test' : [
'test/l10n_ch_report.yml',
'test/l10n_ch_dta.yml',
#TODO: uncomment the 2 following tests once they are fixed
#'test/l10n_ch_v11.yml',
#'test/l10n_ch_v11_part.yml',
],
"auto_install": False,
"installable": True,
"certificate" : "001103836064567088989",
'images': ['images/config_chart_l10n_ch.jpeg','images/l10n_ch_chart.jpeg'],
}
"depends" : [ "account_cancel",
"base_iban",
"account_payment",
"account_voucher",
"report_webkit",
"l10n_multilang"],
"init_xml": ["dta_data.xml",
"journal_data.xml",
#FR sterchi chart data
'sterchi_chart/account.xml',
'sterchi_chart/vat.xml',
'sterchi_chart/vat2011.xml',
'sterchi_chart/fiscal_position.xml'],
"demo_xml": ["demo/demo.xml",
"demo/dta_demo.xml"],
"update_xml": ["wizard.xml",
"wizard/bvr_import_view.xml",
"wizard/create_dta_view.xml",
"company_view.xml",
"account_invoice.xml",
"bank_view.xml",
"security/ir.model.access.csv",
"report/report_webkit_html_view.xml"],
"test": ['test/l10n_ch_report.yml',
'test/l10n_ch_dta.yml',
#TODO: uncomment the 2 following tests once they are fixed
#'test/l10n_ch_v11.yml',
#'test/l10n_ch_v11_part.yml'
],
"auto_install": False,
"installable": True,
"certificate": "001103836064567088989",
'images': ['images/config_chart_l10n_ch.jpeg','images/l10n_ch_chart.jpeg']}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/l10n_ch/bank.py
+46 -4
View File
@@ -21,6 +21,7 @@
from tools.translate import _
from osv import fields, osv
import re
class Bank(osv.osv):
"""Inherit res.bank class in order to add swiss specific field"""
@@ -42,8 +43,8 @@ class ResPartnerBank(osv.osv):
_columns = {
'name': fields.char('Description', size=128, required=True),
'post_number': fields.char('Post number', size=64),
'bvr_adherent_num': fields.char('BVR adherent number', size=11),
'post_number': fields.char('Post number', size=64, help="Postal number 0x-xxxxxx-x or xxxxx"),
'bvr_adherent_num': fields.char('Bank BVR adherent number', size=11, help="Your Bank adherent number to be printed in references of your BVR. This is not a postal account number."),
'dta_code': fields.char('DTA code', size=5),
'print_bank': fields.boolean('Print Bank on BVR'),
'print_account': fields.boolean('Print Account Number on BVR'),
@@ -68,11 +69,52 @@ class ResPartnerBank(osv.osv):
def _prepare_name(self, bank):
"Hook to get bank number of bank account"
res = super(ResPartnerBank, self)._prepare_name(bank)
res = u''
if bank.acc_number:
res = super(ResPartnerBank, self)._prepare_name(bank) or u''
if bank.post_number:
res = u"%s - %s" % (res, bank.post_number)
if res:
res = u"%s - %s" % (res, bank.post_number)
else:
res = bank.post_number
return res
def _check_9_pos_postal_num(self, number):
"""
check if a postal number in format xx-xxxxxx-x is correct,
return true if it matches the pattern
and if check sum mod10 is ok
"""
from tools import mod10r
pattern = r'^[0-9]{2}-[0-9]{1,6}-[0-9]$'
if not re.search(pattern, number):
return False
num, checksum = (number.replace('-','')[:-1], number[-1:])
return mod10r(num)[-1:] == checksum
def _check_5_pos_postal_num(self, number):
"""
check if a postal number on 5 positions is correct
"""
pattern = r'^[0-9]{1,5}$'
if not re.search(pattern, number):
return False
return True
def _check_postal_num(self, cursor, uid, ids):
banks = self.browse(cursor, uid, ids)
for b in banks:
if not b.post_number:
return True
return self._check_9_pos_postal_num(b.post_number) or \
self._check_5_pos_postal_num(b.post_number)
_constraints = [(_check_postal_num,
'Please enter a correct postal number. (01-23456-5 or 12345)',
['post_number'])]
_sql_constraints = [('bvr_adherent_uniq', 'unique (bvr_adherent_num)',
'The BVR adherent number must be unique !')]
addons/l10n_ch/bank_view.xml
+8 -6
View File
@@ -130,12 +130,14 @@
</group>
<separator colspan="4" string="Financial institute infos"/>
<newline/>
<field name="my_bank" attrs="{'invisible': [('company_id', '=', False)]}" colspan="4"/>
<group string="BVR print options" colspan="4" attrs="{'invisible': [('my_bank', '!=', True)]}" >
<field name="bvr_adherent_num"/>
<field name="print_bank"/>
<field name="print_account"/>
<newline/>
<group attrs="{'invisible': ['|', ('state', 'not in', ['bvrpost','bvrbank']), ('company_id', '=', False)]}" colspan="4">
<field name="my_bank" attrs="{'invisible': [('company_id', '=', False)]}" />
<group string="BVR print options" colspan="4" attrs="{'invisible': [('my_bank', '!=', True)]}" >
<field name="bvr_adherent_num" attrs="{'invisible': [('state','!=','bvrbank')]}"/>
<field name="print_bank"/>
<field name="print_account"/>
<newline/>
</group>
</group>
<newline/>
<field name="bank" />
addons/l10n_ch/demo/demo.xml
+1 -1
View File
@@ -11,7 +11,7 @@
<field name="acc_number">11-1234-1</field>
<field name="partner_id" ref="base.main_partner"/>
<field name="state">bvrbank</field>
<field name="post_number">11-1234-1</field>
<field name="post_number">70-004152-8</field>
<field name="bank" ref="main_bank"/>
<!-- <field name="iban">CH9100767000S00023455</field> -->
<field name="bvr_adherent_num">0000000</field>
addons/l10n_ch/demo/dta_demo.xml
+1 -1
View File
@@ -12,7 +12,7 @@
<field name="acc_number">123456</field>
<field name="partner_id" ref="base.res_partner_agrolait"/>
<field name="state">bvrbank</field>
<field name="post_number">234567</field>
<field name="post_number">01-23456-5</field>
<field name="bank" ref="partner_bank"/>
<!-- <field name="iban">CH9100767000S00023455</field> -->
</record>
addons/l10n_ch/report/report_webkit_html.py
+9 -13
View File
@@ -124,28 +124,24 @@ class l10n_ch_report_webkit_html(report_sxw.rml_parse):
invoice_obj = pool.get('account.invoice')
ids = invoice_ids
for invoice in invoice_obj.browse(cursor, self.uid, ids):
invoice_name = "%s %s" %(invoice.name, invoice.number)
if not invoice.partner_bank_id:
raise except_osv(_('UserError'),
_('No bank specified on invoice:\n' + \
invoice_obj.name_get(cursor, self.uid, [invoice.id],
context={})[0][1]))
_('No bank specified on invoice:\n%s' %(invoice_name)))
if not self._compile_check_bvr.match(
invoice.partner_bank_id.post_number or ''):
raise except_osv(_('UserError'),
_('Your bank BVR number should be of the form 0X-XXX-X! ' +
'Please check your company ' +
'information for the invoice:\n' +
invoice_obj.name_get(cursor, self.uid, [invoice.id],
context={})[0][1]))
_(('Your bank BVR number should be of the form 0X-XXX-X! '
'Please check your company '
'information for the invoice:\n%s')
%(invoice_name)))
if invoice.partner_bank_id.bvr_adherent_num \
and not self._compile_check_bvr_add_num.match(
invoice.partner_bank_id.bvr_adherent_num):
raise except_osv(_('UserError'),
_('Your bank BVR adherent number must contain exactly seven' +
'digits!\nPlease check your company ' +
'information for the invoice:\n' +
invoice_obj.name_get(cursor, self.uid, [invoice.id],
context={})[0][1]))
_(('Your bank BVR adherent number must contain only '
'digits!\nPlease check your company '
'information for the invoice:\n%s') %(invoice_name)))
return ''
class BVRWebKitParser(webkit_report.WebKitParser):
addons/l10n_ch/sterchi_chart/account.xml
+6 -1
View File
@@ -11802,7 +11802,12 @@
<field name="property_account_receivable" ref="ch_1100"/>
<field name="property_account_payable" ref="ch_2000"/>
<field name="property_account_expense_categ" ref="ch_4200"/>
<field name="property_account_income_categ" ref="ch_1000"/>
<field name="property_account_income_categ" ref="ch_3200"/>
<field name="property_account_expense" ref="ch_4200"/>
<field name="property_account_income" ref="ch_3200"/>
<field name="property_account_income_opening" ref="ch_2990"/>
<field name="property_account_expense_opening" ref="ch_2990"/>
<field name="property_reserve_and_surplus_account" ref="ch_2991"/>
</record>
<!-- journal configuration of account -->
addons/l10n_ch/test/l10n_ch_dta.yml
+4 -4
View File
@@ -16,7 +16,7 @@
address_contact_id: base.res_partner_address_8
address_invoice_id: base.res_partner_address_8
reference_type: bvr
reference: 111111111111111111111111111111
reference: 11111111111111111111
date_invoice: !eval "'%s-01-01' %(datetime.now().year)"
period_id: account.period_1
#invoice_line:
@@ -65,7 +65,7 @@
amount_currency: 7000
bank_id: l10n_ch.agro_bank
#bank_statement_line_id
communication: "111111111111111111111111111111"
communication: "11111111111111111111"
#communication2
company_currency: base.EUR
#create_date
@@ -76,7 +76,7 @@
#ml_date_created
#ml_inv_ref
#ml_maturity_date
move_line_id: !ref {model: account.move.line, search: "[('ref','=','111111111111111111111111111111')]"}
move_line_id: !ref {model: account.move.line, search: "[('ref','=','11111111111111111111')]"}
#name (reference)
order_id: dta_payment_order
partner_id: base.res_partner_agrolait
@@ -152,7 +152,7 @@
# wiz = self.browse(cr, uid, wiz_id)
#
# line_obj = self.pool.get('payment.line')
# pay_line_ids = line_obj.search(cr, uid, [('communication','=','111111111111111111111111111111'),('amount','=','7000')])
# pay_line_ids = line_obj.search(cr, uid, [('communication','=','11111111111111111111'),('amount','=','7000')])
#
# data = { 'lines': [(6, 0, [pay_line_ids[0]])],}
# wiz.write(data)
addons/l10n_ch/wizard/bvr_import.py
+4 -1
View File
@@ -71,6 +71,9 @@ def _import(self, cursor, user, data, context=None):
statement_obj = self.pool.get('account.bank.statement')
property_obj = self.pool.get('ir.property')
file = data['form']['file']
if not file:
raise osv.except_osv(_('UserError'),
_('Please select a file first!'))
statement_id = data['id']
records = []
total_amount = 0
@@ -239,7 +242,7 @@ def _import(self, cursor, user, data, context=None):
class bvr_import_wizard(osv.osv_memory):
_name = 'bvr.import.wizard'
_columns = {
'file':fields.binary('BVR File', readonly=True)
'file':fields.binary('BVR File')
}
def import_bvr(self, cr, uid, ids, context=None):
addons/l10n_ch/wizard/create_dta.py
+61 -13
View File
@@ -28,6 +28,8 @@ import pooler
from tools.translate import _
import unicode2ascii
import re
TRANS=[
(u'é','e'),
(u'è','e'),
@@ -346,6 +348,14 @@ def c_ljust(s, size):
s = s.decode('utf-8').encode('latin1','replace').ljust(size)
return s
def _is_9_pos_bvr_adherent(adherent_num):
"""
from a bvr adherent number,
return true if
"""
pattern = r'[0-9]{2}-[0-9]{1,6}-[0-9]'
return re.search(pattern, adherent_num)
def _create_dta(obj, cr, uid, data, context=None):
v = {}
v['uid'] = str(uid)
@@ -435,10 +445,24 @@ def _create_dta(obj, cr, uid, data, context=None):
or False
v['partner_bvr'] = pline.bank_id.post_number or ''
if v['partner_bvr']:
v['partner_bvr'] = v['partner_bvr'].replace('-','')
if len(v['partner_bvr']) < 9:
v['partner_bvr'] = v['partner_bvr'][:2] + '0' * \
(9 - len(v['partner_bvr'])) + v['partner_bvr'][2:]
is_9_pos_adherent = None
# if adherent bvr number is a 9 pos number
# add 0 to fill 2nd part plus remove '-'
# exemple: 12-567-C becomes 12000567C
if _is_9_pos_bvr_adherent(v['partner_bvr']):
parts = v['partner_bvr'].split('-')
parts[1] = parts[1].rjust(6, '0')
v['partner_bvr'] = ''.join(parts)
is_9_pos_adherent = True
# add 4*0 to bvr adherent number with 5 pos
# exemple: 12345 becomes 000012345
elif len(v['partner_bvr']) == 5:
v['partner_bvr'] = v['partner_bvr'].rjust(9, '0')
is_9_pos_adherent = False
else:
raise osv.except_osv(_('Error'),
_('Wrong postal number format.\n'
'It must be 12-123456-9 or 12345 format'))
if pline.bank_id.bank:
v['partner_bank_city'] = pline.bank_id.bank.city or False
@@ -518,15 +542,39 @@ def _create_dta(obj, cr, uid, data, context=None):
elif elec_pay == 'bvrbank' or elec_pay == 'bvrpost':
from tools import mod10r
if v['reference']:
v['reference'] = v['reference'].replace(' ',
'').rjust(27).replace(' ', '0')
if not v['reference'] \
or (mod10r(v['reference'][:-1]) != v['reference'] and \
not len(v['reference']) == 15):
raise osv.except_osv(_('Error'), _('You must provide ' \
'a valid BVR reference number \n' \
'for the line: %s') % pline.name)
if not v['reference']:
raise osv.except_osv(_('Error'),
_('You must provide ' \
'a BVR reference number \n' \
'for the line: %s') % pline.name)
v['reference'] = v['reference'].replace(' ', '')
if is_9_pos_adherent:
if len(v['reference']) > 27:
raise osv.except_osv(_('Error'),
_('BVR reference number is not valid \n'
'for the line: %s. \n'
'Reference is too long.') % pline.name)
# do a mod10 check
if mod10r(v['reference'][:-1]) != v['reference']:
raise osv.except_osv(_('Error'),
_('BVR reference number is not valid \n'
'for the line: %s. \n'
'Mod10 check failed') % pline.name)
# fill reference with 0
v['reference'] = v['reference'].rjust(27, '0')
else:
# reference of BVR adherent with 5 positions number
# have 15 positions references
if len(v['reference']) > 15:
raise osv.except_osv(_('Error'),
_('BVR reference number is not valid \n'
'for the line: %s. \n'
'Reference is too long '
'for this type of beneficiary.') % pline.name)
# complete 15 first digit with 0 on left and complete 27 digits with trailing spaces
# exemple: 123456 becomes 00000000012345____________
v['reference'] = v['reference'].rjust(15, '0').ljust(27, ' ')
if not v['partner_bvr']:
raise osv.except_osv(_('Error'), _('You must provide a BVR number\n'
'for the bank account: %s' \
addons/l10n_ch/wizard/create_dta_view.xml
+1 -2
View File
@@ -8,8 +8,7 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="DTA file creation - Results">
<group width="300" colspan="4">
<separator string="Create DTA - (DTA file will appear after you click on create)" colspan="4"/>
<group colspan="4">
<field name="dta_file"/>
<group colspan="4">
<button special="cancel" string="Cancel" icon="gtk-cancel" colspan="2"/>
addons/point_of_sale/static/src/js/pos.js
-1
View File
@@ -1086,7 +1086,6 @@ openerp.point_of_sale = function(db) {
},
print: function() {
window.print();
this.finishOrder();
},
finishOrder: function() {
this.shop.get('selectedOrder').destroy();
addons/project/i18n/ar.po
+186 -120
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-12-24 05:37+0000\n"
"X-Generator: Launchpad (build 14560)\n"
"X-Launchpad-Export-Date: 2012-02-07 04:51+0000\n"
"X-Generator: Launchpad (build 14747)\n"
#. module: project
#: view:report.project.task.user:0
@@ -44,6 +44,7 @@ msgstr ""
#: constraint:res.users:0
msgid "The chosen company is not in the allowed companies for this user"
msgstr ""
"الشركة المختارة غير مدرجة ضمن قائمة الشركات المسموح بها لهذا المستخدم"
#. module: project
#: view:report.project.task.user:0
@@ -58,7 +59,7 @@ msgstr ""
#. module: project
#: field:project.project,warn_customer:0
msgid "Warn Partner"
msgstr ""
msgstr "أخبر شريك"
#. module: project
#: help:project.task.reevaluate,remaining_hours:0
@@ -94,7 +95,7 @@ msgstr ""
#. module: project
#: field:project.task,work_ids:0
msgid "Work done"
msgstr ""
msgstr "العمل إنتهي"
#. module: project
#: code:addons/project/project.py:315
@@ -125,6 +126,7 @@ msgid ""
"Total remaining time, can be re-estimated periodically by the assignee of "
"the task."
msgstr ""
"إجمالي الوقت المتبقي، يمكن إعادة تقدير من خلال الشخص المحال إليه المهمة."
#. module: project
#: help:project.project,priority:0
@@ -144,7 +146,7 @@ msgstr ""
#. module: project
#: field:project.project,members:0
msgid "Project Members"
msgstr ""
msgstr "أعضاء المشروع"
#. module: project
#: model:process.node,name:project.process_node_taskbydelegate0
@@ -154,7 +156,7 @@ msgstr ""
#. module: project
#: selection:report.project.task.user,month:0
msgid "March"
msgstr ""
msgstr "مارس"
#. module: project
#: view:project.task:0
@@ -164,7 +166,7 @@ msgstr ""
#. module: project
#: field:project.task,child_ids:0
msgid "Delegated Tasks"
msgstr ""
msgstr "المهام المفوضة"
#. module: project
#: help:project.project,warn_header:0
@@ -172,6 +174,7 @@ msgid ""
"Header added at the beginning of the email for the warning message sent to "
"the customer when a task is closed."
msgstr ""
"يوضع تنبيه في أول البريد الإلكتروني كرسالة تحذير للعميل حين إنتهاء المهمة."
#. module: project
#: view:project.task:0
@@ -190,7 +193,7 @@ msgstr ""
#: view:report.project.task.user:0
#: field:report.project.task.user,company_id:0
msgid "Company"
msgstr ""
msgstr "شركة"
#. module: project
#: view:report.project.task.user:0
@@ -205,7 +208,7 @@ msgstr ""
#. module: project
#: field:project.task.type,name:0
msgid "Stage Name"
msgstr ""
msgstr "اسم المرحلة"
#. module: project
#: model:process.transition.action,name:project.process_transition_action_openpendingtask0
@@ -240,7 +243,7 @@ msgstr ""
#. module: project
#: selection:report.project.task.user,priority:0
msgid "Very urgent"
msgstr ""
msgstr "عاجل جداً"
#. module: project
#: help:project.task.delegate,project_id:0
@@ -258,7 +261,7 @@ msgstr ""
#: field:report.project.task.user,day:0
#: field:task.by.days,day:0
msgid "Day"
msgstr ""
msgstr "يوم"
#. module: project
#: model:ir.ui.menu,name:project.menu_project_config_project
@@ -282,12 +285,12 @@ msgstr ""
#: field:project.task.work,task_id:0
#: view:report.project.task.user:0
msgid "Task"
msgstr ""
msgstr "مهمة"
#. module: project
#: view:project.project:0
msgid "Members"
msgstr ""
msgstr "الأعضاء"
#. module: project
#: view:board.board:0
@@ -317,7 +320,7 @@ msgstr ""
#: view:project.task:0
#: field:project.task,notes:0
msgid "Notes"
msgstr ""
msgstr "ملاحظات"
#. module: project
#: view:project.vs.hours:0
@@ -379,19 +382,19 @@ msgstr ""
#: selection:report.project.task.user,state:0
#: selection:task.by.days,state:0
msgid "Cancelled"
msgstr ""
msgstr "ملغي"
#. module: project
#: field:project.task,date_end:0
#: field:report.project.task.user,date_end:0
msgid "Ending Date"
msgstr ""
msgstr "تاريخ الانتهاء"
#. module: project
#: view:project.project:0
#: field:project.project,warn_header:0
msgid "Mail Header"
msgstr ""
msgstr "رأس البريد"
#. module: project
#: view:project.task:0
@@ -412,7 +415,7 @@ msgstr ""
#: model:ir.ui.menu,name:project.menu_definitions
#: view:res.company:0
msgid "Configuration"
msgstr ""
msgstr "إعدادات"
#. module: project
#: view:report.project.task.user:0
@@ -429,12 +432,12 @@ msgstr ""
#: view:project.task:0
#: view:report.project.task.user:0
msgid "Group By..."
msgstr ""
msgstr "تجميع حسب..."
#. module: project
#: field:project.task.work,user_id:0
msgid "Done by"
msgstr ""
msgstr "تم بواسطة"
#. module: project
#: help:project.project,warn_customer:0
@@ -446,7 +449,7 @@ msgstr ""
#. module: project
#: model:project.task.type,name:project.project_tt_testing
msgid "Testing"
msgstr ""
msgstr "الإختبار"
#. module: project
#: code:addons/project/project.py:794
@@ -458,12 +461,12 @@ msgstr ""
#: model:ir.model,name:project.model_account_analytic_account
#: field:project.project,analytic_account_id:0
msgid "Analytic Account"
msgstr ""
msgstr "حساب تحليلي"
#. module: project
#: help:project.task,effective_hours:0
msgid "Computed using the sum of the task work done."
msgstr ""
msgstr "محسوب باستخدام مجموع مهام الأعمال المنتهية."
#. module: project
#: view:project.task:0
@@ -475,13 +478,13 @@ msgstr ""
#: field:project.task,date_deadline:0
#: field:report.project.task.user,date_deadline:0
msgid "Deadline"
msgstr ""
msgstr "الموعد النهائي"
#. module: project
#: view:project.task.delegate:0
#: view:project.task.reevaluate:0
msgid "_Cancel"
msgstr ""
msgstr "_إلغاء"
#. module: project
#: view:project.task.history.cumulative:0
@@ -496,14 +499,14 @@ msgstr ""
#. module: project
#: constraint:account.analytic.account:0
msgid "Error! You can not create recursive analytic accounts."
msgstr ""
msgstr "خطأ! لا يمكنك إنشاء حسابات تحليلية متكررة."
#. module: project
#: code:addons/project/project.py:221
#: code:addons/project/project.py:260
#, python-format
msgid " (copy)"
msgstr ""
msgstr " (نسخ)"
#. module: project
#: view:project.task:0
@@ -520,7 +523,7 @@ msgstr ""
#: selection:project.task,priority:0
#: selection:report.project.task.user,priority:0
msgid "Low"
msgstr ""
msgstr "منخفض"
#. module: project
#: field:project.vs.hours,user_id:0
@@ -536,7 +539,7 @@ msgstr ""
#. module: project
#: sql_constraint:res.users:0
msgid "You can not have two users with the same login !"
msgstr ""
msgstr "لا يمكن ان يكون هناك مستخدمان بنفس اسم الدخول!"
#. module: project
#: view:project.project:0
@@ -546,22 +549,22 @@ msgstr ""
#. module: project
#: selection:project.vs.hours,state:0
msgid "Template"
msgstr ""
msgstr "قالب"
#. module: project
#: model:ir.actions.act_window,name:project.act_my_project
msgid "My projects"
msgstr ""
msgstr "مشاريعي"
#. module: project
#: constraint:res.company:0
msgid "Error! You can not create recursive companies."
msgstr ""
msgstr "خطأ! لا يمكنك إنشاء شركات متداخلة (شركات تستخدم نفسها)."
#. module: project
#: view:project.task:0
msgid "Next"
msgstr ""
msgstr "التالي"
#. module: project
#: model:process.transition,note:project.process_transition_draftopentask0
@@ -587,7 +590,7 @@ msgstr ""
#. module: project
#: help:project.project,progress_rate:0
msgid "Percent of tasks closed according to the total of tasks todo."
msgstr ""
msgstr "نسبة المهام المغلقة وفقاً لمجموع المهام المطلوب تنفيذها."
#. module: project
#: view:project.task.delegate:0
@@ -611,7 +614,7 @@ msgstr ""
#. module: project
#: help:project.task,total_hours:0
msgid "Computed as: Time Spent + Remaining Time."
msgstr ""
msgstr "حسابها كالتالي: الوقت المستغرق + الوقت المتبقي"
#. module: project
#: model:ir.actions.act_window,name:project.action_view_task_history_cumulative
@@ -650,7 +653,7 @@ msgstr ""
#: selection:project.task,priority:0
#: selection:report.project.task.user,priority:0
msgid "Medium"
msgstr ""
msgstr "وسط"
#. module: project
#: view:project.task:0
@@ -666,7 +669,7 @@ msgstr ""
#: view:report.project.task.user:0
#: field:report.project.task.user,remaining_hours:0
msgid "Remaining Hours"
msgstr ""
msgstr "الساعات المتبقية"
#. module: project
#: model:ir.model,name:project.model_mail_compose_message
@@ -690,12 +693,12 @@ msgstr ""
#: field:project.task.history,planned_hours:0
#: field:project.task.history.cumulative,planned_hours:0
msgid "Planned Time"
msgstr ""
msgstr "الوقت المخطط"
#. module: project
#: view:project.task:0
msgid "Information"
msgstr ""
msgstr "معلومات"
#. module: project
#: view:project.task:0
@@ -728,7 +731,7 @@ msgstr ""
#: selection:report.project.task.user,state:0
#: selection:task.by.days,state:0
msgid "Pending"
msgstr ""
msgstr "معلّق"
#. module: project
#: field:project.task.delegate,name:0
@@ -745,12 +748,12 @@ msgstr ""
#. module: project
#: view:project.task:0
msgid "Extra Info"
msgstr ""
msgstr "معلومات إضافية"
#. module: project
#: selection:report.project.task.user,month:0
msgid "July"
msgstr ""
msgstr "يوليو"
#. module: project
#: view:project.task.history.burndown:0
@@ -761,7 +764,7 @@ msgstr ""
#: field:project.task,date_start:0
#: field:report.project.task.user,date_start:0
msgid "Starting Date"
msgstr ""
msgstr "تاريخ البدء"
#. module: project
#: code:addons/project/project.py:281
@@ -771,7 +774,7 @@ msgstr ""
#: field:project.task.type,project_ids:0
#, python-format
msgid "Projects"
msgstr ""
msgstr "المشروعات"
#. module: project
#: view:project.task:0
@@ -781,7 +784,7 @@ msgstr ""
#: view:report.project.task.user:0
#: field:report.project.task.user,type_id:0
msgid "Stage"
msgstr ""
msgstr "مرحلة"
#. module: project
#: model:ir.actions.act_window,help:project.open_task_type_form
@@ -800,7 +803,7 @@ msgstr ""
#. module: project
#: view:project.task:0
msgid "Dates"
msgstr ""
msgstr "تواريخ"
#. module: project
#: help:project.task.delegate,name:0
@@ -828,12 +831,12 @@ msgstr ""
#. module: project
#: selection:report.project.task.user,month:0
msgid "January"
msgstr ""
msgstr "يناير"
#. module: project
#: field:project.task,delay_hours:0
msgid "Delay Hours"
msgstr ""
msgstr "ساعات تأخير"
#. module: project
#: selection:project.task,priority:0
@@ -860,7 +863,7 @@ msgstr ""
#: view:report.project.task.user:0
#: field:report.project.task.user,partner_id:0
msgid "Partner"
msgstr ""
msgstr "شريك"
#. module: project
#: model:ir.model,name:project.model_project_project
@@ -877,7 +880,7 @@ msgstr ""
#: field:res.users,context_project_id:0
#: field:task.by.days,project_id:0
msgid "Project"
msgstr ""
msgstr "مشروع"
#. module: project
#: view:project.task.reevaluate:0
@@ -893,7 +896,7 @@ msgstr ""
#: model:ir.actions.act_window,name:project.open_task_type_form
#: model:ir.ui.menu,name:project.menu_task_types_view
msgid "Stages"
msgstr ""
msgstr "مراحل"
#. module: project
#: view:project.task:0
@@ -904,7 +907,7 @@ msgstr ""
#: model:ir.actions.todo.category,name:project.category_project_config
#: view:res.company:0
msgid "Project Management"
msgstr ""
msgstr "إدارة المشاريع"
#. module: project
#: field:res.company,project_time_mode_id:0
@@ -933,12 +936,12 @@ msgstr ""
#: view:res.partner:0
#: field:res.partner,task_ids:0
msgid "Tasks"
msgstr ""
msgstr "مهام"
#. module: project
#: view:project.project:0
msgid "Parent"
msgstr ""
msgstr "الرئيسي"
#. module: project
#: view:project.task:0
@@ -961,17 +964,17 @@ msgstr ""
#. module: project
#: selection:report.project.task.user,month:0
msgid "September"
msgstr ""
msgstr "سبتمبر"
#. module: project
#: selection:report.project.task.user,month:0
msgid "December"
msgstr ""
msgstr "ديسمبر"
#. module: project
#: field:project.task,progress:0
msgid "Progress (%)"
msgstr ""
msgstr "نسبة التقدم (%)"
#. module: project
#: help:project.task,state:0
@@ -993,7 +996,7 @@ msgstr ""
#: view:report.project.task.user:0
#: field:report.project.task.user,month:0
msgid "Month"
msgstr ""
msgstr "شهر"
#. module: project
#: model:ir.actions.act_window,name:project.dblc_proj
@@ -1018,7 +1021,7 @@ msgstr ""
#: view:report.project.task.user:0
#: field:report.project.task.user,hours_planned:0
msgid "Planned Hours"
msgstr ""
msgstr "الساعات المخططة"
#. module: project
#: model:ir.actions.act_window,name:project.action_review_task_stage
@@ -1039,12 +1042,12 @@ msgstr ""
#: view:project.project:0
#: view:project.task:0
msgid "Start Date"
msgstr ""
msgstr "تاريخ البدء"
#. module: project
#: view:project.task:0
msgid "Previous"
msgstr ""
msgstr "السابق"
#. module: project
#: selection:project.task,kanban_state:0
@@ -1096,7 +1099,7 @@ msgstr ""
#. module: project
#: view:project.project:0
msgid "Billing"
msgstr ""
msgstr "عمليات الفواتير"
#. module: project
#: view:project.task:0
@@ -1107,7 +1110,7 @@ msgstr ""
#: field:project.task,priority:0
#: field:report.project.task.user,priority:0
msgid "Priority"
msgstr ""
msgstr "أولوية"
#. module: project
#: model:ir.actions.act_window,name:project.open_view_template_project
@@ -1117,7 +1120,7 @@ msgstr ""
#. module: project
#: view:project.project:0
msgid "Administration"
msgstr ""
msgstr "الإدارة"
#. module: project
#: model:ir.model,name:project.model_project_task_reevaluate
@@ -1133,7 +1136,7 @@ msgstr ""
#. module: project
#: view:project.project:0
msgid "Member"
msgstr ""
msgstr "عضو"
#. module: project
#: view:project.task:0
@@ -1154,12 +1157,12 @@ msgstr ""
#: selection:report.project.task.user,state:0
#: selection:task.by.days,state:0
msgid "Draft"
msgstr ""
msgstr "مسودة"
#. module: project
#: view:project.project:0
msgid "Invoice Address"
msgstr ""
msgstr "عنوان الفاتورة"
#. module: project
#: field:project.task,kanban_state:0
@@ -1171,7 +1174,7 @@ msgstr ""
#. module: project
#: view:project.project:0
msgid "Performance"
msgstr ""
msgstr "الأداء"
#. module: project
#: model:ir.actions.act_window,help:project.action_project_task_user_tree
@@ -1197,7 +1200,7 @@ msgstr ""
#: view:project.project:0
#: field:project.task,manager_id:0
msgid "Project Manager"
msgstr ""
msgstr "مدير المشروع"
#. module: project
#: view:project.task:0
@@ -1213,7 +1216,7 @@ msgstr ""
#. module: project
#: selection:report.project.task.user,month:0
msgid "August"
msgstr ""
msgstr "أغسطس"
#. module: project
#: view:project.task:0
@@ -1227,7 +1230,7 @@ msgstr ""
#: view:project.project:0
#: field:project.project,complete_name:0
msgid "Project Name"
msgstr ""
msgstr "اسم المشروع"
#. module: project
#: model:ir.model,name:project.model_project_task_history
@@ -1251,18 +1254,18 @@ msgstr ""
#. module: project
#: selection:report.project.task.user,month:0
msgid "June"
msgstr ""
msgstr "يونيو"
#. module: project
#: field:project.project,total_hours:0
msgid "Total Time"
msgstr ""
msgstr "إجمالي الوقت"
#. module: project
#: view:report.project.task.user:0
#: field:report.project.task.user,closing_days:0
msgid "Days to Close"
msgstr ""
msgstr "الأيام للغلق"
#. module: project
#: model:ir.actions.act_window,name:project.open_board_project
@@ -1283,18 +1286,18 @@ msgstr ""
#. module: project
#: field:project.project,active:0
msgid "Active"
msgstr ""
msgstr "نشط"
#. module: project
#: view:report.project.task.user:0
#: field:report.project.task.user,opening_days:0
msgid "Days to Open"
msgstr ""
msgstr "الأيام للفتح"
#. module: project
#: selection:report.project.task.user,month:0
msgid "November"
msgstr ""
msgstr "نوفمبر"
#. module: project
#: model:ir.actions.act_window,name:project.action_create_initial_projects_installer
@@ -1320,7 +1323,7 @@ msgstr ""
#. module: project
#: selection:report.project.task.user,month:0
msgid "October"
msgstr ""
msgstr "أكتوبر"
#. module: project
#: view:project.task:0
@@ -1340,7 +1343,7 @@ msgstr ""
#. module: project
#: model:ir.model,name:project.model_res_users
msgid "res.users"
msgstr ""
msgstr "res.users"
#. module: project
#: help:project.project,active:0
@@ -1352,12 +1355,12 @@ msgstr ""
#. module: project
#: view:project.task:0
msgid "Users"
msgstr ""
msgstr "المستخدمون"
#. module: project
#: model:ir.model,name:project.model_res_company
msgid "Companies"
msgstr ""
msgstr "الشركات"
#. module: project
#: view:project.project:0
@@ -1380,26 +1383,26 @@ msgstr ""
#: field:project.task.history.cumulative,date:0
#: field:project.task.work,date:0
msgid "Date"
msgstr ""
msgstr "تاريخ"
#. module: project
#: model:ir.ui.menu,name:project.next_id_86
msgid "Dashboard"
msgstr ""
msgstr "اللوحة الرئيسية"
#. module: project
#: constraint:account.analytic.account:0
msgid ""
"Error! The currency has to be the same as the currency of the selected "
"company"
msgstr ""
msgstr "خطأ! العملة لابد و أن تكون مثل العملة للشركة المختارة"
#. module: project
#: code:addons/project/wizard/mail_compose_message.py:43
#: code:addons/project/wizard/mail_compose_message.py:45
#, python-format
msgid "Error"
msgstr ""
msgstr "خطأ"
#. module: project
#: model:ir.actions.act_window,name:project.act_res_users_2_project_project
@@ -1424,18 +1427,18 @@ msgstr ""
#. module: project
#: field:project.task,delegated_user_id:0
msgid "Delegated To"
msgstr ""
msgstr "مفوَّض إلى"
#. module: project
#: view:res.partner:0
msgid "History"
msgstr ""
msgstr "محفوظات"
#. module: project
#: field:project.task,user_id:0
#: view:report.project.task.user:0
msgid "Assigned to"
msgstr ""
msgstr "مكلف إلى"
#. module: project
#: help:project.task,planned_hours:0
@@ -1443,6 +1446,8 @@ msgid ""
"Estimated time to do the task, usually set by the project manager when the "
"task is in draft state."
msgstr ""
"الوقت التقديري لإنجاز المهمة، يضعها في العادة مدير المشروع عندما تكون المهمة "
"في حالة المسودة."
#. module: project
#: help:project.task.delegate,prefix:0
@@ -1452,7 +1457,7 @@ msgstr ""
#. module: project
#: view:report.project.task.user:0
msgid "Extended Filters..."
msgstr ""
msgstr "مرشحات مفصلة..."
#. module: project
#: code:addons/project/project.py:1113
@@ -1478,7 +1483,7 @@ msgstr ""
#: field:report.project.task.user,state:0
#: field:task.by.days,state:0
msgid "State"
msgstr ""
msgstr "الحالة"
#. module: project
#: code:addons/project/project.py:890
@@ -1517,7 +1522,7 @@ msgstr ""
#: view:res.partner:0
#: selection:task.by.days,state:0
msgid "Done"
msgstr ""
msgstr "تم"
#. module: project
#: model:process.transition.action,name:project.process_transition_action_draftcanceltask0
@@ -1525,12 +1530,12 @@ msgstr ""
#: view:project.project:0
#: view:project.task:0
msgid "Cancel"
msgstr ""
msgstr "إلغاء"
#. module: project
#: selection:project.vs.hours,state:0
msgid "Close"
msgstr ""
msgstr "إغلاق"
#. module: project
#: code:addons/project/project.py:816
@@ -1543,7 +1548,7 @@ msgstr ""
#: view:project.project:0
#: selection:project.vs.hours,state:0
msgid "Open"
msgstr ""
msgstr "فتح"
#. module: project
#: view:project.project:0
@@ -1559,7 +1564,7 @@ msgstr ""
#: selection:report.project.task.user,state:0
#: selection:task.by.days,state:0
msgid "In Progress"
msgstr ""
msgstr "قيد التقدم"
#. module: project
#: view:project.task.history.cumulative:0
@@ -1588,7 +1593,7 @@ msgstr ""
#: field:project.task.history,user_id:0
#: field:project.task.history.cumulative,user_id:0
msgid "Responsible"
msgstr ""
msgstr "مسؤول"
#. module: project
#: field:project.project,resource_calendar_id:0
@@ -1627,7 +1632,7 @@ msgstr ""
#: selection:project.task,priority:0
#: selection:report.project.task.user,priority:0
msgid "Very Low"
msgstr ""
msgstr "منخفض جداً"
#. module: project
#: help:project.project,resource_calendar_id:0
@@ -1637,12 +1642,12 @@ msgstr ""
#. module: project
#: field:project.project,warn_manager:0
msgid "Warn Manager"
msgstr ""
msgstr "تحذير المدير"
#. module: project
#: field:report.project.task.user,delay_endings_days:0
msgid "Overpassed Deadline"
msgstr ""
msgstr "تخطي الموعد النهائي"
#. module: project
#: model:ir.actions.act_window,name:project.action_view_task_tree_deadline
@@ -1652,8 +1657,8 @@ msgstr ""
#. module: project
#: help:project.task,delay_hours:0
msgid ""
"Computed as difference of the time estimated by the project manager and the "
"real time to close the task."
"Computed as difference between planned hours by the project manager and the "
"total hours of the task."
msgstr ""
#. module: project
@@ -1664,7 +1669,7 @@ msgstr ""
#. module: project
#: model:project.task.type,name:project.project_tt_development
msgid "Development"
msgstr ""
msgstr "التّطوير"
#. module: project
#: view:board.board:0
@@ -1676,17 +1681,17 @@ msgstr ""
#: view:project.task.type:0
#: field:project.task.type,description:0
msgid "Description"
msgstr ""
msgstr "وصف"
#. module: project
#: selection:report.project.task.user,priority:0
msgid "Urgent"
msgstr ""
msgstr "عاجل"
#. module: project
#: selection:report.project.task.user,month:0
msgid "May"
msgstr ""
msgstr "مايو"
#. module: project
#: view:project.task.delegate:0
@@ -1720,20 +1725,20 @@ msgstr ""
#. module: project
#: field:project.task.delegate,user_id:0
msgid "Assign To"
msgstr ""
msgstr "تعيين لـ"
#. module: project
#: field:project.project,progress_rate:0
#: view:report.project.task.user:0
#: field:report.project.task.user,progress:0
msgid "Progress"
msgstr ""
msgstr "التّقدّم"
#. module: project
#: field:project.project,effective_hours:0
#: field:project.task.work,hours:0
msgid "Time Spent"
msgstr ""
msgstr "الوقت المستغرق"
#. module: project
#: model:ir.actions.act_window,name:project.act_my_account
@@ -1756,6 +1761,8 @@ msgid ""
"If you check this field, the project manager will receive a request each "
"time a task is completed by his team."
msgstr ""
"اذا علمت هذا الحقل، سيستلم مدير المشروع طلب في كل مرة تكتمل فيها مهمة من قبل "
"أعضاء فريقه."
#. module: project
#: help:project.project,total_hours:0
@@ -1777,7 +1784,7 @@ msgstr ""
#. module: project
#: view:project.project:0
msgid "Customer"
msgstr ""
msgstr "عميل"
#. module: project
#: view:project.project:0
@@ -1785,12 +1792,12 @@ msgstr ""
#: field:project.task.history,end_date:0
#: field:project.task.history.cumulative,end_date:0
msgid "End Date"
msgstr ""
msgstr "تاريخ الإنتهاء"
#. module: project
#: selection:report.project.task.user,month:0
msgid "February"
msgstr ""
msgstr "فبراير"
#. module: project
#: model:ir.actions.act_window,name:project.action_task_by_days_graph
@@ -1807,7 +1814,7 @@ msgstr ""
#. module: project
#: view:project.task:0
msgid "Edit"
msgstr ""
msgstr "تحرير"
#. module: project
#: model:process.node,note:project.process_node_opentask0
@@ -1818,7 +1825,7 @@ msgstr ""
#: view:report.project.task.user:0
#: field:report.project.task.user,year:0
msgid "Year"
msgstr ""
msgstr "سنة"
#. module: project
#: view:project.task.history.cumulative:0
@@ -1839,18 +1846,18 @@ msgstr ""
#. module: project
#: selection:report.project.task.user,month:0
msgid "April"
msgstr ""
msgstr "أبريل"
#. module: project
#: field:project.task,effective_hours:0
msgid "Hours Spent"
msgstr ""
msgstr "الوقت المستغرق"
#. module: project
#: view:project.project:0
#: view:project.task:0
msgid "Miscelleanous"
msgstr ""
msgstr "متفرقات"
#. module: project
#: model:process.transition,name:project.process_transition_opendonetask0
@@ -1888,7 +1895,7 @@ msgstr ""
#. module: project
#: field:project.task,id:0
msgid "ID"
msgstr ""
msgstr "معرّف"
#. module: project
#: model:ir.actions.act_window,name:project.action_view_task_history_burndown
@@ -1922,7 +1929,7 @@ msgstr ""
#: field:project.task,sequence:0
#: field:project.task.type,sequence:0
msgid "Sequence"
msgstr ""
msgstr "مسلسل"
#. module: project
#: model:ir.actions.act_window,name:project.action_project_vs_remaining_hours_graph
@@ -1978,12 +1985,12 @@ msgstr ""
#: view:project.project:0
#: model:res.groups,name:project.group_project_manager
msgid "Manager"
msgstr ""
msgstr "مدير"
#. module: project
#: field:project.task,create_date:0
msgid "Create Date"
msgstr ""
msgstr "إنشاء تاريخ"
#. module: project
#: code:addons/project/project.py:855
@@ -2031,3 +2038,62 @@ msgstr ""
#: view:project.task.history.cumulative:0
msgid "In Progress Tasks"
msgstr ""
#~ msgid "Timesheets"
#~ msgstr "الجداول الزمنية"
#~ msgid " Month "
#~ msgstr " شهر "
#~ msgid ""
#~ "Tracks and helps employees encode and validate timesheets and attendances."
#~ msgstr ""
#~ "التعقب ومساعدة الموظفين للترميز والتحقق من صحة الجداول الزمنية والحضور."
#~ msgid " Month-1 "
#~ msgstr " شهر-١ "
#~ msgid "Image"
#~ msgstr "صورة"
#~ msgid "Computed as: Time Spent / Total Time."
#~ msgstr "حسابها كالتالي: الوقت المستغرق / الوقت الإجمالي."
#~ msgid " Year "
#~ msgstr " سنة "
#~ msgid "Long Term Planning"
#~ msgstr "التخطيط طويل الأجل"
#~ msgid "Error ! You can not create recursive associated members."
#~ msgstr "خطأ! لا يمكنك إنشاء أعضاء ذوي ارتباطات متداخلة."
#~ msgid "Configure"
#~ msgstr "تهيئة"
#~ msgid "Manager Email"
#~ msgstr "مدير الإيميل"
#~ msgid "Configuration Progress"
#~ msgstr "سير الإعدادات"
#~ msgid "Send Email"
#~ msgstr "إرسال بريد إلكتروني"
#~ msgid "Current Activity"
#~ msgstr "النشاط الحالي"
#~ msgid "Current"
#~ msgstr "الحالي"
#~ msgid "Merge"
#~ msgstr "دمج"
#~ msgid "_Send"
#~ msgstr "ار_سال"
#~ msgid "Budgets"
#~ msgstr "الميزانيات"
#~ msgid "title"
#~ msgstr "الاسم"
addons/project/i18n/bg.po
+4 -4
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-12-24 05:38+0000\n"
"X-Generator: Launchpad (build 14560)\n"
"X-Launchpad-Export-Date: 2012-02-07 04:51+0000\n"
"X-Generator: Launchpad (build 14747)\n"
#. module: project
#: view:report.project.task.user:0
@@ -1653,8 +1653,8 @@ msgstr ""
#. module: project
#: help:project.task,delay_hours:0
msgid ""
"Computed as difference of the time estimated by the project manager and the "
"real time to close the task."
"Computed as difference between planned hours by the project manager and the "
"total hours of the task."
msgstr ""
#. module: project
addons/project/i18n/bs.po
+4 -4
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-12-24 05:38+0000\n"
"X-Generator: Launchpad (build 14560)\n"
"X-Launchpad-Export-Date: 2012-02-07 04:51+0000\n"
"X-Generator: Launchpad (build 14747)\n"
#. module: project
#: view:report.project.task.user:0
@@ -1652,8 +1652,8 @@ msgstr "Rokovi mojih zadataka"
#. module: project
#: help:project.task,delay_hours:0
msgid ""
"Computed as difference of the time estimated by the project manager and the "
"real time to close the task."
"Computed as difference between planned hours by the project manager and the "
"total hours of the task."
msgstr ""
#. module: project
addons/project/i18n/ca.po
+13 -6
View File
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2011-12-23 09:54+0000\n"
"PO-Revision-Date: 2011-10-16 23:02+0000\n"
"Last-Translator: mgaja (GrupoIsep.com) <Unknown>\n"
"PO-Revision-Date: 2012-02-06 16:51+0000\n"
"Last-Translator: Raphael Collet (OpenERP) <Unknown>\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: 2011-12-24 05:38+0000\n"
"X-Generator: Launchpad (build 14560)\n"
"X-Launchpad-Export-Date: 2012-02-07 04:51+0000\n"
"X-Generator: Launchpad (build 14747)\n"
#. module: project
#: view:report.project.task.user:0
@@ -1714,8 +1714,8 @@ msgstr "Les meves dates límit de tasques"
#. module: project
#: help:project.task,delay_hours:0
msgid ""
"Computed as difference of the time estimated by the project manager and the "
"real time to close the task."
"Computed as difference between planned hours by the project manager and the "
"total hours of the task."
msgstr ""
"Calculat com la diferència del temps previst pel responsable del projecte i "
"el temps real per tancar la tasca."
@@ -2550,6 +2550,13 @@ msgstr ""
#~ "Permet el seguiment de projectes a llarg termini, incloent projectes de "
#~ "múltiples fases i la gestió d'assignació de recursos."
#~ msgid ""
#~ "Computed as difference of the time estimated by the project manager and the "
#~ "real time to close the task."
#~ msgstr ""
#~ "Calculat com la diferència del temps previst pel responsable del projecte i "
#~ "el temps real per tancar la tasca."
#~ msgid "Email Address of Project's Manager"
#~ msgstr "Adreça de correu electrònic del responsable del projecte"
addons/project/i18n/cs.po
+12 -5
View File
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2011-12-23 09:54+0000\n"
"PO-Revision-Date: 2011-07-15 02:36+0000\n"
"PO-Revision-Date: 2012-02-06 16:56+0000\n"
"Last-Translator: Jiří Hajda <robie@centrum.cz>\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: 2011-12-24 05:38+0000\n"
"X-Generator: Launchpad (build 14560)\n"
"X-Launchpad-Export-Date: 2012-02-07 04:51+0000\n"
"X-Generator: Launchpad (build 14747)\n"
"X-Poedit-Language: Czech\n"
#. module: project
@@ -1679,8 +1679,8 @@ msgstr "Moje krajní termíny úkolů"
#. module: project
#: help:project.task,delay_hours:0
msgid ""
"Computed as difference of the time estimated by the project manager and the "
"real time to close the task."
"Computed as difference between planned hours by the project manager and the "
"total hours of the task."
msgstr ""
"Spočítá rozdíl odhadovaného času vedoucím projektu a skutečným časem do "
"uzavření úkolu."
@@ -2351,6 +2351,13 @@ msgstr ""
#~ msgid "Current"
#~ msgstr "Aktuální"
#~ msgid ""
#~ "Computed as difference of the time estimated by the project manager and the "
#~ "real time to close the task."
#~ msgstr ""
#~ "Spočítá rozdíl odhadovaného času vedoucím projektu a skutečným časem do "
#~ "uzavření úkolu."
#~ msgid "Bill Time on Tasks"
#~ msgstr "Účtovaný čas úloh"
addons/project/i18n/da.po
+4 -4
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-01-28 05:03+0000\n"
"X-Generator: Launchpad (build 14727)\n"
"X-Launchpad-Export-Date: 2012-02-07 04:51+0000\n"
"X-Generator: Launchpad (build 14747)\n"
#. module: project
#: view:report.project.task.user:0
@@ -1653,8 +1653,8 @@ msgstr ""
#. module: project
#: help:project.task,delay_hours:0
msgid ""
"Computed as difference of the time estimated by the project manager and the "
"real time to close the task."
"Computed as difference between planned hours by the project manager and the "
"total hours of the task."
msgstr ""
#. module: project
addons/project/i18n/de.po
+13 -6
View File
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2011-12-23 09:54+0000\n"
"PO-Revision-Date: 2012-01-14 14:00+0000\n"
"Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
"PO-Revision-Date: 2012-02-06 16:57+0000\n"
"Last-Translator: Ferdinand-camptocamp <Unknown>\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: 2012-01-15 05:19+0000\n"
"X-Generator: Launchpad (build 14664)\n"
"X-Launchpad-Export-Date: 2012-02-07 04:51+0000\n"
"X-Generator: Launchpad (build 14747)\n"
#. module: project
#: view:report.project.task.user:0
@@ -1720,8 +1720,8 @@ msgstr "Meine befristeten Aufgaben"
#. module: project
#: help:project.task,delay_hours:0
msgid ""
"Computed as difference of the time estimated by the project manager and the "
"real time to close the task."
"Computed as difference between planned hours by the project manager and the "
"total hours of the task."
msgstr ""
"Berechnung durch die Differenz der geplanten Zeit und der tatsächlich "
"benötigten Zeit."
@@ -2555,6 +2555,13 @@ msgstr "Aufgaben in Bearbeitung"
#~ msgid "Current"
#~ msgstr "Aktuell"
#~ msgid ""
#~ "Computed as difference of the time estimated by the project manager and the "
#~ "real time to close the task."
#~ msgstr ""
#~ "Berechnung durch die Differenz der geplanten Zeit und der tatsächlich "
#~ "benötigten Zeit."
#~ msgid ""
#~ "Enables long-term projects tracking, including multiple-phase projects and "
#~ "resource allocation handling."
addons/project/i18n/el.po
+4 -4
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-12-24 05:38+0000\n"
"X-Generator: Launchpad (build 14560)\n"
"X-Launchpad-Export-Date: 2012-02-07 04:51+0000\n"
"X-Generator: Launchpad (build 14747)\n"
"X-Poedit-Country: GREECE\n"
"X-Poedit-Language: Greek\n"
"X-Poedit-SourceCharset: utf-8\n"
@@ -1672,8 +1672,8 @@ msgstr "Προθεσμίες Αναθέσεών μου"
#. module: project
#: help:project.task,delay_hours:0
msgid ""
"Computed as difference of the time estimated by the project manager and the "
"real time to close the task."
"Computed as difference between planned hours by the project manager and the "
"total hours of the task."
msgstr ""
#. module: project
addons/project/i18n/es.po
+13 -6
View File
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2011-12-23 09:54+0000\n"
"PO-Revision-Date: 2011-10-16 23:01+0000\n"
"Last-Translator: mgaja (GrupoIsep.com) <Unknown>\n"
"PO-Revision-Date: 2012-02-06 16:56+0000\n"
"Last-Translator: Raphael Collet (OpenERP) <Unknown>\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: 2011-12-24 05:39+0000\n"
"X-Generator: Launchpad (build 14560)\n"
"X-Launchpad-Export-Date: 2012-02-07 04:52+0000\n"
"X-Generator: Launchpad (build 14747)\n"
#. module: project
#: view:report.project.task.user:0
@@ -1711,8 +1711,8 @@ msgstr "Mis fechas límite de tareas"
#. module: project
#: help:project.task,delay_hours:0
msgid ""
"Computed as difference of the time estimated by the project manager and the "
"real time to close the task."
"Computed as difference between planned hours by the project manager and the "
"total hours of the task."
msgstr ""
"Calculado como la diferencia del tiempo estimado por el responsable del "
"proyecto y el tiempo real para cerrar la tarea."
@@ -2568,6 +2568,13 @@ msgstr ""
#~ "Permite el seguimiento de proyectos a largo plazo, incluyendo proyectos de "
#~ "múltiples fases y la gestión de asignación de recursos."
#~ msgid ""
#~ "Computed as difference of the time estimated by the project manager and the "
#~ "real time to close the task."
#~ msgstr ""
#~ "Calculado como la diferencia del tiempo estimado por el responsable del "
#~ "proyecto y el tiempo real para cerrar la tarea."
#~ msgid "Current"
#~ msgstr "Actual"
addons/project/i18n/es_AR.po
+4 -4
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-12-24 05:39+0000\n"
"X-Generator: Launchpad (build 14560)\n"
"X-Launchpad-Export-Date: 2012-02-07 04:52+0000\n"
"X-Generator: Launchpad (build 14747)\n"
#. module: project
#: view:report.project.task.user:0
@@ -1672,8 +1672,8 @@ msgstr ""
#. module: project
#: help:project.task,delay_hours:0
msgid ""
"Computed as difference of the time estimated by the project manager and the "
"real time to close the task."
"Computed as difference between planned hours by the project manager and the "
"total hours of the task."
msgstr ""
#. module: project
addons/project/i18n/es_EC.po
+11 -6
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-12-24 05:39+0000\n"
"X-Generator: Launchpad (build 14560)\n"
"X-Launchpad-Export-Date: 2012-02-07 04:53+0000\n"
"X-Generator: Launchpad (build 14747)\n"
#. module: project
#: view:report.project.task.user:0
@@ -1705,11 +1705,9 @@ msgstr "Mis fechas límite de tareas"
#. module: project
#: help:project.task,delay_hours:0
msgid ""
"Computed as difference of the time estimated by the project manager and the "
"real time to close the task."
"Computed as difference between planned hours by the project manager and the "
"total hours of the task."
msgstr ""
"Calculado como diferencia del tiempo estimado por administrador de proyecto\n"
" y el tiempo real para cerrar la tarea."
#. module: project
#: model:ir.actions.act_window,name:project.action_project_task_reevaluate
@@ -2551,6 +2549,13 @@ msgstr ""
#~ msgid "Current"
#~ msgstr "Actual"
#~ msgid ""
#~ "Computed as difference of the time estimated by the project manager and the "
#~ "real time to close the task."
#~ msgstr ""
#~ "Calculado como diferencia del tiempo estimado por administrador de proyecto\n"
#~ " y el tiempo real para cerrar la tarea."
#~ msgid ""
#~ "Enables long-term projects tracking, including multiple-phase projects and "
#~ "resource allocation handling."
addons/project/i18n/es_MX.po
+1 -2
View File
@@ -1576,8 +1576,7 @@ msgstr ""
#. module: project
#: help:project.task,delay_hours:0
msgid ""
"Computed as difference of the time estimated by the project manager and the "
"real time to close the task."
"Computed as difference between planned hours by the project manager and the total hours of the task."
msgstr ""
"Calculado como la diferencia del tiempo estimado por el responsable del "
"proyecto y el tiempo real para cerrar la tarea."
addons/project/i18n/es_PY.po
+4 -4
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-12-24 05:39+0000\n"
"X-Generator: Launchpad (build 14560)\n"
"X-Launchpad-Export-Date: 2012-02-07 04:53+0000\n"
"X-Generator: Launchpad (build 14747)\n"
#. module: project
#: view:report.project.task.user:0
@@ -1653,8 +1653,8 @@ msgstr ""
#. module: project
#: help:project.task,delay_hours:0
msgid ""
"Computed as difference of the time estimated by the project manager and the "
"real time to close the task."
"Computed as difference between planned hours by the project manager and the "
"total hours of the task."
msgstr ""
#. module: project
addons/project/i18n/es_VE.po
+1 -2
View File
@@ -1576,8 +1576,7 @@ msgstr ""
#. module: project
#: help:project.task,delay_hours:0
msgid ""
"Computed as difference of the time estimated by the project manager and the "
"real time to close the task."
"Computed as difference between planned hours by the project manager and the total hours of the task."
msgstr ""
"Calculado como la diferencia del tiempo estimado por el responsable del "
"proyecto y el tiempo real para cerrar la tarea."
addons/project/i18n/et.po
+4 -4
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-12-24 05:38+0000\n"
"X-Generator: Launchpad (build 14560)\n"
"X-Launchpad-Export-Date: 2012-02-07 04:51+0000\n"
"X-Generator: Launchpad (build 14747)\n"
#. module: project
#: view:report.project.task.user:0
@@ -1667,8 +1667,8 @@ msgstr "Minu ülesannete tähtajad"
#. module: project
#: help:project.task,delay_hours:0
msgid ""
"Computed as difference of the time estimated by the project manager and the "
"real time to close the task."
"Computed as difference between planned hours by the project manager and the "
"total hours of the task."
msgstr ""
#. module: project
addons/project/i18n/eu.po
+4 -4
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-12-24 05:37+0000\n"
"X-Generator: Launchpad (build 14560)\n"
"X-Launchpad-Export-Date: 2012-02-07 04:51+0000\n"
"X-Generator: Launchpad (build 14747)\n"
#. module: project
#: view:report.project.task.user:0
@@ -1657,8 +1657,8 @@ msgstr ""
#. module: project
#: help:project.task,delay_hours:0
msgid ""
"Computed as difference of the time estimated by the project manager and the "
"real time to close the task."
"Computed as difference between planned hours by the project manager and the "
"total hours of the task."
msgstr ""
#. module: project
addons/project/i18n/fi.po
+13 -6
View File
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2011-12-23 09:54+0000\n"
"PO-Revision-Date: 2010-08-03 09:15+0000\n"
"Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\n"
"PO-Revision-Date: 2012-02-06 16:54+0000\n"
"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
"Language-Team: Finnish <fi@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: 2011-12-24 05:38+0000\n"
"X-Generator: Launchpad (build 14560)\n"
"X-Launchpad-Export-Date: 2012-02-07 04:51+0000\n"
"X-Generator: Launchpad (build 14747)\n"
#. module: project
#: view:report.project.task.user:0
@@ -1674,8 +1674,8 @@ msgstr "Omien tehtävien määräajat"
#. module: project
#: help:project.task,delay_hours:0
msgid ""
"Computed as difference of the time estimated by the project manager and the "
"real time to close the task."
"Computed as difference between planned hours by the project manager and the "
"total hours of the task."
msgstr ""
"Laskettu erotuksena projektipäällikön arvion ja projektin valmistumiseen "
"kuluneen todellisen ajan mukaan"
@@ -2362,6 +2362,13 @@ msgstr ""
#~ "Mahdollistaa pitkäaikaisten projektien seurannan mukaanlukien monivaiheiset "
#~ "projektit ja resurssien allokoinnin."
#~ msgid ""
#~ "Computed as difference of the time estimated by the project manager and the "
#~ "real time to close the task."
#~ msgstr ""
#~ "Laskettu erotuksena projektipäällikön arvion ja projektin valmistumiseen "
#~ "kuluneen todellisen ajan mukaan"
#~ msgid "Bill Time on Tasks"
#~ msgstr "Tehtävien laskutettava aika"
addons/project/i18n/fr.po
+12 -5
View File
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2011-12-23 09:54+0000\n"
"PO-Revision-Date: 2011-07-23 19:17+0000\n"
"PO-Revision-Date: 2012-02-06 16:57+0000\n"
"Last-Translator: lholivier <olivier.lenoir@free.fr>\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: 2011-12-24 05:38+0000\n"
"X-Generator: Launchpad (build 14560)\n"
"X-Launchpad-Export-Date: 2012-02-07 04:51+0000\n"
"X-Generator: Launchpad (build 14747)\n"
#. module: project
#: view:report.project.task.user:0
@@ -1722,8 +1722,8 @@ msgstr "Les dates limites de mes tâches"
#. module: project
#: help:project.task,delay_hours:0
msgid ""
"Computed as difference of the time estimated by the project manager and the "
"real time to close the task."
"Computed as difference between planned hours by the project manager and the "
"total hours of the task."
msgstr ""
"Calcul correspondant à la différence entre le temps estimé par le "
"Responsable Projet et le temps réel pour fermer la tâche"
@@ -2470,6 +2470,13 @@ msgstr ""
#~ msgid "Please specify the email address of Customer."
#~ msgstr "Merci de renseigner le courriel du client"
#~ msgid ""
#~ "Computed as difference of the time estimated by the project manager and the "
#~ "real time to close the task."
#~ msgstr ""
#~ "Calcul correspondant à la différence entre le temps estimé par le "
#~ "Responsable Projet et le temps réel pour fermer la tâche"
#~ msgid "Warn Customer"
#~ msgstr "Avertir le client"
addons/project/i18n/gl.po
+4 -4
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-12-24 05:38+0000\n"
"X-Generator: Launchpad (build 14560)\n"
"X-Launchpad-Export-Date: 2012-02-07 04:51+0000\n"
"X-Generator: Launchpad (build 14747)\n"
#. module: project
#: view:report.project.task.user:0
@@ -1653,8 +1653,8 @@ msgstr ""
#. module: project
#: help:project.task,delay_hours:0
msgid ""
"Computed as difference of the time estimated by the project manager and the "
"real time to close the task."
"Computed as difference between planned hours by the project manager and the "
"total hours of the task."
msgstr ""
#. module: project
addons/project/i18n/hr.po
+4 -4
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-12-24 05:38+0000\n"
"X-Generator: Launchpad (build 14560)\n"
"X-Launchpad-Export-Date: 2012-02-07 04:52+0000\n"
"X-Generator: Launchpad (build 14747)\n"
"Language: hr\n"
#. module: project
@@ -1668,8 +1668,8 @@ msgstr ""
#. module: project
#: help:project.task,delay_hours:0
msgid ""
"Computed as difference of the time estimated by the project manager and the "
"real time to close the task."
"Computed as difference between planned hours by the project manager and the "
"total hours of the task."
msgstr ""
#. module: project
addons/project/i18n/hu.po
+12 -5
View File
@@ -7,15 +7,15 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2011-12-23 09:54+0000\n"
"PO-Revision-Date: 2011-02-08 16:17+0000\n"
"PO-Revision-Date: 2012-02-06 16:55+0000\n"
"Last-Translator: NOVOTRADE RENDSZERHÁZ ( novotrade.hu ) "
"<openerp@novotrade.hu>\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: 2011-12-24 05:38+0000\n"
"X-Generator: Launchpad (build 14560)\n"
"X-Launchpad-Export-Date: 2012-02-07 04:51+0000\n"
"X-Generator: Launchpad (build 14747)\n"
#. module: project
#: view:report.project.task.user:0
@@ -1707,8 +1707,8 @@ msgstr "Feladataim határideje"
#. module: project
#: help:project.task,delay_hours:0
msgid ""
"Computed as difference of the time estimated by the project manager and the "
"real time to close the task."
"Computed as difference between planned hours by the project manager and the "
"total hours of the task."
msgstr ""
"A projektmenedzser által becsült idő és a feladat lezárásához szükséges "
"tényleges idő különbözeteként kerül kiszámításra."
@@ -2211,6 +2211,13 @@ msgstr ""
#~ "Lehetővé teszi a hosszú távú projektek nyomon követését, beleértve a "
#~ "többfázisú projekteket és az erőforrás elosztás kezelését."
#~ msgid ""
#~ "Computed as difference of the time estimated by the project manager and the "
#~ "real time to close the task."
#~ msgstr ""
#~ "A projektmenedzser által becsült idő és a feladat lezárásához szükséges "
#~ "tényleges idő különbözeteként kerül kiszámításra."
#~ msgid "Email Address of Project's Manager"
#~ msgstr "Projektmenedzser e-mail címe"
addons/project/i18n/id.po
+4 -4
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-12-24 05:38+0000\n"
"X-Generator: Launchpad (build 14560)\n"
"X-Launchpad-Export-Date: 2012-02-07 04:52+0000\n"
"X-Generator: Launchpad (build 14747)\n"
#. module: project
#: view:report.project.task.user:0
@@ -1652,8 +1652,8 @@ msgstr ""
#. module: project
#: help:project.task,delay_hours:0
msgid ""
"Computed as difference of the time estimated by the project manager and the "
"real time to close the task."
"Computed as difference between planned hours by the project manager and the "
"total hours of the task."
msgstr ""
#. module: project
addons/project/i18n/it.po
+12 -5
View File
@@ -7,15 +7,15 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2011-12-23 09:54+0000\n"
"PO-Revision-Date: 2011-01-17 06:56+0000\n"
"PO-Revision-Date: 2012-02-06 16:52+0000\n"
"Last-Translator: Lorenzo Battistini - Agile BG - Domsense "
"<lorenzo.battistini@agilebg.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: 2011-12-24 05:38+0000\n"
"X-Generator: Launchpad (build 14560)\n"
"X-Launchpad-Export-Date: 2012-02-07 04:52+0000\n"
"X-Generator: Launchpad (build 14747)\n"
#. module: project
#: view:report.project.task.user:0
@@ -1713,8 +1713,8 @@ msgstr "Scadenze delle Mie Attività"
#. module: project
#: help:project.task,delay_hours:0
msgid ""
"Computed as difference of the time estimated by the project manager and the "
"real time to close the task."
"Computed as difference between planned hours by the project manager and the "
"total hours of the task."
msgstr ""
"Calcolato come la differenza fra il tempo stimato dal project manager ed il "
"tempo reale impiegato per concludere l'attività."
@@ -2604,6 +2604,13 @@ msgstr ""
#~ msgid "Budgets"
#~ msgstr "Budget"
#~ msgid ""
#~ "Computed as difference of the time estimated by the project manager and the "
#~ "real time to close the task."
#~ msgstr ""
#~ "Calcolato come la differenza fra il tempo stimato dal project manager ed il "
#~ "tempo reale impiegato per concludere l'attività."
#~ msgid "Bill Time on Tasks"
#~ msgstr "Fatturazione delle ore sulle attività"
addons/project/i18n/ko.po
+4 -4
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-12-24 05:38+0000\n"
"X-Generator: Launchpad (build 14560)\n"
"X-Launchpad-Export-Date: 2012-02-07 04:52+0000\n"
"X-Generator: Launchpad (build 14747)\n"
#. module: project
#: view:report.project.task.user:0
@@ -1658,8 +1658,8 @@ msgstr "내 과제 마감시한"
#. module: project
#: help:project.task,delay_hours:0
msgid ""
"Computed as difference of the time estimated by the project manager and the "
"real time to close the task."
"Computed as difference between planned hours by the project manager and the "
"total hours of the task."
msgstr ""
#. module: project
addons/project/i18n/lt.po
+4 -4
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-12-24 05:38+0000\n"
"X-Generator: Launchpad (build 14560)\n"
"X-Launchpad-Export-Date: 2012-02-07 04:52+0000\n"
"X-Generator: Launchpad (build 14747)\n"
#. module: project
#: view:report.project.task.user:0
@@ -1669,8 +1669,8 @@ msgstr ""
#. module: project
#: help:project.task,delay_hours:0
msgid ""
"Computed as difference of the time estimated by the project manager and the "
"real time to close the task."
"Computed as difference between planned hours by the project manager and the "
"total hours of the task."
msgstr ""
#. module: project
addons/project/i18n/lv.po
+13 -6
View File
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2011-12-23 09:54+0000\n"
"PO-Revision-Date: 2010-12-31 10:58+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
"PO-Revision-Date: 2012-02-06 16:52+0000\n"
"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
"Language-Team: Latvian <lv@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: 2011-12-24 05:38+0000\n"
"X-Generator: Launchpad (build 14560)\n"
"X-Launchpad-Export-Date: 2012-02-07 04:52+0000\n"
"X-Generator: Launchpad (build 14747)\n"
#. module: project
#: view:report.project.task.user:0
@@ -1701,8 +1701,8 @@ msgstr "Manu uzdevumu termiņi"
#. module: project
#: help:project.task,delay_hours:0
msgid ""
"Computed as difference of the time estimated by the project manager and the "
"real time to close the task."
"Computed as difference between planned hours by the project manager and the "
"total hours of the task."
msgstr ""
"Tiek aprēķināts kā starpība starp projektu vadītāja novērtēto un reālo "
"uzdevuma pabeigšanas laiku."
@@ -2541,6 +2541,13 @@ msgstr ""
#~ "Realizē un uzskaite koncepcijas un uzdevumu tipus, kas definēti SCRUM "
#~ "metodoloģijā."
#~ msgid ""
#~ "Computed as difference of the time estimated by the project manager and the "
#~ "real time to close the task."
#~ msgstr ""
#~ "Tiek aprēķināts kā starpība starp projektu vadītāja novērtēto un reālo "
#~ "uzdevuma pabeigšanas laiku."
#~ msgid "Project Application Configuration"
#~ msgstr "Projektu sistēmas konfigurācija"
addons/project/i18n/mn.po
+4 -4
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-12-24 05:38+0000\n"
"X-Generator: Launchpad (build 14560)\n"
"X-Launchpad-Export-Date: 2012-02-07 04:52+0000\n"
"X-Generator: Launchpad (build 14747)\n"
#. module: project
#: view:report.project.task.user:0
@@ -1660,8 +1660,8 @@ msgstr "Даалгаврын эцсийн хугацаа"
#. module: project
#: help:project.task,delay_hours:0
msgid ""
"Computed as difference of the time estimated by the project manager and the "
"real time to close the task."
"Computed as difference between planned hours by the project manager and the "
"total hours of the task."
msgstr ""
#. module: project
addons/project/i18n/nb.po
+13 -6
View File
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2011-12-23 09:54+0000\n"
"PO-Revision-Date: 2011-04-07 06:42+0000\n"
"Last-Translator: Rolv Råen (adEgo) <Unknown>\n"
"PO-Revision-Date: 2012-02-06 16:52+0000\n"
"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
"Language-Team: Norwegian Bokmal <nb@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: 2011-12-24 05:38+0000\n"
"X-Generator: Launchpad (build 14560)\n"
"X-Launchpad-Export-Date: 2012-02-07 04:52+0000\n"
"X-Generator: Launchpad (build 14747)\n"
#. module: project
#: view:report.project.task.user:0
@@ -1669,8 +1669,8 @@ msgstr "Mine oppgavers tidsfrister"
#. module: project
#: help:project.task,delay_hours:0
msgid ""
"Computed as difference of the time estimated by the project manager and the "
"real time to close the task."
"Computed as difference between planned hours by the project manager and the "
"total hours of the task."
msgstr ""
"Beregnet som: Total tid - estimert tid. Det gir differansen mellom tiden "
"estimert av prosjektlederen og den reelle tiden det tok å fullføre oppgaven."
@@ -2124,6 +2124,13 @@ msgstr ""
#~ msgid "Current"
#~ msgstr "Gjeldene"
#~ msgid ""
#~ "Computed as difference of the time estimated by the project manager and the "
#~ "real time to close the task."
#~ msgstr ""
#~ "Beregnet som: Total tid - estimert tid. Det gir differansen mellom tiden "
#~ "estimert av prosjektlederen og den reelle tiden det tok å fullføre oppgaven."
#~ msgid "Warn Customer"
#~ msgstr "Varsle kunde"
addons/project/i18n/nl.po
+13 -6
View File
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2011-12-23 09:54+0000\n"
"PO-Revision-Date: 2011-01-18 13:20+0000\n"
"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
"PO-Revision-Date: 2012-02-06 16:53+0000\n"
"Last-Translator: Raphael Collet (OpenERP) <Unknown>\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: 2011-12-24 05:38+0000\n"
"X-Generator: Launchpad (build 14560)\n"
"X-Launchpad-Export-Date: 2012-02-07 04:51+0000\n"
"X-Generator: Launchpad (build 14747)\n"
#. module: project
#: view:report.project.task.user:0
@@ -1706,8 +1706,8 @@ msgstr "Mijn taken termijnen"
#. module: project
#: help:project.task,delay_hours:0
msgid ""
"Computed as difference of the time estimated by the project manager and the "
"real time to close the task."
"Computed as difference between planned hours by the project manager and the "
"total hours of the task."
msgstr ""
"Berekend als het verschil tussen de door de project manager geschatte tijd "
"en de werkelijke tijd tot sluiting van de taak."
@@ -2568,6 +2568,13 @@ msgstr ""
#~ "Maakt lange-termijn project opvolging beschikbaar, inclusief meer-fase "
#~ "projecten en resource toewijzing afhandeling."
#~ msgid ""
#~ "Computed as difference of the time estimated by the project manager and the "
#~ "real time to close the task."
#~ msgstr ""
#~ "Berekend als het verschil tussen de door de project manager geschatte tijd "
#~ "en de werkelijke tijd tot sluiting van de taak."
#~ msgid "Current"
#~ msgstr "Actueel"
addons/project/i18n/nl_BE.po
+4 -4
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-12-24 05:39+0000\n"
"X-Generator: Launchpad (build 14560)\n"
"X-Launchpad-Export-Date: 2012-02-07 04:52+0000\n"
"X-Generator: Launchpad (build 14747)\n"
#. module: project
#: view:report.project.task.user:0
@@ -1652,8 +1652,8 @@ msgstr ""
#. module: project
#: help:project.task,delay_hours:0
msgid ""
"Computed as difference of the time estimated by the project manager and the "
"real time to close the task."
"Computed as difference between planned hours by the project manager and the "
"total hours of the task."
msgstr ""
#. module: project
addons/project/i18n/pl.po
+12 -5
View File
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2011-12-23 09:54+0000\n"
"PO-Revision-Date: 2011-01-22 13:27+0000\n"
"PO-Revision-Date: 2012-02-06 16:52+0000\n"
"Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\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: 2011-12-24 05:38+0000\n"
"X-Generator: Launchpad (build 14560)\n"
"X-Launchpad-Export-Date: 2012-02-07 04:52+0000\n"
"X-Generator: Launchpad (build 14747)\n"
#. module: project
#: view:report.project.task.user:0
@@ -1699,8 +1699,8 @@ msgstr "Moje terminy"
#. module: project
#: help:project.task,delay_hours:0
msgid ""
"Computed as difference of the time estimated by the project manager and the "
"real time to close the task."
"Computed as difference between planned hours by the project manager and the "
"total hours of the task."
msgstr ""
"Obliczone jako różnica pomiędzy czasem szacowanym przez menedżera, a "
"rzeczywistym czasem do zamknięcia zadania."
@@ -2528,6 +2528,13 @@ msgstr ""
#~ "Umożliwia prowadzenie projektów długoterminowych z dzieleniem na fazy i "
#~ "przydzielaniem zasobów."
#~ msgid ""
#~ "Computed as difference of the time estimated by the project manager and the "
#~ "real time to close the task."
#~ msgstr ""
#~ "Obliczone jako różnica pomiędzy czasem szacowanym przez menedżera, a "
#~ "rzeczywistym czasem do zamknięcia zadania."
#~ msgid "Current"
#~ msgstr "Bieżące"
addons/project/i18n/project.pot
+1 -1
View File
@@ -1598,7 +1598,7 @@ msgstr ""
#. module: project
#: help:project.task,delay_hours:0
msgid "Computed as difference of the time estimated by the project manager and the real time to close the task."
msgid "Computed as difference between planned hours by the project manager and the total hours of the task."
msgstr ""
#. module: project
addons/project/i18n/pt.po
+4 -4
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-12-24 05:38+0000\n"
"X-Generator: Launchpad (build 14560)\n"
"X-Launchpad-Export-Date: 2012-02-07 04:52+0000\n"
"X-Generator: Launchpad (build 14747)\n"
#. module: project
#: view:report.project.task.user:0
@@ -1668,8 +1668,8 @@ msgstr "Meus prazos das tarefas"
#. module: project
#: help:project.task,delay_hours:0
msgid ""
"Computed as difference of the time estimated by the project manager and the "
"real time to close the task."
"Computed as difference between planned hours by the project manager and the "
"total hours of the task."
msgstr ""
#. module: project
addons/project/i18n/pt_BR.po
+12 -5
View File
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: pt_BR\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2011-12-23 09:54+0000\n"
"PO-Revision-Date: 2011-01-26 11:51+0000\n"
"PO-Revision-Date: 2012-02-06 16:53+0000\n"
"Last-Translator: Adriano Prado <adrianojprado@hotmail.com>\n"
"Language-Team: <pt@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: 2011-12-24 05:39+0000\n"
"X-Generator: Launchpad (build 14560)\n"
"X-Launchpad-Export-Date: 2012-02-07 04:52+0000\n"
"X-Generator: Launchpad (build 14747)\n"
#. module: project
#: view:report.project.task.user:0
@@ -1704,8 +1704,8 @@ msgstr "Meus Prazos de Tarefas"
#. module: project
#: help:project.task,delay_hours:0
msgid ""
"Computed as difference of the time estimated by the project manager and the "
"real time to close the task."
"Computed as difference between planned hours by the project manager and the "
"total hours of the task."
msgstr ""
"Calculado como diferença de tempo estimado pelo gerente de projetos e o "
"tempo real para concluir a tarefa."
@@ -2518,6 +2518,13 @@ msgstr ""
#~ msgid "Please specify the email address of Customer."
#~ msgstr "Favor informar o endereço de email do Cliente."
#~ msgid ""
#~ "Computed as difference of the time estimated by the project manager and the "
#~ "real time to close the task."
#~ msgstr ""
#~ "Calculado como diferença de tempo estimado pelo gerente de projetos e o "
#~ "tempo real para concluir a tarefa."
#~ msgid "Current"
#~ msgstr "Atual"
addons/project/i18n/ro.po
+530 -227
View File
File diff suppressed because it is too large Load Diff
addons/project/i18n/ru.po
+4 -4
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-12-24 05:38+0000\n"
"X-Generator: Launchpad (build 14560)\n"
"X-Launchpad-Export-Date: 2012-02-07 04:52+0000\n"
"X-Generator: Launchpad (build 14747)\n"
#. module: project
#: view:report.project.task.user:0
@@ -1671,8 +1671,8 @@ msgstr ""
#. module: project
#: help:project.task,delay_hours:0
msgid ""
"Computed as difference of the time estimated by the project manager and the "
"real time to close the task."
"Computed as difference between planned hours by the project manager and the "
"total hours of the task."
msgstr ""
#. module: project
addons/project/i18n/sk.po
+4 -4
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-12-24 05:38+0000\n"
"X-Generator: Launchpad (build 14560)\n"
"X-Launchpad-Export-Date: 2012-02-07 04:52+0000\n"
"X-Generator: Launchpad (build 14747)\n"
#. module: project
#: view:report.project.task.user:0
@@ -1653,8 +1653,8 @@ msgstr ""
#. module: project
#: help:project.task,delay_hours:0
msgid ""
"Computed as difference of the time estimated by the project manager and the "
"real time to close the task."
"Computed as difference between planned hours by the project manager and the "
"total hours of the task."
msgstr ""
#. module: project
addons/project/i18n/sl.po
+4 -4
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-12-24 05:39+0000\n"
"X-Generator: Launchpad (build 14560)\n"
"X-Launchpad-Export-Date: 2012-02-07 04:52+0000\n"
"X-Generator: Launchpad (build 14747)\n"
#. module: project
#: view:report.project.task.user:0
@@ -1652,8 +1652,8 @@ msgstr ""
#. module: project
#: help:project.task,delay_hours:0
msgid ""
"Computed as difference of the time estimated by the project manager and the "
"real time to close the task."
"Computed as difference between planned hours by the project manager and the "
"total hours of the task."
msgstr ""
#. module: project
addons/project/i18n/sq.po
+4 -4
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-12-24 05:37+0000\n"
"X-Generator: Launchpad (build 14560)\n"
"X-Launchpad-Export-Date: 2012-02-07 04:51+0000\n"
"X-Generator: Launchpad (build 14747)\n"
#. module: project
#: view:report.project.task.user:0
@@ -1653,8 +1653,8 @@ msgstr ""
#. module: project
#: help:project.task,delay_hours:0
msgid ""
"Computed as difference of the time estimated by the project manager and the "
"real time to close the task."
"Computed as difference between planned hours by the project manager and the "
"total hours of the task."
msgstr ""
#. module: project
addons/project/i18n/sv.po
+4 -4
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-12-24 05:39+0000\n"
"X-Generator: Launchpad (build 14560)\n"
"X-Launchpad-Export-Date: 2012-02-07 04:52+0000\n"
"X-Generator: Launchpad (build 14747)\n"
#. module: project
#: view:report.project.task.user:0
@@ -1667,8 +1667,8 @@ msgstr "Mina aktiviteters deadlines"
#. module: project
#: help:project.task,delay_hours:0
msgid ""
"Computed as difference of the time estimated by the project manager and the "
"real time to close the task."
"Computed as difference between planned hours by the project manager and the "
"total hours of the task."
msgstr ""
#. module: project
addons/project/i18n/tlh.po
+4 -4
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-12-24 05:39+0000\n"
"X-Generator: Launchpad (build 14560)\n"
"X-Launchpad-Export-Date: 2012-02-07 04:52+0000\n"
"X-Generator: Launchpad (build 14747)\n"
#. module: project
#: view:report.project.task.user:0
@@ -1652,8 +1652,8 @@ msgstr ""
#. module: project
#: help:project.task,delay_hours:0
msgid ""
"Computed as difference of the time estimated by the project manager and the "
"real time to close the task."
"Computed as difference between planned hours by the project manager and the "
"total hours of the task."
msgstr ""
#. module: project
addons/project/i18n/tr.po
+4 -4
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-12-24 05:39+0000\n"
"X-Generator: Launchpad (build 14560)\n"
"X-Launchpad-Export-Date: 2012-02-07 04:52+0000\n"
"X-Generator: Launchpad (build 14747)\n"
#. module: project
#: view:report.project.task.user:0
@@ -1660,8 +1660,8 @@ msgstr "Görevlerimin Bitiş Tarihleri"
#. module: project
#: help:project.task,delay_hours:0
msgid ""
"Computed as difference of the time estimated by the project manager and the "
"real time to close the task."
"Computed as difference between planned hours by the project manager and the "
"total hours of the task."
msgstr ""
#. module: project
addons/project/i18n/uk.po
+4 -4
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-12-24 05:39+0000\n"
"X-Generator: Launchpad (build 14560)\n"
"X-Launchpad-Export-Date: 2012-02-07 04:52+0000\n"
"X-Generator: Launchpad (build 14747)\n"
#. module: project
#: view:report.project.task.user:0
@@ -1652,8 +1652,8 @@ msgstr ""
#. module: project
#: help:project.task,delay_hours:0
msgid ""
"Computed as difference of the time estimated by the project manager and the "
"real time to close the task."
"Computed as difference between planned hours by the project manager and the "
"total hours of the task."
msgstr ""
#. module: project
addons/project/i18n/vi.po
+4 -4
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-12-24 05:39+0000\n"
"X-Generator: Launchpad (build 14560)\n"
"X-Launchpad-Export-Date: 2012-02-07 04:52+0000\n"
"X-Generator: Launchpad (build 14747)\n"
#. module: project
#: view:report.project.task.user:0
@@ -1653,8 +1653,8 @@ msgstr ""
#. module: project
#: help:project.task,delay_hours:0
msgid ""
"Computed as difference of the time estimated by the project manager and the "
"real time to close the task."
"Computed as difference between planned hours by the project manager and the "
"total hours of the task."
msgstr ""
#. module: project
addons/project/i18n/zh_CN.po
+10 -5
View File
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2011-12-23 09:54+0000\n"
"PO-Revision-Date: 2012-01-23 14:40+0000\n"
"PO-Revision-Date: 2012-02-06 16:54+0000\n"
"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.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: 2012-01-24 05:29+0000\n"
"X-Generator: Launchpad (build 14713)\n"
"X-Launchpad-Export-Date: 2012-02-07 04:53+0000\n"
"X-Generator: Launchpad (build 14747)\n"
#. module: project
#: view:report.project.task.user:0
@@ -1663,8 +1663,8 @@ msgstr "我的任务最后期限"
#. module: project
#: help:project.task,delay_hours:0
msgid ""
"Computed as difference of the time estimated by the project manager and the "
"real time to close the task."
"Computed as difference between planned hours by the project manager and the "
"total hours of the task."
msgstr "计算公式为：项目经理估算的时间和实际花费的时间的差"
#. module: project
@@ -2455,6 +2455,11 @@ msgstr ""
#~ msgid "Current Activity"
#~ msgstr "当前活动"
#~ msgid ""
#~ "Computed as difference of the time estimated by the project manager and the "
#~ "real time to close the task."
#~ msgstr "计算公式为：项目经理估算的时间和实际花费的时间的差"
#~ msgid "Current"
#~ msgstr "当前的"
addons/project/i18n/zh_TW.po
+4 -4
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-12-24 05:39+0000\n"
"X-Generator: Launchpad (build 14560)\n"
"X-Launchpad-Export-Date: 2012-02-07 04:52+0000\n"
"X-Generator: Launchpad (build 14747)\n"
#. module: project
#: view:report.project.task.user:0
@@ -1656,8 +1656,8 @@ msgstr ""
#. module: project
#: help:project.task,delay_hours:0
msgid ""
"Computed as difference of the time estimated by the project manager and the "
"real time to close the task."
"Computed as difference between planned hours by the project manager and the "
"total hours of the task."
msgstr ""
#. module: project
addons/project/project.py
+78 -35
View File
@@ -84,35 +84,70 @@ class project(osv.osv):
val['pricelist_id'] = pricelist_id
return {'value': val}
def _progress_rate(self, cr, uid, ids, names, arg, context=None):
res = {}.fromkeys(ids, 0.0)
if not ids:
return res
cr.execute('''SELECT
project_id, sum(planned_hours), sum(total_hours), sum(effective_hours), SUM(remaining_hours)
FROM
project_task
WHERE
project_id in %s AND
state<>'cancelled'
GROUP BY
project_id''', (tuple(ids),))
progress = dict(map(lambda x: (x[0], (x[1],x[2],x[3],x[4])), cr.fetchall()))
for project in self.browse(cr, uid, ids, context=context):
s = progress.get(project.id, (0.0,0.0,0.0,0.0))
res[project.id] = {
'planned_hours': s[0],
'effective_hours': s[2],
'total_hours': s[1],
'progress_rate': s[1] and round(100.0*s[2]/s[1],2) or 0.0
}
def _get_projects_from_tasks(self, cr, uid, task_ids, context=None):
tasks = self.pool.get('project.task').browse(cr, uid, task_ids, context=context)
project_ids = [task.project_id.id for task in tasks]
return self.pool.get('project.project')._get_project_and_parents(cr, uid, project_ids, context)
def _get_project_and_parents(self, cr, uid, ids, context=None):
""" return the project ids and all their parent projects """
res = set(ids)
while ids:
cr.execute("""
SELECT DISTINCT parent.id
FROM project_project project, project_project parent, account_analytic_account account
WHERE project.analytic_account_id = account.id
AND parent.analytic_account_id = account.parent_id
AND project.id IN %s
""", (tuple(ids),))
ids = [t[0] for t in cr.fetchall()]
res.update(ids)
return list(res)
def _get_project_and_children(self, cr, uid, ids, context=None):
""" retrieve all children projects of project ids;
return a dictionary mapping each project to its parent project (or None)
"""
res = dict.fromkeys(ids, None)
while ids:
cr.execute("""
SELECT project.id, parent.id
FROM project_project project, project_project parent, account_analytic_account account
WHERE project.analytic_account_id = account.id
AND parent.analytic_account_id = account.parent_id
AND parent.id IN %s
""", (tuple(ids),))
dic = dict(cr.fetchall())
res.update(dic)
ids = dic.keys()
return res
def _get_project_task(self, cr, uid, ids, context=None):
result = {}
for task in self.pool.get('project.task').browse(cr, uid, ids, context=context):
if task.project_id: result[task.project_id.id] = True
return result.keys()
def _progress_rate(self, cr, uid, ids, names, arg, context=None):
child_parent = self._get_project_and_children(cr, uid, ids, context)
# compute planned_hours, total_hours, effective_hours specific to each project
cr.execute("""
SELECT project_id, COALESCE(SUM(planned_hours), 0.0),
COALESCE(SUM(total_hours), 0.0), COALESCE(SUM(effective_hours), 0.0)
FROM project_task WHERE project_id IN %s AND state <> 'cancelled'
GROUP BY project_id
""", (tuple(child_parent.keys()),))
# aggregate results into res
res = dict([(id, {'planned_hours':0.0,'total_hours':0.0,'effective_hours':0.0}) for id in ids])
for id, planned, total, effective in cr.fetchall():
# add the values specific to id to all parent projects of id in the result
while id:
if id in ids:
res[id]['planned_hours'] += planned
res[id]['total_hours'] += total
res[id]['effective_hours'] += effective
id = child_parent[id]
# compute progress rates
for id in ids:
if res[id]['total_hours']:
res[id]['progress_rate'] = round(100.0 * res[id]['effective_hours'] / res[id]['total_hours'], 2)
else:
res[id]['progress_rate'] = 0.0
return res
def unlink(self, cr, uid, ids, *args, **kwargs):
for proj in self.browse(cr, uid, ids):
@@ -133,17 +168,25 @@ class project(osv.osv):
'tasks': fields.one2many('project.task', 'project_id', "Project tasks"),
'planned_hours': fields.function(_progress_rate, multi="progress", string='Planned Time', help="Sum of planned hours of all tasks related to this project and its child projects.",
store = {
'project.project': (lambda self, cr, uid, ids, c={}: ids, ['tasks'], 10),
'project.task': (_get_project_task, ['planned_hours', 'effective_hours', 'remaining_hours', 'total_hours', 'progress', 'delay_hours','state'], 10),
'project.project': (_get_project_and_parents, ['tasks', 'parent_id', 'child_ids'], 10),
'project.task': (_get_projects_from_tasks, ['planned_hours', 'remaining_hours', 'work_ids', 'state'], 20),
}),
'effective_hours': fields.function(_progress_rate, multi="progress", string='Time Spent', help="Sum of spent hours of all tasks related to this project and its child projects.",
store = {
'project.project': (_get_project_and_parents, ['tasks', 'parent_id', 'child_ids'], 10),
'project.task': (_get_projects_from_tasks, ['planned_hours', 'remaining_hours', 'work_ids', 'state'], 20),
}),
'effective_hours': fields.function(_progress_rate, multi="progress", string='Time Spent', help="Sum of spent hours of all tasks related to this project and its child projects."),
'resource_calendar_id': fields.many2one('resource.calendar', 'Working Time', help="Timetable working hours to adjust the gantt diagram report", states={'close':[('readonly',True)]} ),
'total_hours': fields.function(_progress_rate, multi="progress", string='Total Time', help="Sum of total hours of all tasks related to this project and its child projects.",
store = {
'project.project': (lambda self, cr, uid, ids, c={}: ids, ['tasks'], 10),
'project.task': (_get_project_task, ['planned_hours', 'effective_hours', 'remaining_hours', 'total_hours', 'progress', 'delay_hours','state'], 10),
'project.project': (_get_project_and_parents, ['tasks', 'parent_id', 'child_ids'], 10),
'project.task': (_get_projects_from_tasks, ['planned_hours', 'remaining_hours', 'work_ids', 'state'], 20),
}),
'progress_rate': fields.function(_progress_rate, multi="progress", string='Progress', type='float', group_operator="avg", help="Percent of tasks closed according to the total of tasks todo."),
'progress_rate': fields.function(_progress_rate, multi="progress", string='Progress', type='float', group_operator="avg", help="Percent of tasks closed according to the total of tasks todo.",
store = {
'project.project': (_get_project_and_parents, ['tasks', 'parent_id', 'child_ids'], 10),
'project.task': (_get_projects_from_tasks, ['planned_hours', 'remaining_hours', 'work_ids', 'state'], 20),
}),
'resource_calendar_id': fields.many2one('resource.calendar', 'Working Time', help="Timetable working hours to adjust the gantt diagram report", states={'close':[('readonly',True)]} ),
'warn_customer': fields.boolean('Warn Partner', help="If you check this, the user will have a popup when closing a task that propose a message to send by email to the customer.", states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
'warn_header': fields.text('Mail Header', help="Header added at the beginning of the email for the warning message sent to the customer when a task is closed.", states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
'warn_footer': fields.text('Mail Footer', help="Footer added at the beginning of the email for the warning message sent to the customer when a task is closed.", states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
@@ -612,7 +655,7 @@ class task(osv.osv):
'project.task': (lambda self, cr, uid, ids, c={}: ids, ['work_ids', 'remaining_hours', 'planned_hours','state'], 10),
'project.task.work': (_get_task, ['hours'], 10),
}),
'delay_hours': fields.function(_hours_get, string='Delay Hours', multi='hours', help="Computed as difference of the time estimated by the project manager and the real time to close the task.",
'delay_hours': fields.function(_hours_get, string='Delay Hours', multi='hours', help="Computed as difference between planned hours by the project manager and the total hours of the task.",
store = {
'project.task': (lambda self, cr, uid, ids, c={}: ids, ['work_ids', 'remaining_hours', 'planned_hours'], 10),
'project.task.work': (_get_task, ['hours'], 10),
addons/sale/i18n/ro.po
+382 -380
View File
File diff suppressed because it is too large Load Diff