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

[MERGE] OPW 577045: translations: collective fix of missing translation terms in reports

Browse Source 
bzr revid: xal@openerp.com-20121008140704-enzqj8xse9nt8zbu
This commit is contained in:
Xavier ALT
2012-10-08 16:07:04 +02:00
parent 180549c72e 712a0543f2
commit e5f6f24f64
31 changed files with 1303 additions and 1024 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/account_report.xml
+3 -1
View File
@@ -2,6 +2,8 @@
<openerp>
<data>
<report auto="False" id="account_general_ledger" menu="False" model="account.account" name="account.general.ledger" rml="account/report/account_general_ledger.rml" string="General Ledger"/>
<report auto="False" id="account_financial_report" menu="False" model="account.financial.report" name="account.financial.report" rml="account/report/account_financial_report.rml" string="Financial Report"/>
<report auto="False" id="account_aged_partner_balance" menu="False" model="res.partner" name="account.aged_trial_balance" rml="account/report/account_aged_partner_balance.rml" string="Aged Partner Balance"/>
<report auto="False" id="account_general_ledger_landscape" menu="False" model="account.account" name="account.general.ledger_landscape" rml="account/report/account_general_ledger_landscape.rml" string="General Ledger"/>
<report auto="False" id="account_3rdparty_ledger" menu="False" model="res.partner" name="account.third_party_ledger" rml="account/report/account_partner_ledger.rml" string="Partner Ledger"/>
<report auto="False" id="account_3rdparty_ledger_other" menu="False" model="res.partner" name="account.third_party_ledger_other" rml="account/report/account_partner_ledger_other.rml" string="Partner Ledger"/>
@@ -16,7 +18,7 @@
auto="False"
id="account_invoices"
model="account.invoice"
name="account.invoice"
name="account.invoice"
rml="account/report/account_print_invoice.rml"
string="Invoices"
attachment="(object.state in ('open','paid')) and ('INV'+(object.number or '').replace('/','')+'.pdf')"
addons/account/i18n/account.pot
+421 -220
View File
File diff suppressed because it is too large Load Diff
addons/account/report/account_aged_partner_balance.py
+12 -3
View File
@@ -22,6 +22,7 @@
import time
from report import report_sxw
from common_report_header import common_report_header
from tools.translate import _
class aged_trial_report(report_sxw.rml_parse, common_report_header):
@@ -41,6 +42,7 @@ class aged_trial_report(report_sxw.rml_parse, common_report_header):
'get_account': self._get_account,
'get_fiscalyear': self._get_fiscalyear,
'get_target_move': self._get_target_move,
'get_direction_selection': self._get_direction_selection,
})
def set_context(self, objects, data, ids, report_type=None):
@@ -367,13 +369,20 @@ class aged_trial_report(report_sxw.rml_parse, common_report_header):
def _get_partners(self,data):
if data['form']['result_selection'] == 'customer':
return 'Receivable Accounts'
return _('Receivable Accounts')
elif data['form']['result_selection'] == 'supplier':
return 'Payable Accounts'
return _('Payable Accounts')
elif data['form']['result_selection'] == 'customer_supplier':
return 'Receivable and Payable Accounts'
return _('Receivable and Payable Accounts')
return ''
def _get_direction_selection(self, data):
if data['form']['direction_selection'] == 'past':
return _('Past')
elif data['form']['direction_selection'] == 'future':
return _('Future')
return ''
report_sxw.report_sxw('report.account.aged_trial_balance', 'res.partner',
'addons/account/report/account_aged_partner_balance.rml',parser=aged_trial_report, header="internal landscape")
addons/account/report/account_aged_partner_balance.rml
+4 -3
View File
@@ -121,7 +121,7 @@
<para style="terp_tblheader_General_Centre">Start Date</para>
</td>
<td>
<para style="terp_tblheader_General_Centre">Period Length(days)</para>
<para style="terp_tblheader_General_Centre">Period Length (days)</para>
</td>
<td>
<para style="terp_tblheader_General_Centre">Partner's</para>
@@ -150,7 +150,7 @@
<para style="terp_default_Centre_8">[[ get_partners(data) ]]</para>
</td>
<td>
<para style="terp_default_Centre_8">[[ data['form']['direction_selection'] ]]</para>
<para style="terp_default_Centre_8">[[ get_direction_selection(data) ]]</para>
</td>
<td>
<para style="terp_default_Centre_8">[[ get_target_move(data) ]]</para>
@@ -166,7 +166,8 @@
<para style="terp_tblheader_Details">Partners</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">[[ data['form']['direction_selection'] == 'future' and 'Due' or 'Not due' ]]</para>
<para style="terp_tblheader_Details_Right">Due[[ data['form']['direction_selection'] == 'future' and ' ' or removeParentNode('para') ]]</para>
<para style="terp_tblheader_Details_Right">Not due[[ data['form']['direction_selection'] == 'past' and ' ' or removeParentNode('para') ]]</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">[[ data['form']['4']['name'] ]]</para>
addons/account/report/account_balance.py
+1
View File
@@ -41,6 +41,7 @@ class account_balance(report_sxw.rml_parse, common_report_header):
'sum_credit': self._sum_credit,
'get_fiscalyear':self._get_fiscalyear,
'get_filter': self._get_filter,
'has_filter': self._has_filter,
'get_start_period': self.get_start_period,
'get_end_period': self.get_end_period ,
'get_account': self._get_account,
addons/account/report/account_balance.rml
+7 -6
View File
@@ -16,7 +16,6 @@
</blockTableStyle>
<blockTableStyle id="Table2">
<blockValign value="TOP"/>
<blockAlignment value="RIGHT"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,1" stop="-1,-1"/>
</blockTableStyle>
@@ -211,8 +210,8 @@
</para>
<blockTable colWidths="130.0,80.0,100.0,140.0,90.0" style="Table8">
<tr>
<td><para style="terp_tblheader_General_Centre">[[ data['model']=='account.account' and 'Company'or removeParentNode('para') ]]</para>
<para style="terp_tblheader_General_Centre"> [[ data['model']=='ir.ui.menu' and 'Chart of Accounts' or removeParentNode('para') ]]</para></td>
<td><para style="terp_tblheader_General_Centre">Company[[ data['model']=='account.account' and ' ' or removeParentNode('para') ]]</para>
<para style="terp_tblheader_General_Centre">Chart of Accounts[[ data['model']=='ir.ui.menu' and ' ' or removeParentNode('para') ]]</para></td>
<td>
<para style="terp_tblheader_General_Centre">Fiscal Year</para>
</td>
@@ -220,7 +219,7 @@
<para style="terp_tblheader_General_Centre">Display Account</para>
</td>
<td>
<para style="terp_tblheader_General_Centre">Filter By <font>[[ data['form']['filter']!='filter_no' and get_filter(data) ]]</font> </para>
<para style="terp_tblheader_General_Centre">Filter By <font>[[ has_filter(data) and get_filter(data) ]]</font> </para>
</td>
<td>
<para style="terp_tblheader_General_Centre">Target Moves</para>
@@ -233,8 +232,10 @@
<td>
<para style="terp_default_Centre_8">[[ get_fiscalyear(data) or '' ]]</para>
</td>
<td><para style="terp_default_Centre_8">[[ (data['form']['display_account']=='all' and 'All') or (data['form']['display_account']=='movement' and 'With movements') or 'With balance is not equal to 0']]</para></td>
<td> <para style="terp_default_Centre_8">[[ data['form']['filter']=='filter_no' and get_filter(data) or removeParentNode('para') ]] </para>
<para style="terp_default_Centre_7">All[[ data['form']['display_account']=='all' and ' ' or removeParentNode('para') ]]</para>
<para style="terp_default_Centre_7">With movements[[ data['form']['display_account']=='movement' and ' ' or removeParentNode('para') ]]</para>
<para style="terp_default_Centre_7">With balance is not equal to 0[[ data['form']['display_account']=='not_zero' and ' ' or removeParentNode('para') ]]</para>
<td> <para style="terp_default_Centre_8">[[ not has_filter(data) and get_filter(data) or removeParentNode('para') ]] </para>
<blockTable colWidths="60.0,60.0" style="Table5">[[ data['form']['filter']=='filter_date' or removeParentNode('blockTable') ]]
<tr>
<td>
addons/account/report/account_general_journal.rml
+2 -2
View File
@@ -220,8 +220,8 @@
</blockTable>
<blockTable colWidths="80.0,100,80.0,150.0,100.0" style="Table2">
<tr>
<td><para style="terp_tblheader_General_Centre">[[ data['model']=='account.journal.period' and 'Company' or removeParentNode('para') ]]</para>
<para style="terp_tblheader_General_Centre"> [[ data['model']=='ir.ui.menu' and 'Chart of Accounts' or removeParentNode('para') ]]</para></td>
<td><para style="terp_tblheader_General_Centre">Company[[ data['model']=='account.journal.period'and ' ' or removeParentNode('para') ]]</para>
<para style="terp_tblheader_General_Centre">Chart of Accounts[[ data['model']=='ir.ui.menu' and ' ' or removeParentNode('para') ]]</para></td>
<td><para style="terp_tblheader_General_Centre">Fiscal Year</para></td>
<td><para style="terp_tblheader_General_Centre">Journals</para></td>
<td><para style="terp_tblheader_General_Centre">Filter By [[ data['form']['filter']!='filter_no' and get_filter(data) ]]</para></td>
addons/account/report/account_general_ledger.py
+1
View File
@@ -83,6 +83,7 @@ class general_ledger(report_sxw.rml_parse, common_report_header):
'get_start_period': self.get_start_period,
'get_end_period': self.get_end_period,
'get_filter': self._get_filter,
'has_filter': self._has_filter,
'get_sortby': self._get_sortby,
'get_start_date':self._get_start_date,
'get_end_date':self._get_end_date,
addons/account/report/account_general_ledger_landscape.rml
+5 -4
View File
@@ -16,7 +16,6 @@
<lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
<lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
<lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
<lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
<lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
@@ -360,8 +359,8 @@
<blockTable colWidths="110.0,110.0,110.0,110.0,128.0,93.0,110.0" style="Table1">
<tr>
<td>
<para style="terp_tblheader_General_Centre">[[ data['model']=='account.account' and 'Company' or removeParentNode('para') ]]</para>
<para style="terp_tblheader_General_Centre">[[ data['model']=='ir.ui.menu' and 'Chart of Accounts' or removeParentNode('para') ]]</para>
<para style="terp_tblheader_General_Centre">Company[[ data['model']=='account.account' and ' ' or removeParentNode('para') ]]</para>
<para style="terp_tblheader_General_Centre">Chart of Accounts[[ data['model']=='ir.ui.menu' and ' ' or removeParentNode('para') ]]</para>
</td>
<td>
<para style="terp_tblheader_General_Centre">Fiscal Year</para>
@@ -395,7 +394,9 @@
<para style="terp_default_Centre_7">[[', '.join([ lt or '' for lt in get_journal(data) ]) ]]</para>
</td>
<td>
<para style="terp_default_Centre_7">[[ (data['form']['display_account']=='all' and 'All') or (data['form']['display_account']=='movement' and 'With movements') or 'With balance is not equal to 0']]</para>
<para style="terp_default_Centre_7">All[[ data['form']['display_account']=='all' and ' ' or removeParentNode('para') ]]</para>
<para style="terp_default_Centre_7">With movements[[ data['form']['display_account']=='movement' and ' ' or removeParentNode('para') ]]</para>
<para style="terp_default_Centre_7">With balance is not equal to 0[[ data['form']['display_account']=='not_zero' and ' ' or removeParentNode('para') ]]</para>
</td>
<td>
<para style="terp_default_Centre_7">[[ data['form']['filter']=='filter_no' and get_filter(data) or removeParentNode('para') ]]</para>
addons/account/report/account_journal.py
+7 -5
View File
@@ -23,6 +23,8 @@ import time
from common_report_header import common_report_header
from report import report_sxw
from tools.translate import _
class journal_print(report_sxw.rml_parse, common_report_header):
def __init__(self, cr, uid, name, context=None):
@@ -189,11 +191,11 @@ class journal_print(report_sxw.rml_parse, common_report_header):
return data['form']['amount_currency']
def _get_sortby(self, data):
if self.sort_selection == 'date':
return 'Date'
elif self.sort_selection == 'ref':
return 'Reference Number'
return 'Date'
if self.sort_selection == 'l.date':
return _('Date')
elif self.sort_selection == 'am.name':
return _('Journal Entry Number')
return _('Date')
report_sxw.report_sxw('report.account.journal.period.print', 'account.journal.period', 'addons/account/report/account_journal.rml', parser=journal_print, header='internal')
report_sxw.report_sxw('report.account.journal.period.print.sale.purchase', 'account.journal.period', 'addons/account/report/account_journal_sale_purchase.rml', parser=journal_print, header='internal')
addons/account/report/account_journal.rml
+2 -2
View File
@@ -186,8 +186,8 @@
</para>
<blockTable colWidths="85.0,80.0,80.0,120.0,70.0,100.0" style="Table2">
<tr>
<td><para style="terp_tblheader_General_Centre"> [[ data['model']=='account.journal.period'and 'Company' or removeParentNode('para') ]]</para>
<para style="terp_tblheader_General_Centre">[[ data['model']=='ir.ui.menu' and 'Chart of Accounts' or removeParentNode('para') ]]</para></td>
<td><para style="terp_tblheader_General_Centre">Company[[ data['model']=='account.journal.period'and ' ' or removeParentNode('para') ]]</para>
<para style="terp_tblheader_General_Centre">Chart of Accounts[[ data['model']=='ir.ui.menu' and ' ' or removeParentNode('para') ]]</para></td>
<td><para style="terp_tblheader_General_Centre">Fiscal Year</para></td>
<td><para style="terp_tblheader_General_Centre">Journal</para></td>
<td><para style="terp_tblheader_General_Centre">Period</para></td>
addons/account/report/account_journal_sale_purchase.rml
+2 -2
View File
@@ -186,8 +186,8 @@
</para>
<blockTable colWidths="85.0,80.0,80.0,120.0,70.0,100.0" style="Table2">
<tr>
<td><para style="terp_tblheader_General_Centre"> [[ data['model']=='account.journal.period'and 'Company' or removeParentNode('para') ]]</para>
<para style="terp_tblheader_General_Centre">[[ data['model']=='ir.ui.menu' and 'Chart of Accounts' or removeParentNode('para') ]]</para></td>
<td><para style="terp_tblheader_General_Centre">Company[[ data['model']=='account.journal.period'and ' ' or removeParentNode('para') ]]</para>
<para style="terp_tblheader_General_Centre">Chart of Accounts[[ data['model']=='ir.ui.menu' and ' ' or removeParentNode('para') ]]</para></td>
<td><para style="terp_tblheader_General_Centre">Fiscal Year</para></td>
<td><para style="terp_tblheader_General_Centre">Journal</para></td>
<td><para style="terp_tblheader_General_Centre">Period</para></td>
addons/account/report/account_partner_ledger.py
+3 -3
View File
@@ -391,11 +391,11 @@ class third_party_ledger(report_sxw.rml_parse, common_report_header):
def _get_partners(self):
if self.result_selection == 'customer':
return 'Receivable Accounts'
return _('Receivable Accounts')
elif self.result_selection == 'supplier':
return 'Payable Accounts'
return _('Payable Accounts')
elif self.result_selection == 'customer_supplier':
return 'Receivable and Payable Accounts'
return _('Receivable and Payable Accounts')
return ''
def _sum_currency_amount_account(self, account, form):
addons/account/report/account_tax_report.py
+6 -1
View File
@@ -23,6 +23,7 @@ import time
from common_report_header import common_report_header
from report import report_sxw
from tools.translate import _
class tax_report(report_sxw.rml_parse, common_report_header):
_name = 'report.account.vat.declaration'
@@ -62,7 +63,11 @@ class tax_report(report_sxw.rml_parse, common_report_header):
})
def _get_basedon(self, form):
return form['form']['based_on']
based_on = form['form']['based_on']
if based_on == 'invoices':
return _('Invoices')
elif based_on == 'payments':
return _('Payments')
def _get_lines(self, based_on, company_id=False, parent=False, level=0, context=None):
period_list = self.period_ids
addons/account/report/common_report_header.py
+7 -4
View File
@@ -92,12 +92,15 @@ class common_report_header(object):
raise (_('Error'), _('Not implemented'))
def _get_filter(self, data):
if data.get('form', False) and data['form'].get('filter', False):
if self._has_filter(data):
if data['form']['filter'] == 'filter_date':
return 'Date'
return _('Date')
elif data['form']['filter'] == 'filter_period':
return 'Periods'
return 'No Filter'
return _('Periods')
return _('No Filters')
def _has_filter(self, data):
return data.get('form', False) and data['form'].get('filter', False) and data['form'].get('filter', False) != 'filter_no'
def _sum_debit_period(self, period_id, journal_id=None):
journals = journal_id or self.journal_ids
addons/account/wizard/account_report_print_journal.py
+1 -1
View File
@@ -53,7 +53,7 @@ class account_print_journal(osv.osv_memory):
if context.get('sale_purchase_only'):
domain ="[('type', 'in', ('sale','purchase','sale_refund','purchase_refund'))]"
else:
domain ="[('type', 'not in', ('sale','purchase','sale_refund','purchase_refund'))]"
domain ="[]"
nodes = doc.xpath("//field[@name='journal_ids']")
for node in nodes:
node.set('domain', domain)
addons/account_budget/account_budget_report.xml
+9 -1
View File
@@ -19,6 +19,14 @@
name="account.budget"
rml="account_budget/report/budget_report.rml"
string="Budget"/>
<report auto="False"
id="account_budget_analytic"
menu="False"
model="account.analytic.account"
name="account.analytic.account.budget"
rml="account_budget/report/analytic_account_budget_report.rml"
string="Analytic Budget"/>
</data>
</openerp>
</openerp>
addons/account_budget/i18n/account_budget.pot
+24 -3
View File
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.1rc1\n"
"Project-Id-Version: OpenERP Server 6.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-02-08 00:35+0000\n"
"PO-Revision-Date: 2012-02-08 00:35+0000\n"
"POT-Creation-Date: 2012-10-08 12:28+0000\n"
"PO-Revision-Date: 2012-10-08 12:28+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -103,6 +103,7 @@ msgid "Percentage"
msgstr ""
#. module: account_budget
#: report:account.analytic.account.budget:0
#: report:crossovered.budget.report:0
msgid "to"
msgstr ""
@@ -124,18 +125,21 @@ msgid "The Budget '%s' has no accounts!"
msgstr ""
#. module: account_budget
#: report:account.analytic.account.budget:0
#: report:account.budget:0
#: report:crossovered.budget.report:0
msgid "%"
msgstr ""
#. module: account_budget
#: report:account.analytic.account.budget:0
#: report:account.budget:0
#: report:crossovered.budget.report:0
msgid "Description"
msgstr ""
#. module: account_budget
#: report:account.analytic.account.budget:0
#: report:crossovered.budget.report:0
msgid "Currency"
msgstr ""
@@ -170,6 +174,7 @@ msgid "Planned Amount"
msgstr ""
#. module: account_budget
#: report:account.analytic.account.budget:0
#: report:account.budget:0
#: report:crossovered.budget.report:0
msgid "Perc(%)"
@@ -182,6 +187,7 @@ msgid "Done"
msgstr ""
#. module: account_budget
#: report:account.analytic.account.budget:0
#: report:account.budget:0
#: report:crossovered.budget.report:0
msgid "Practical Amt"
@@ -218,6 +224,11 @@ msgstr ""
msgid "Name"
msgstr ""
#. module: account_budget
#: report:account.analytic.account.budget:0
msgid "Total:"
msgstr ""
#. module: account_budget
#: model:ir.model,name:account_budget.model_crossovered_budget_lines
msgid "Budget Line"
@@ -284,6 +295,12 @@ msgstr ""
msgid "Cancelled"
msgstr ""
#. module: account_budget
#: report:account.analytic.account.budget:0
#: model:ir.actions.report.xml,name:account_budget.account_budget_analytic
msgid "Analytic Budget"
msgstr ""
#. module: account_budget
#: view:crossovered.budget:0
msgid "Approve"
@@ -316,6 +333,7 @@ msgid "Account Budget crossvered summary report"
msgstr ""
#. module: account_budget
#: report:account.analytic.account.budget:0
#: report:account.budget:0
#: report:crossovered.budget.report:0
msgid "Theoretical Amt"
@@ -345,6 +363,7 @@ msgid "Theoretical Amount"
msgstr ""
#. module: account_budget
#: report:account.analytic.account.budget:0
#: field:crossovered.budget.lines,analytic_account_id:0
#: model:ir.model,name:account_budget.model_account_analytic_account
msgid "Analytic Account"
@@ -356,6 +375,7 @@ msgid "Budget :"
msgstr ""
#. module: account_budget
#: report:account.analytic.account.budget:0
#: report:account.budget:0
#: report:crossovered.budget.report:0
msgid "Planned Amt"
@@ -396,6 +416,7 @@ msgid "Error! You can not create recursive analytic accounts."
msgstr ""
#. module: account_budget
#: report:account.analytic.account.budget:0
#: report:account.budget:0
#: report:crossovered.budget.report:0
msgid "Analysis from"
addons/account_budget/report/analytic_account_budget_report.py
+1 -1
View File
@@ -167,4 +167,4 @@ class analytic_account_budget_report(report_sxw.rml_parse):
report_sxw.report_sxw('report.account.analytic.account.budget', 'account.analytic.account', 'addons/account_budget/report/analytic_account_budget_report.rml',parser=analytic_account_budget_report,header='internal')
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/account_payment/i18n/account_payment.pot
+10 -3
View File
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.1rc1\n"
"Project-Id-Version: OpenERP Server 6.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-02-08 00:35+0000\n"
"PO-Revision-Date: 2012-02-08 00:35+0000\n"
"POT-Creation-Date: 2012-10-08 12:28+0000\n"
"PO-Revision-Date: 2012-10-08 12:28+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -94,6 +94,11 @@ msgstr ""
msgid "Entries"
msgstr ""
#. module: account_payment
#: report:payment.order:0
msgid "Now"
msgstr ""
#. module: account_payment
#: report:payment.order:0
msgid "Used Account"
@@ -271,6 +276,7 @@ msgid "Bank or Cash Journal for the Payment Mode"
msgstr ""
#. module: account_payment
#: report:payment.order:0
#: selection:payment.order,date_prefered:0
msgid "Fixed date"
msgstr ""
@@ -329,6 +335,7 @@ msgid "Bank statement line"
msgstr ""
#. module: account_payment
#: report:payment.order:0
#: selection:payment.order,date_prefered:0
msgid "Due date"
msgstr ""
addons/account_payment/report/order.rml
+3 -3
View File
@@ -205,9 +205,9 @@
<para style="terp_default_Centre_8">[[get_account_name(o.mode.bank_id.id)]]</para>
</td>
<td>
<para style="terp_default_Centre_8">[[ o.date_prefered == 'now' and 'Now' or removeParentNode('para') ]]</para>
<para style="terp_default_Centre_8">[[ o.date_prefered == 'due' and 'Due date' or removeParentNode('para') ]]</para>
<para style="terp_default_Centre_8">[[ o.date_prefered == 'fixed' and 'Fixed date' or removeParentNode('para') ]]</para>
<para style="terp_default_Centre_8">Now[[ o.date_prefered == 'now' and ' ' or removeParentNode('para') ]]</para>
<para style="terp_default_Centre_8">Due date[[ o.date_prefered == 'due' and ' ' or removeParentNode('para') ]]</para>
<para style="terp_default_Centre_8">Fixed date[[ o.date_prefered == 'fixed' and ' ' or removeParentNode('para') ]]</para>
</td>
<td>
<para style="terp_default_Centre_8">[[ o.user_id and o.user_id.company_id and o.user_id.company_id.currency_id and o.user_id.company_id.currency_id.name or '' ]]</para>
addons/account_payment/report/payment_order.py
+1 -1
View File
@@ -87,4 +87,4 @@ class payment_order(report_sxw.rml_parse):
report_sxw.report_sxw('report.payment.order', 'payment.order', 'addons/account_payment/report/payment_order.rml', parser=payment_order, header="external")
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/hr_holidays/i18n/hr_holidays.pot
+116 -112
View File
@@ -1,39 +1,19 @@
# #-#-#-#-# hr_holidays.pot (OpenERP Server 6.1rc1) #-#-#-#-#
# Translation of OpenERP Server.
# This file contains the translation of the following modules:
# * hr_holidays
# * hr_holidays
#
# #-#-#-#-# hr_holidays.pot.web (PROJECT VERSION) #-#-#-#-#
# Translations template for PROJECT.
# Copyright (C) 2012 ORGANIZATION
# This file is distributed under the same license as the PROJECT project.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
#
#, fuzzy
msgid ""
msgstr ""
"#-#-#-#-# hr_holidays.pot (OpenERP Server 6.1rc1) #-#-#-#-#\n"
"Project-Id-Version: OpenERP Server 6.1rc1\n"
"Project-Id-Version: OpenERP Server 6.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-02-08 00:35+0000\n"
"PO-Revision-Date: 2012-02-08 00:35+0000\n"
"POT-Creation-Date: 2012-10-08 12:28+0000\n"
"PO-Revision-Date: 2012-10-08 12:28+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"
"#-#-#-#-# hr_holidays.pot.web (PROJECT VERSION) #-#-#-#-#\n"
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2012-02-08 01:37+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 0.9.6\n"
#. module: hr_holidays
#: selection:hr.holidays.status,color_name:0
@@ -46,7 +26,8 @@ msgid "Allocation Type"
msgstr ""
#. module: hr_holidays
#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
#: selection:hr.employee,current_leave_state:0
#: selection:hr.holidays,state:0
msgid "Waiting Second Approval"
msgstr ""
@@ -71,7 +52,8 @@ msgid "Allocation Mode"
msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0 field:hr.holidays,department_id:0
#: view:hr.holidays:0
#: field:hr.holidays,department_id:0
msgid "Department"
msgstr ""
@@ -81,7 +63,8 @@ msgid "Requests Approve"
msgstr ""
#. module: hr_holidays
#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
#: selection:hr.employee,current_leave_state:0
#: selection:hr.holidays,state:0
msgid "Refused"
msgstr ""
@@ -105,6 +88,16 @@ msgstr ""
msgid "Remaining Days"
msgstr ""
#. module: hr_holidays
#: xsl:holidays.summary:0
msgid "of the"
msgstr ""
#. module: hr_holidays
#: xsl:holidays.summary:0
msgid "Off-Days' Summary"
msgstr ""
#. module: hr_holidays
#: selection:hr.holidays,holiday_type:0
msgid "By Employee"
@@ -112,9 +105,7 @@ msgstr ""
#. module: hr_holidays
#: help:hr.holidays,employee_id:0
msgid ""
"Leave Manager can let this field empty if this leave request/allocation is "
"for every employee"
msgid "Leave Manager can let this field empty if this leave request/allocation is for every employee"
msgstr ""
#. module: hr_holidays
@@ -122,6 +113,11 @@ msgstr ""
msgid "Set to Draft"
msgstr ""
#. module: hr_holidays
#: xsl:holidays.summary:0
msgid "to"
msgstr ""
#. module: hr_holidays
#: selection:hr.holidays.status,color_name:0
msgid "Light Cyan"
@@ -139,11 +135,7 @@ msgstr ""
#. module: hr_holidays
#: model:ir.actions.act_window,help:hr_holidays.open_ask_holidays
msgid ""
"Leave requests can be recorded by employees and validated by their managers. "
"Once a leave request is validated, it appears automatically in the agenda of "
"the employee. You can define several allowance types (paid holidays, "
"sickness, etc.) and manage allowances per type."
msgid "Leave requests can be recorded by employees and validated by their managers. Once a leave request is validated, it appears automatically in the agenda of the employee. You can define several allowance types (paid holidays, sickness, etc.) and manage allowances per type."
msgstr ""
#. module: hr_holidays
@@ -152,7 +144,8 @@ msgid "Summary Of Leaves"
msgstr ""
#. module: hr_holidays
#: selection:hr.employee,current_leave_state:0 view:hr.holidays:0
#: selection:hr.employee,current_leave_state:0
#: view:hr.holidays:0
#: selection:hr.holidays,state:0
msgid "Approved"
msgstr ""
@@ -162,6 +155,11 @@ msgstr ""
msgid "Latest Connection"
msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0
msgid "Search Leave"
msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0
msgid "Refuse"
@@ -170,18 +168,14 @@ msgstr ""
#. module: hr_holidays
#: code:addons/hr_holidays/hr_holidays.py:344
#, python-format
msgid ""
"You cannot validate leaves for employee %s: too few remaining days (%s)."
msgid "You cannot validate leaves for employee %s: too few remaining days (%s)."
msgstr ""
#. module: hr_holidays
#: help:hr.holidays,state:0
msgid ""
"The state is set to 'Draft', when a holiday request is created. \n"
"The state is 'Waiting Approval', when holiday request is confirmed by "
"user. \n"
"The state is 'Refused', when holiday request is refused by "
"manager. \n"
msgid "The state is set to 'Draft', when a holiday request is created. \n"
"The state is 'Waiting Approval', when holiday request is confirmed by user. \n"
"The state is 'Refused', when holiday request is refused by manager. \n"
"The state is 'Approved', when holiday request is approved by manager."
msgstr ""
@@ -194,8 +188,8 @@ msgid "Leaves"
msgstr ""
#. module: hr_holidays
#: model:ir.model,name:hr_holidays.model_hr_holidays
msgid "Leave"
#: xsl:holidays.summary:0
msgid "Analyze from"
msgstr ""
#. module: hr_holidays
@@ -209,23 +203,20 @@ msgid "Leaves by Department"
msgstr ""
#. module: hr_holidays
#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
#: selection:hr.employee,current_leave_state:0
#: selection:hr.holidays,state:0
msgid "Cancelled"
msgstr ""
#. module: hr_holidays
#: help:hr.holidays,type:0
msgid ""
"Choose 'Leave Request' if someone wants to take an off-day. \n"
"Choose 'Allocation Request' if you want to increase the number of leaves "
"available for someone"
msgid "Choose 'Leave Request' if someone wants to take an off-day. \n"
"Choose 'Allocation Request' if you want to increase the number of leaves available for someone"
msgstr ""
#. module: hr_holidays
#: help:hr.employee,remaining_leaves:0
msgid ""
"Total number of legal leaves allocated to this employee, change this value "
"to create allocation/leave requests."
msgid "Total number of legal leaves allocated to this employee, change this value to create allocation/leave requests."
msgstr ""
#. module: hr_holidays
@@ -257,7 +248,8 @@ msgstr ""
#. module: hr_holidays
#: field:hr.holidays,holiday_status_id:0
#: field:hr.holidays.remaining.leaves.user,leave_type:0
#: view:hr.holidays.status:0 field:hr.holidays.status,name:0
#: view:hr.holidays.status:0
#: field:hr.holidays.status,name:0
#: field:hr.holidays.summary.dept,holiday_type:0
#: model:ir.actions.act_window,name:hr_holidays.open_view_holiday_status
#: model:ir.model,name:hr_holidays.model_hr_holidays_status
@@ -306,13 +298,19 @@ msgstr ""
msgid "Leave Request for %s"
msgstr ""
#. module: hr_holidays
#: xsl:holidays.summary:0
msgid "Sum"
msgstr ""
#. module: hr_holidays
#: field:hr.holidays.status,remaining_leaves:0
msgid "Remaining Leaves"
msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0 field:hr.holidays,state:0
#: view:hr.holidays:0
#: field:hr.holidays,state:0
msgid "State"
msgstr ""
@@ -322,14 +320,17 @@ msgid "Total holidays by type"
msgstr ""
#. module: hr_holidays
#: view:hr.employee:0 view:hr.holidays:0 field:hr.holidays,employee_id:0
#: view:hr.employee:0
#: view:hr.holidays:0
#: field:hr.holidays,employee_id:0
#: field:hr.holidays.remaining.leaves.user,name:0
#: model:ir.model,name:hr_holidays.model_hr_employee
msgid "Employee"
msgstr ""
#. module: hr_holidays
#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
#: selection:hr.employee,current_leave_state:0
#: selection:hr.holidays,state:0
msgid "New"
msgstr ""
@@ -370,7 +371,8 @@ msgid "Allocation for %s"
msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0 field:hr.holidays,number_of_days:0
#: view:hr.holidays:0
#: field:hr.holidays,number_of_days:0
#: field:hr.holidays,number_of_days_temp:0
msgid "Number of Days"
msgstr ""
@@ -378,14 +380,8 @@ msgstr ""
#. module: hr_holidays
#: code:addons/hr_holidays/hr_holidays.py:377
#, python-format
msgid ""
"The feature behind the field 'Remaining Legal Leaves' can only be used when "
"there is only one leave type with the option 'Allow to Override Limit' "
"unchecked. (%s Found). Otherwise, the update is ambiguous as we cannot "
"decide on which leave type the update has to be done. \n"
"You may prefer to use the classic menus 'Leave Requests' and 'Allocation "
"Requests' located in 'Human Resources \\ Leaves' to manage the leave days of "
"the employees if the configuration does not allow to use this field."
msgid "The feature behind the field 'Remaining Legal Leaves' can only be used when there is only one leave type with the option 'Allow to Override Limit' unchecked. (%s Found). Otherwise, the update is ambiguous as we cannot decide on which leave type the update has to be done. \n"
"You may prefer to use the classic menus 'Leave Requests' and 'Allocation Requests' located in 'Human Resources \\ Leaves' to manage the leave days of the employees if the configuration does not allow to use this field."
msgstr ""
#. module: hr_holidays
@@ -400,13 +396,12 @@ msgstr ""
#. module: hr_holidays
#: help:hr.holidays.status,double_validation:0
msgid ""
"If its True then its Allocation/Request have to be validated by second "
"validator"
msgid "If its True then its Allocation/Request have to be validated by second validator"
msgstr ""
#. module: hr_holidays
#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
#: selection:hr.employee,current_leave_state:0
#: selection:hr.holidays,state:0
msgid "Waiting Approval"
msgstr ""
@@ -417,9 +412,7 @@ msgstr ""
#. module: hr_holidays
#: help:hr.holidays.status,categ_id:0
msgid ""
"If you set a meeting type, OpenERP will create a meeting in the calendar "
"once a leave is validated."
msgid "If you set a meeting type, OpenERP will create a meeting in the calendar once a leave is validated."
msgstr ""
#. module: hr_holidays
@@ -438,6 +431,7 @@ msgid "Lavender"
msgstr ""
#. module: hr_holidays
#: xsl:holidays.summary:0
#: view:hr.holidays:0
msgid "Month"
msgstr ""
@@ -461,15 +455,14 @@ msgid "Employee's Holidays"
msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0 field:hr.holidays,category_id:0
#: view:hr.holidays:0
#: field:hr.holidays,category_id:0
msgid "Category"
msgstr ""
#. module: hr_holidays
#: help:hr.holidays.status,max_leaves:0
msgid ""
"This value is given by the sum of all holidays requests with a positive "
"value."
msgid "This value is given by the sum of all holidays requests with a positive value."
msgstr ""
#. module: hr_holidays
@@ -504,7 +497,8 @@ msgid "Holiday"
msgstr ""
#. module: hr_holidays
#: field:hr.holidays,case_id:0 field:hr.holidays.status,categ_id:0
#: field:hr.holidays,case_id:0
#: field:hr.holidays.status,categ_id:0
msgid "Meeting"
msgstr ""
@@ -524,6 +518,11 @@ msgstr ""
msgid "Leaves Already Taken"
msgstr ""
#. module: hr_holidays
#: xsl:holidays.summary:0
msgid "holidays."
msgstr ""
#. module: hr_holidays
#: field:hr.holidays,user_id:0
#: field:hr.holidays.remaining.leaves.user,user_id:0
@@ -551,7 +550,8 @@ msgid "Error ! You cannot create recursive Hierarchy of Employees."
msgstr ""
#. module: hr_holidays
#: view:hr.employee:0 field:hr.employee,remaining_leaves:0
#: view:hr.employee:0
#: field:hr.employee,remaining_leaves:0
msgid "Remaining Legal Leaves"
msgstr ""
@@ -610,9 +610,7 @@ msgstr ""
#. module: hr_holidays
#: help:hr.holidays.status,active:0
msgid ""
"If the active field is set to false, it will allow you to hide the leave "
"type without removing it."
msgid "If the active field is set to false, it will allow you to hide the leave type without removing it."
msgstr ""
#. module: hr_holidays
@@ -631,8 +629,8 @@ msgid "Compensatory Days"
msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0 field:hr.holidays,notes:0
msgid "Reasons"
#: selection:hr.holidays.status,color_name:0
msgid "Light Yellow"
msgstr ""
#. module: hr_holidays
@@ -642,25 +640,26 @@ msgid "Leaves Analysis"
msgstr ""
#. module: hr_holidays
#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
#: view:hr.holidays.summary.dept:0
#: view:hr.holidays.summary.employee:0
msgid "Cancel"
msgstr ""
#. module: hr_holidays
#: help:hr.holidays.status,color_name:0
msgid ""
"This color will be used in the leaves summary located in Reporting\\Leaves "
"by Departement"
msgid "This color will be used in the leaves summary located in Reporting\\Leaves by Departement"
msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0 selection:hr.holidays.summary.dept,holiday_type:0
#: view:hr.holidays:0
#: selection:hr.holidays.summary.dept,holiday_type:0
#: selection:hr.holidays.summary.employee,holiday_type:0
msgid "Validated"
msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0 selection:hr.holidays,type:0
#: view:hr.holidays:0
#: selection:hr.holidays,type:0
msgid "Allocation Request"
msgstr ""
@@ -676,7 +675,13 @@ msgid "Apply Double Validation"
msgstr ""
#. module: hr_holidays
#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
#: xsl:holidays.summary:0
msgid "Holiday Type"
msgstr ""
#. module: hr_holidays
#: view:hr.holidays.summary.dept:0
#: view:hr.holidays.summary.employee:0
msgid "Print"
msgstr ""
@@ -697,7 +702,8 @@ msgid "By Employee Category"
msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0 selection:hr.holidays,type:0
#: view:hr.holidays:0
#: selection:hr.holidays,type:0
msgid "Leave Request"
msgstr ""
@@ -718,9 +724,7 @@ msgstr ""
#. module: hr_holidays
#: help:hr.holidays,holiday_type:0
msgid ""
"By Employee: Allocation/Request for individual Employee, By Employee "
"Category: Allocation/Request for group of employees in category"
msgid "By Employee: Allocation/Request for individual Employee, By Employee Category: Allocation/Request for group of employees in category"
msgstr ""
#. module: hr_holidays
@@ -731,7 +735,8 @@ msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0
msgid "Search Leave"
#: field:hr.holidays,notes:0
msgid "Reasons"
msgstr ""
#. module: hr_holidays
@@ -766,16 +771,12 @@ msgstr ""
#. module: hr_holidays
#: help:hr.holidays.status,limit:0
msgid ""
"If you tick this checkbox, the system will allow, for this section, the "
"employees to take more leaves than the available ones."
msgid "If you tick this checkbox, the system will allow, for this section, the employees to take more leaves than the available ones."
msgstr ""
#. module: hr_holidays
#: help:hr.holidays.status,leaves_taken:0
msgid ""
"This value is given by the sum of all holidays requests with a negative "
"value."
msgid "This value is given by the sum of all holidays requests with a negative value."
msgstr ""
#. module: hr_holidays
@@ -785,9 +786,7 @@ msgstr ""
#. module: hr_holidays
#: model:ir.actions.act_window,help:hr_holidays.hr_holidays_leaves_assign_legal
msgid ""
"You can assign remaining Legal Leaves for each employee, OpenERP will "
"automatically create and validate allocation requests."
msgid "You can assign remaining Legal Leaves for each employee, OpenERP will automatically create and validate allocation requests."
msgstr ""
#. module: hr_holidays
@@ -797,9 +796,7 @@ msgstr ""
#. module: hr_holidays
#: help:hr.holidays,manager_id2:0
msgid ""
"This area is automaticly filled by the user who validate the leave with "
"second level (If Leave type need second validation)"
msgid "This area is automaticly filled by the user who validate the leave with second level (If Leave type need second validation)"
msgstr ""
#. module: hr_holidays
@@ -818,10 +815,16 @@ msgid "Approve"
msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0 field:hr.holidays,date_from:0
#: view:hr.holidays:0
#: field:hr.holidays,date_from:0
msgid "Start Date"
msgstr ""
#. module: hr_holidays
#: model:ir.model,name:hr_holidays.model_hr_holidays
msgid "Leave"
msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0
#: model:ir.actions.act_window,name:hr_holidays.open_allocation_holidays
@@ -830,8 +833,8 @@ msgid "Allocation Requests"
msgstr ""
#. module: hr_holidays
#: selection:hr.holidays.status,color_name:0
msgid "Light Yellow"
#: xsl:holidays.summary:0
msgid "Color"
msgstr ""
#. module: hr_holidays
@@ -858,3 +861,4 @@ msgstr ""
#: view:hr.holidays:0
msgid "To Approve"
msgstr ""
addons/hr_timesheet/i18n/hr_timesheet.pot
+33 -17
View File
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.1rc1\n"
"Project-Id-Version: OpenERP Server 6.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-02-08 00:36+0000\n"
"PO-Revision-Date: 2012-02-08 00:36+0000\n"
"POT-Creation-Date: 2012-10-08 12:29+0000\n"
"PO-Revision-Date: 2012-10-08 12:29+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -199,6 +199,11 @@ msgstr ""
msgid "Sun"
msgstr ""
#. module: hr_timesheet
#: xsl:hr.analytical.timesheet:0
msgid "Sum"
msgstr ""
#. module: hr_timesheet
#: view:hr.analytic.timesheet:0
msgid "Analytic account"
@@ -242,11 +247,6 @@ msgstr ""
msgid "Categories"
msgstr ""
#. module: hr_timesheet
#: constraint:hr.analytic.timesheet:0
msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
msgstr ""
#. module: hr_timesheet
#: help:hr.employee,product_id:0
msgid "Specifies employee's designation as a product with type 'service'."
@@ -267,8 +267,12 @@ msgid "September"
msgstr ""
#. module: hr_timesheet
#: model:ir.model,name:hr_timesheet.model_hr_analytic_timesheet
msgid "Timesheet Line"
#: code:addons/hr_timesheet/report/user_timesheet.py:40
#: code:addons/hr_timesheet/report/users_timesheet.py:73
#: selection:hr.analytical.timesheet.employee,month:0
#: selection:hr.analytical.timesheet.users,month:0
#, python-format
msgid "December"
msgstr ""
#. module: hr_timesheet
@@ -298,6 +302,11 @@ msgstr ""
msgid "Invoice Analysis"
msgstr ""
#. module: hr_timesheet
#: xsl:hr.analytical.timesheet:0
msgid "Timesheet by Employee"
msgstr ""
#. module: hr_timesheet
#: model:ir.actions.report.xml,name:hr_timesheet.report_user_timesheet
msgid "Employee timesheet"
@@ -450,12 +459,8 @@ msgid "My Timesheet"
msgstr ""
#. module: hr_timesheet
#: code:addons/hr_timesheet/report/user_timesheet.py:40
#: code:addons/hr_timesheet/report/users_timesheet.py:73
#: selection:hr.analytical.timesheet.employee,month:0
#: selection:hr.analytical.timesheet.users,month:0
#, python-format
msgid "December"
#: constraint:hr.analytic.timesheet:0
msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
msgstr ""
#. module: hr_timesheet
@@ -467,9 +472,9 @@ msgid "Cancel"
msgstr ""
#. module: hr_timesheet
#: xsl:hr.analytical.timesheet_users:0
#: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_users
#: model:ir.actions.report.xml,name:hr_timesheet.report_users_timesheet
#: model:ir.actions.wizard,name:hr_timesheet.wizard_hr_timesheet_users
#: model:ir.ui.menu,name:hr_timesheet.menu_hr_timesheet_users
msgid "Employees Timesheet"
msgstr ""
@@ -496,6 +501,11 @@ msgstr ""
msgid "Current Date"
msgstr ""
#. module: hr_timesheet
#: model:ir.model,name:hr_timesheet.model_hr_analytic_timesheet
msgid "Timesheet Line"
msgstr ""
#. module: hr_timesheet
#: view:hr.analytical.timesheet.employee:0
msgid "This wizard will print monthly timesheet"
@@ -613,6 +623,12 @@ msgstr ""
msgid "Accounting"
msgstr ""
#. module: hr_timesheet
#: xsl:hr.analytical.timesheet:0
#: xsl:hr.analytical.timesheet_users:0
msgid "Total"
msgstr ""
#. module: hr_timesheet
#: view:hr.sign.out.project:0
msgid "Change Work"
addons/product/i18n/product.pot
+14 -9
View File
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.1rc1\n"
"Project-Id-Version: OpenERP Server 6.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-02-08 00:37+0000\n"
"PO-Revision-Date: 2012-02-08 00:37+0000\n"
"POT-Creation-Date: 2012-10-08 12:29+0000\n"
"PO-Revision-Date: 2012-10-08 12:29+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -996,6 +996,11 @@ msgstr ""
msgid "To Sell"
msgstr ""
#. module: product
#: help:product.product,ean13:0
msgid "Barcode"
msgstr ""
#. module: product
#: help:product.product,outgoing_qty:0
msgid "Quantity of products that are planned to leave.\n"
@@ -1179,12 +1184,6 @@ msgstr ""
msgid "Pallet Dimension"
msgstr ""
#. module: product
#: code:addons/product/product.py:668
#, python-format
msgid " (copy)"
msgstr ""
#. module: product
#: field:product.template,seller_ids:0
msgid "Partners"
@@ -1541,6 +1540,12 @@ msgstr ""
msgid "Make to Order"
msgstr ""
#. module: product
#: code:addons/product/report/product_pricelist.py:49
#, python-format
msgid "units"
msgstr ""
#. module: product
#: help:product.template,supply_method:0
msgid "Produce will generate production order or tasks, according to the product type. Buy will trigger purchase orders when requested."
addons/product/report/product_pricelist.py
+1 -1
View File
@@ -46,7 +46,7 @@ class product_pricelist(report_sxw.rml_parse):
for i in range(1,6):
if form['qty'+str(i)]!=0:
vals['qty'+str(qtys)] = str(form['qty'+str(i)]) + ' units'
vals['qty'+str(qtys)] = str(form['qty'+str(i)]) + ' ' + _('units')
qtys += 1
lst.append(vals)
return lst
addons/stock/i18n/stock.pot
+584 -604
View File
File diff suppressed because it is too large Load Diff
addons/stock/report/lot_move_label.xsl
+2 -2
View File
@@ -54,8 +54,8 @@
<xsl:template match="lot-line" mode="story">
<para style="nospace"><xsl:value-of select="code"/><xsl:text>, </xsl:text><xsl:value-of select="quantity"/><xsl:text> </xsl:text><xsl:value-of select="uom"/></para>
<para style="nospace"><xsl:value-of select="product"/><xsl:text> </xsl:text><xsl:value-of select="variant"/></para>
<para style="nospace">Serial: <xsl:value-of select="serial"/></para>
<para style="nospace">Tracking: <xsl:value-of select="serial"/></para>
<para style="nospace" t="1">Serial: <xsl:value-of select="serial"/></para>
<para style="nospace" t="1">Tracking: <xsl:value-of select="serial"/></para>
<spacer length="0.3cm"/>
<barCode><xsl:value-of select="tracking"/></barCode>
<nextFrame/>
addons/stock/report/picking.rml
+6 -3
View File
@@ -262,7 +262,9 @@
<para style="terp_default_Centre_9">[[ (move_lines.prodlot_id and move_lines.prodlot_id.name) or '' ]]</para>
</td>
<td>
<para style="terp_default_9">[[ move_lines.state ]]</para>
<para style="terp_default_9">Waiting Availability[[ move_lines.state == 'confirmed' and ' ' or removeParentNode('para') ]]</para>
<para style="terp_default_9">Done[[ move_lines.state == 'done' and ' ' or removeParentNode('para') ]]</para>
<para style="terp_default_9">Available[[ move_lines.state == 'assigned' and ' ' or removeParentNode('para') ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ (move_lines.location_id and move_lines.location_id.name) or '' ]] </para>
@@ -273,7 +275,7 @@
</tr>
</blockTable>
</section>
<para style="terp_default_Bold_9">[[ ([line for line in picking.move_lines if (line.state == 'draft' or line.state=='waiting' )]) and 'Non Assigned Products:' or removeParentNode('para') ]]</para>
<para style="terp_default_Bold_9">Non Assigned Products:[[ ([line for line in picking.move_lines if (line.state == 'draft' or line.state=='waiting' )]) and ' ' or removeParentNode('para') ]]</para>
<para style="terp_default_2"/>
<section>
<para style="terp_default_2">[[ repeatIn([line for line in picking.move_lines if (line.state == 'draft' or line.state=='waiting')],'move_lines') ]]</para>
@@ -287,7 +289,8 @@
<para style="terp_default_Centre_9">[[ (move_lines.prodlot_id and move_lines.prodlot_id.name) or '' ]]</para>
</td>
<td>
<para style="terp_default_9">[[ move_lines.state ]]</para>
<para style="terp_default_9">New[[ move_lines.state == 'draft' and ' ' or removeParentNode('para') ]]</para>
<para style="terp_default_9">Waiting Another Move[[ move_lines.state == 'waiting' and ' ' or removeParentNode('para') ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ (move_lines.location_id and move_lines.location_id.name) or '' ]] </para>
addons/stock/report/product_stock.py
+3 -3
View File
@@ -56,11 +56,11 @@ class report_stock(report_int):
dt_from = now
dt_to = now
names = dict(pooler.get_pool(cr.dbname).get('product.product').name_get(cr, uid, product_ids))
names = dict(pooler.get_pool(cr.dbname).get('product.product').name_get(cr, uid, product_ids, context=context),)
for name in names:
names[name] = names[name].encode('utf8')
products = {}
prods = pooler.get_pool(cr.dbname).get('stock.location')._product_all_get(cr, uid, location_id, product_ids)
prods = pooler.get_pool(cr.dbname).get('stock.location')._product_all_get(cr, uid, location_id, product_ids, context=context)
for p in prods:
products[p] = [(now,prods[p])]
@@ -102,7 +102,7 @@ class report_stock(report_int):
qty = 0
io = StringIO.StringIO()
gt = stock_graph.stock_graph(io)
gt = stock_graph.stock_graph(io, context.get('lang', 'en_US'), cr)
for prod_id in products:
gt.add(prod_id, names.get(prod_id, 'Unknown'), products[prod_id])
gt.draw()
addons/stock/report/stock_graph.py
+12 -4
View File
@@ -22,19 +22,23 @@ from pychart import *
import pychart.legend
import time
from report.misc import choice_colors
from tools.translate import _
import inspect
#
# Draw a graph for stocks
#
class stock_graph(object):
def __init__(self, io):
def __init__(self, io, lang, cr):
self._datas = {}
self._canvas = canvas.init(fname=io, format='pdf')
self._canvas.set_author("OpenERP")
self._canvas.set_title("Stock Level Forecast")
self._canvas.set_title(_("Stock Level Forecast"))
self._names = {}
self.val_min = ''
self.val_max = ''
self._lang = lang
self._cr = cr
def add(self, product_id, product_name, datas):
if hasattr(product_name, 'replace'):
@@ -90,12 +94,16 @@ class stock_graph(object):
plot = line_plot.T(label=self._names[product_id], data=datas2, line_style=st)
plots.append(plot)
# Cheating to make them available in _(...) calls
context = {'lang': self._lang}
cr = self._cr
interval = max((val_max-val_min)/15, 86400)
x_axis = axis.X(format=lambda x:'/a60{}'+time.strftime('%Y-%m-%d',time.gmtime(x)), tic_interval=interval, label=None)
# For add the report header on the top of the report.
tb = text_box.T(loc=(300, 500), text="/hL/15/bStock Level Forecast", line_style=None)
tb = text_box.T(loc=(300, 500), text="/hL/15/b%s" % _("Stock Level Forecast"), line_style=None)
tb.draw()
ar = area.T(size = (620,435), x_range=(val_min,val_max+1), y_axis = axis.Y(format="%d", label="Virtual Stock (Unit)"), x_axis=x_axis)
ar = area.T(size = (620,435), x_range=(val_min,val_max+1), y_axis = axis.Y(format="%d", label=_("Virtual Stock (Unit)")), x_axis=x_axis)
for plot in plots:
ar.add_plot(plot)
ar.draw(self._canvas)