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

[MERGE] Sync with trunk

Browse Source 
bzr revid: odo@openerp.com-20121017101928-z7o0f26c95c0x3hb
This commit is contained in:
Olivier Dony
2012-10-17 12:19:28 +02:00
parent c7757baf77 04eef2c7a0
commit 035e768cdd
77 changed files with 8962 additions and 6492 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/account.py
-2
View File
@@ -2768,7 +2768,6 @@ class account_chart_template(osv.osv):
'property_account_income_categ': fields.many2one('account.account.template', 'Income Category Account'),
'property_account_expense': fields.many2one('account.account.template', 'Expense Account on Product Template'),
'property_account_income': fields.many2one('account.account.template', 'Income Account on Product Template'),
'property_reserve_and_surplus_account': fields.many2one('account.account.template', 'Reserve and Profit/Loss Account', domain=[('type', '=', 'payable')], help='This Account is used for transferring Profit/Loss(If It is Profit: Amount will be added, Loss: Amount will be deducted.), Which is calculated from Profilt & Loss Report'),
'property_account_income_opening': fields.many2one('account.account.template', 'Opening Entries Income Account'),
'property_account_expense_opening': fields.many2one('account.account.template', 'Opening Entries Expense Account'),
}
@@ -3216,7 +3215,6 @@ class wizard_multi_charts_accounts(osv.osv_memory):
('property_account_income_categ','product.category','account.account'),
('property_account_expense','product.template','account.account'),
('property_account_income','product.template','account.account'),
('property_reserve_and_surplus_account','res.company','account.account')
]
template = self.pool.get('account.chart.template').browse(cr, uid, chart_template_id, context=context)
for record in todo_list:
addons/account/account_move_line.py
+1 -2
View File
@@ -514,8 +514,7 @@ class account_move_line(osv.osv):
'analytic_lines': fields.one2many('account.analytic.line', 'move_id', 'Analytic lines'),
'centralisation': fields.selection([('normal','Normal'),('credit','Credit Centralisation'),('debit','Debit Centralisation'),('currency','Currency Adjustment')], 'Centralisation', size=8),
'balance': fields.function(_balance, fnct_search=_balance_search, string='Balance'),
'state': fields.selection([('draft','Unbalanced'), ('valid','Valid')], 'Status', readonly=True,
help='When new move line is created the state will be \'Draft\'.\n* When all the payments are done it will be in \'Valid\' state.'),
'state': fields.selection([('draft','Unbalanced'), ('valid','Balanced')], 'Status', readonly=True),
'tax_code_id': fields.many2one('account.tax.code', 'Tax Account', help="The Account can either be a base tax code or a tax code account."),
'tax_amount': fields.float('Tax/Base Amount', digits_compute=dp.get_precision('Account'), select=True, help="If the Tax account is a tax code account, this field will contain the taxed amount.If the tax account is base tax code, "\
"this field will contain the basic amount(without tax)."),
addons/account/account_view.xml
+6 -8
View File
@@ -1037,11 +1037,10 @@
-->
<record id="view_move_line_tree_reconcile" model="ir.ui.view">
<field name="name">account.move.line.reconcile.tree</field>
<field name="model">account.move.line</field>
<field eval="24" name="priority"/>
<field name="arch" type="xml">
<tree colors="red:state == 'draft';black:state == 'valid'" string="Journal Items to Reconcile" create="false">
<tree_account_reconciliation colors="red:state == 'draft';black:state == 'valid'" string="Journal Items to Reconcile" create="false" version="7.0">
<field name="date"/>
<field name="move_id"/>
<field name="ref"/>
@@ -1049,9 +1048,10 @@
<field name="partner_id"/>
<field name="account_id"/>
<field name="reconcile_partial_id"/>
<field name="state" invisible="1"/>
<field name="debit" sum="Total debit"/>
<field name="credit" sum="Total credit"/>
</tree>
</tree_account_reconciliation>
</field>
</record>
@@ -1078,7 +1078,7 @@
<field name="currency_id" attrs="{'readonly':[('state','=','valid')]}" groups="base.group_multi_currency"/>
<field name="reconcile_partial_id"/>
<field name="reconcile_id"/>
<field name="state"/>
<field name="state" invisible="1"/>
</tree>
</field>
</record>
@@ -1542,8 +1542,7 @@
<field name="name">Journal Items to Reconcile</field>
<field name="res_model">account.move.line</field>
<field name="view_id" ref="view_move_line_tree_reconcile"/>
<field name="view_type">form</field>
<field name="view_mode">account_reconciliation_list</field>
<field name="view_mode">tree_account_reconciliation</field>
<field name="help" type="html">
<p>
No journal items found.
@@ -1981,7 +1980,7 @@
<field name="credit" sum="Total credit"/>
<field name="account_tax_id"/>
<field name="analytic_account_id" domain="[('parent_id','!=',False)]" groups="analytic.group_analytic_accounting"/>
<field name="state"/>
<field name="state" invisible="1"/>
</tree>
</field>
</record>
@@ -2171,7 +2170,6 @@
<field name="property_account_income" domain="[('id', 'child_of', [account_root_id])]"/>
<field name="property_account_income_opening" domain="[('id', 'child_of', [account_root_id])]"/>
<field name="property_account_expense_opening" domain="[('id', 'child_of', [account_root_id])]"/>
<field name="property_reserve_and_surplus_account" />
</group>
</form>
</field>
addons/account/company.py
-8
View File
@@ -32,14 +32,6 @@ class res_company(osv.osv):
help="If you select 'Round per Line' : for each tax, the tax amount will first be computed and rounded for each PO/SO/invoice line and then these rounded amounts will be summed, leading to the total amount for that tax. If you select 'Round Globally': for each tax, the tax amount will be computed for each PO/SO/invoice line, then these amounts will be summed and eventually this total tax amount will be rounded. If you sell with tax included, you should choose 'Round per line' because you certainly want the sum of your tax-included line subtotals to be equal to the total amount with taxes."),
'paypal_account': fields.char("Paypal Account", size=128, help="Paypal username (usually email) for receiving online payments."),
'overdue_msg': fields.text('Overdue Payments Message', translate=True),
'property_reserve_and_surplus_account': fields.property(
'account.account',
type='many2one',
relation='account.account',
string="Reserve and Profit/Loss Account",
view_load=True,
domain="[('type', '=', 'other')]",
help="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"),
}
_defaults = {
addons/account/company_view.xml
-13
View File
@@ -15,18 +15,5 @@
</field>
</record>
<record model="ir.ui.view" id="view_company_inherit_1_form">
<field name="name">res.company.form.inherit</field>
<field name="inherit_id" ref="base.view_company_form"/>
<field name="model">res.company</field>
<field name="arch" type="xml">
<xpath expr="//group[@name='account_grp']" position="inside">
<field name="property_reserve_and_surplus_account"/>
<field name="tax_calculation_rounding_method"/>
<field name="paypal_account" placeholder="e.g. sales@openerp.com"/>
</xpath>
</field>
</record>
</data>
</openerp>
addons/account/data/account_data.xml
+5
View File
@@ -127,6 +127,7 @@
<field name="view_id" ref="account_journal_bank_view"/>
<field name="name">Status</field>
<field name="field">state</field>
<field eval="True" name="invisible"/>
<field eval="19" name="sequence"/>
</record>
<record id="bank_col20" model="account.journal.column">
@@ -214,6 +215,7 @@
<field name="view_id" ref="account_journal_bank_view_multi"/>
<field name="name">Status</field>
<field name="field">state</field>
<field eval="True" name="invisible"/>
<field eval="19" name="sequence"/>
</record>
<record id="bank_col20_multi" model="account.journal.column">
@@ -289,6 +291,7 @@
<field name="view_id" ref="account_journal_view"/>
<field name="name">Status</field>
<field name="field">state</field>
<field eval="True" name="invisible"/>
<field eval="19" name="sequence"/>
</record>
@@ -370,6 +373,7 @@
<field name="view_id" ref="account_sp_journal_view"/>
<field name="name">Status</field>
<field name="field">state</field>
<field eval="True" name="invisible"/>
<field eval="19" name="sequence"/>
</record>
<record id="sp_journal_col20" model="account.journal.column">
@@ -456,6 +460,7 @@
<field name="view_id" ref="account_sp_refund_journal_view"/>
<field name="name">Status</field>
<field name="field">state</field>
<field eval="True" name="invisible"/>
<field eval="19" name="sequence"/>
</record>
<record id="sp_refund_journal_col20" model="account.journal.column">
addons/account/data/configurable_account_chart.xml
-1
View File
@@ -381,7 +381,6 @@
<field name="property_account_income_categ" ref="conf_a_sale"/>
<field name="property_account_income_opening" ref="conf_o_income"/>
<field name="property_account_expense_opening" ref="conf_o_expense"/>
<field name="property_reserve_and_surplus_account" ref="conf_a_reserve_and_surplus"/>
<field name="complete_tax_set" eval="False"/>
</record>
addons/account/demo/account_minimal.xml
-8
View File
@@ -304,14 +304,6 @@
<field name="company_id" ref="base.main_company"/>
</record>
<record forcecreate="True" id="property_reserve_and_surplus_account" model="ir.property">
<field name="name">property_account_receivable</field>
<field name="fields_id" search="[('model','=','res.company'),('name','=','property_reserve_and_surplus_account')]"/>
<field eval="'account.account,'+str(rsa)" name="value"/>
<field name="company_id" ref="base.main_company"/>
</record>
<!--
Account Journal
-->
addons/account/i18n/es_EC.po
+264 -191
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/es_MX.po
+3490 -4809
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/gu.po
+261 -188
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/pt_BR.po
+634 -559
View File
File diff suppressed because it is too large Load Diff
addons/account/report/account_invoice_report.py
+30 -1
View File
@@ -20,6 +20,7 @@
##############################################################################
import tools
import decimal_precision as dp
from osv import fields,osv
class account_invoice_report(osv.osv):
@@ -27,6 +28,31 @@ class account_invoice_report(osv.osv):
_description = "Invoices Statistics"
_auto = False
_rec_name = 'date'
def _compute_amounts_in_user_currency(self, cr, uid, ids, field_names, args, context=None):
"""Compute the amounts in the currency of the user
"""
if context is None:
context={}
currency_obj = self.pool.get('res.currency')
currency_rate_obj = self.pool.get('res.currency.rate')
user_currency_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.currency_id.id
currency_rate_id = currency_rate_obj.search(cr, uid, [('rate', '=', 1)], limit=1, context=context)[0]
base_currency_id = currency_rate_obj.browse(cr, uid, currency_rate_id, context=context).currency_id.id
res = {}
ctx = context.copy()
for item in self.browse(cr, uid, ids, context=context):
ctx['date'] = item.date
price_total = currency_obj.compute(cr, uid, base_currency_id, user_currency_id, item.price_total, context=ctx)
price_average = currency_obj.compute(cr, uid, base_currency_id, user_currency_id, item.price_average, context=ctx)
residual = currency_obj.compute(cr, uid, base_currency_id, user_currency_id, item.residual, context=ctx)
res[item.id] = {
'user_currency_price_total': price_total,
'user_currency_price_average': price_average,
'user_currency_residual': residual,
}
return res
_columns = {
'date': fields.date('Date', readonly=True),
'year': fields.char('Year', size=4, readonly=True),
@@ -47,7 +73,9 @@ class account_invoice_report(osv.osv):
'company_id': fields.many2one('res.company', 'Company', readonly=True),
'user_id': fields.many2one('res.users', 'Salesperson', readonly=True),
'price_total': fields.float('Total Without Tax', readonly=True),
'user_currency_price_total': fields.function(_compute_amounts_in_user_currency, string="Total Without Tax", type='float', digits_compute=dp.get_precision('Account'), multi="_compute_amounts"),
'price_average': fields.float('Average Price', readonly=True, group_operator="avg"),
'user_currency_price_average': fields.function(_compute_amounts_in_user_currency, string="Average Price", type='float', digits_compute=dp.get_precision('Account'), multi="_compute_amounts"),
'currency_rate': fields.float('Currency Rate', readonly=True),
'nbr':fields.integer('# of Lines', readonly=True),
'type': fields.selection([
@@ -69,6 +97,7 @@ class account_invoice_report(osv.osv):
'account_line_id': fields.many2one('account.account', 'Account Line',readonly=True),
'partner_bank_id': fields.many2one('res.partner.bank', 'Bank Account',readonly=True),
'residual': fields.float('Total Residual', readonly=True),
'user_currency_residual': fields.function(_compute_amounts_in_user_currency, string="Total Residual", type='float', digits_compute=dp.get_precision('Account'), multi="_compute_amounts"),
'delay_to_pay': fields.float('Avg. Delay To Pay', readonly=True, group_operator="avg"),
'due_delay': fields.float('Avg. Due Delay', readonly=True, group_operator="avg"),
}
@@ -161,7 +190,7 @@ class account_invoice_report(osv.osv):
left join product_uom u on (u.id=ail.uos_id),
res_currency_rate cr
where cr.id in (select id from res_currency_rate cr2 where (cr2.currency_id = ai.currency_id)
and ((ai.date_invoice is not null and cr.name <= ai.date_invoice) or (ai.date_invoice is null and cr.name <= NOW())) limit 1)
and ((ai.date_invoice is not null and cr.name <= ai.date_invoice) or (ai.date_invoice is null and cr.name <= NOW())) order by name desc limit 1)
group by ail.product_id,
ai.date_invoice,
ai.id,
addons/account/report/account_invoice_report_view.xml
+3 -3
View File
@@ -28,8 +28,8 @@
<field name="nbr" sum="# of Lines"/>
<field name="product_qty" sum="Qty"/>
<!-- <field name="reconciled" sum="# Reconciled"/> -->
<field name="price_total" sum="Total Without Tax"/>
<field name="residual" sum="Total Residual" invisible="context.get('residual_invisible',False)"/>
<field name="user_currency_price_total" sum="Total Without Tax"/>
<field name="user_currency_residual" sum="Total Residual" invisible="context.get('residual_invisible',False)"/>
<field name="due_delay" sum="Avg. Due Delay" invisible="context.get('residual_invisible',False)"/>
<field name="delay_to_pay" sum="Avg. Delay To Pay" invisible="context.get('residual_invisible',False)"/>
</tree>
@@ -42,7 +42,7 @@
<field name="arch" type="xml">
<graph string="Invoices Analysis" type="bar">
<field name="product_id"/>
<field name="price_total"/>
<field name="user_currency_price_total"/>
</graph>
</field>
</record>
addons/account/report/account_print_overdue.rml
+1 -1
View File
@@ -129,7 +129,7 @@
</td>
<td>
<para style="terp_default_9">[[ o.title.name or '' ]] [[ o.name ]]</para>
<para style="terp_default_9">[[ display_address(o.partner_id)] ]]</para>
<para style="terp_default_9">[[ display_address(o.partner_id) ]]</para>
<para style="terp_default_9">
<font color="white"> </font>
</para>
addons/account/res_config_view.xml
+1 -1
View File
@@ -121,7 +121,7 @@
</div>
<label for="id" string="Features"/>
<div>
<div>
<div name="group_multi_currency">
<field name="group_multi_currency" class="oe_inline"/>
<label for="group_multi_currency"/>
</div>
addons/account/static/src/js/account_move_reconciliation.js
+2 -2
View File
@@ -5,7 +5,7 @@ openerp.account = function (instance) {
instance.web.account = {};
instance.web.views.add('account_reconciliation_list', 'instance.web.account.ReconciliationListView');
instance.web.views.add('tree_account_reconciliation', 'instance.web.account.ReconciliationListView');
instance.web.account.ReconciliationListView = instance.web.ListView.extend({
init: function() {
this._super.apply(this, arguments);
@@ -101,7 +101,7 @@ openerp.account = function (instance) {
return self.rpc("/web/action/load", {
action_id: result[1],
context: additional_context
}, function (result) {
}).then(function (result) {
result = result.result;
result.context = _.extend(result.context || {}, additional_context);
result.flags = result.flags || {};
addons/account_bank_statement_extensions/account_bank_statement_view.xml
+1 -1
View File
@@ -154,7 +154,7 @@
<field name="view_id" ref="view_bank_statement_line_list"/>
</record>
<menuitem action="action_bank_statement_line" id="bank_statement_line" parent="account.menu_finance_bank_and_cash" sequence="20"/>
<menuitem action="action_bank_statement_line" id="bank_statement_line" parent="account.menu_finance_bank_and_cash" sequence="20" groups="base.group_no_one"/>
</data>
</openerp>
addons/account_voucher/account_voucher.py
+15
View File
@@ -42,6 +42,21 @@ class res_company(osv.osv):
res_company()
class account_config_settings(osv.osv_memory):
_inherit = 'account.config.settings'
_columns = {
'income_currency_exchange_account_id': fields.related(
'company_id', 'income_currency_exchange_account_id',
type='many2one',
relation='account.account',
string="Gain Exchange Rate Account"),
'expense_currency_exchange_account_id': fields.related(
'company_id', 'expense_currency_exchange_account_id',
type="many2one",
relation='account.account',
string="Loss Exchange Rate Account"),
}
class account_voucher(osv.osv):
def _check_paid(self, cr, uid, ids, name, args, context=None):
res = {}
addons/account_voucher/account_voucher_view.xml
+16 -9
View File
@@ -249,16 +249,23 @@
</field>
</record>
<!-- res.company form view -->
<record model="ir.ui.view" id="view_company_inherit_currency_xchange_form">
<field name="name">res.company.form.inherit</field>
<field name="inherit_id" ref="base.view_company_form"/>
<field name="model">res.company</field>
<!-- res.config form view -->
<record model="ir.ui.view" id="view_account_settings_currency_xchange_form">
<field name="name">account.config.settings.inherit</field>
<field name="inherit_id" ref="account.view_account_config_settings"/>
<field name="model">account.config.settings</field>
<field name="priority">20</field>
<field name="arch" type="xml">
<field name="currency_id" position="after">
<field name="income_currency_exchange_account_id"/>
<field name="expense_currency_exchange_account_id"/>
</field>
<xpath expr="//div[@name='group_multi_currency']" position="after">
<group attrs="{'invisible': [('group_multi_currency', '&lt;&gt;', True)]}" col="2">
<group>
<field name="income_currency_exchange_account_id"/>
<field name="expense_currency_exchange_account_id"/>
</group>
<group>
</group>
</group>
</xpath>
</field>
</record>
addons/anonymization/i18n/lv.po
+213
View File
@@ -0,0 +1,213 @@
# Latvian translation for openobject-addons
# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
# This file is distributed under the same license as the openobject-addons package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-02-08 00:35+0000\n"
"PO-Revision-Date: 2012-10-16 20:21+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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: 2012-10-17 04:36+0000\n"
"X-Generator: Launchpad (build 16152)\n"
#. module: anonymization
#: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
msgid "ir.model.fields.anonymize.wizard"
msgstr "ir.model.fields.anonymize.wizard"
#. module: anonymization
#: field:ir.model.fields.anonymization,field_name:0
msgid "Field Name"
msgstr "Lauka Nosaukums"
#. module: anonymization
#: field:ir.model.fields.anonymization,field_id:0
msgid "Field"
msgstr "Lauks"
#. module: anonymization
#: field:ir.model.fields.anonymization.history,state:0
#: field:ir.model.fields.anonymize.wizard,state:0
msgid "State"
msgstr "Stāvoklis"
#. module: anonymization
#: field:ir.model.fields.anonymize.wizard,file_import:0
msgid "Import"
msgstr "Importēt"
#. module: anonymization
#: model:ir.model,name:anonymization.model_ir_model_fields_anonymization
msgid "ir.model.fields.anonymization"
msgstr "ir.model.fields.anonymization"
#. module: anonymization
#: field:ir.model.fields.anonymization.history,direction:0
msgid "Direction"
msgstr "Virziens"
#. module: anonymization
#: model:ir.actions.act_window,name:anonymization.action_ir_model_fields_anonymization_tree
#: view:ir.model.fields.anonymization:0
#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization_fields
msgid "Anonymized Fields"
msgstr "Anonimizēti Lauki"
#. module: anonymization
#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization
msgid "Database anonymization"
msgstr "Datubāzes anonimizācija"
#. module: anonymization
#: selection:ir.model.fields.anonymization.history,direction:0
msgid "clear -> anonymized"
msgstr "tīrs -> anonimizēts"
#. module: anonymization
#: selection:ir.model.fields.anonymization,state:0
#: selection:ir.model.fields.anonymize.wizard,state:0
msgid "Anonymized"
msgstr "Anonimizēta"
#. module: anonymization
#: field:ir.model.fields.anonymization,state:0
msgid "unknown"
msgstr "nezināms"
#. module: anonymization
#: field:ir.model.fields.anonymization,model_id:0
msgid "Object"
msgstr "Objekts"
#. module: anonymization
#: field:ir.model.fields.anonymization.history,filepath:0
msgid "File path"
msgstr "Ceļš uz failu"
#. module: anonymization
#: field:ir.model.fields.anonymization.history,date:0
msgid "Date"
msgstr "Datums"
#. module: anonymization
#: field:ir.model.fields.anonymize.wizard,file_export:0
msgid "Export"
msgstr "Eksportēt"
#. module: anonymization
#: view:ir.model.fields.anonymize.wizard:0
msgid "Reverse the Database Anonymization"
msgstr "Atgriezt Datubāzes Anonimizāciju"
#. module: anonymization
#: view:ir.model.fields.anonymize.wizard:0
msgid "Database Anonymization"
msgstr "Datubāzes Anonimizācija"
#. module: anonymization
#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization_wizard
msgid "Anonymize database"
msgstr "Anonimizēt datubāzi"
#. module: anonymization
#: view:ir.model.fields.anonymization.history:0
#: field:ir.model.fields.anonymization.history,field_ids:0
msgid "Fields"
msgstr "Lauki"
#. module: anonymization
#: selection:ir.model.fields.anonymization,state:0
#: selection:ir.model.fields.anonymize.wizard,state:0
msgid "Clear"
msgstr "Notīrīt"
#. module: anonymization
#: view:ir.model.fields.anonymize.wizard:0
#: field:ir.model.fields.anonymize.wizard,summary:0
msgid "Summary"
msgstr "Kopsavilkums"
#. module: anonymization
#: view:ir.model.fields.anonymization:0
msgid "Anonymized Field"
msgstr "Anonimizēts lauks"
#. module: anonymization
#: selection:ir.model.fields.anonymize.wizard,state:0
msgid "Unstable"
msgstr "Nestabīls"
#. module: anonymization
#: selection:ir.model.fields.anonymization.history,state:0
msgid "Exception occured"
msgstr "Notikusī kļūda"
#. module: anonymization
#: selection:ir.model.fields.anonymization,state:0
#: selection:ir.model.fields.anonymize.wizard,state:0
msgid "Not Existing"
msgstr "Neeksistē"
#. module: anonymization
#: field:ir.model.fields.anonymization,model_name:0
msgid "Object Name"
msgstr "Objekta nosaukums"
#. module: anonymization
#: model:ir.actions.act_window,name:anonymization.action_ir_model_fields_anonymization_history_tree
#: view:ir.model.fields.anonymization.history:0
#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization_history
msgid "Anonymization History"
msgstr "Anonimizācijas Vēsture"
#. module: anonymization
#: model:ir.model,name:anonymization.model_ir_model_fields_anonymization_history
msgid "ir.model.fields.anonymization.history"
msgstr "ir.model.fields.anonymization.history"
#. module: anonymization
#: model:ir.actions.act_window,name:anonymization.action_ir_model_fields_anonymize_wizard
#: view:ir.model.fields.anonymize.wizard:0
msgid "Anonymize Database"
msgstr "Anonimizēt Datubāzi"
#. module: anonymization
#: field:ir.model.fields.anonymize.wizard,name:0
msgid "File Name"
msgstr "Faila nosaukums"
#. module: anonymization
#: selection:ir.model.fields.anonymization.history,direction:0
msgid "anonymized -> clear"
msgstr "anonimizēts -> tīrs"
#. module: anonymization
#: selection:ir.model.fields.anonymization.history,state:0
msgid "Started"
msgstr "Iesākta"
#. module: anonymization
#: selection:ir.model.fields.anonymization.history,state:0
msgid "Done"
msgstr "Izdarīts"
#. module: anonymization
#: view:ir.model.fields.anonymization.history:0
#: field:ir.model.fields.anonymization.history,msg:0
#: field:ir.model.fields.anonymize.wizard,msg:0
msgid "Message"
msgstr "Ziņojums"
#. module: anonymization
#: code:addons/anonymization/anonymization.py:55
#: sql_constraint:ir.model.fields.anonymization:0
#, python-format
msgid "You cannot have two fields with the same name on the same object!"
msgstr "Nevar būt divi lauki ar vienādiem nosaukumiem vienam objektam!"
addons/auth_openid/static/src/js/auth_openid.js
+2 -2
View File
@@ -69,7 +69,7 @@ instance.web.Login = instance.web.Login.extend({
_check_error: function() {
var self = this;
if (this.params.loginerror !== undefined) {
this.rpc('/auth_openid/login/status', {}, function(result) {
this.rpc('/auth_openid/login/status', {}).then(function(result) {
if (_.contains(['success', 'failure'], result.status) && result.message) {
self.do_warn('Invalid OpenID Login', result.message);
}
@@ -106,7 +106,7 @@ instance.web.Login = instance.web.Login.extend({
do_openid_login: function(db, openid_url) {
var self = this;
this.rpc('/auth_openid/login/verify', {'db': db, 'url': openid_url}, function(result) {
this.rpc('/auth_openid/login/verify', {'db': db, 'url': openid_url}).then(function(result) {
if (result.error) {
self.do_warn(result.title, result.error);
return;
addons/base_crypt/i18n/lv.po
+45
View File
@@ -0,0 +1,45 @@
# Latvian translation for openobject-addons
# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
# This file is distributed under the same license as the openobject-addons package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-02-08 00:36+0000\n"
"PO-Revision-Date: 2012-10-16 16:11+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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: 2012-10-17 04:36+0000\n"
"X-Generator: Launchpad (build 16152)\n"
#. module: base_crypt
#: model:ir.model,name:base_crypt.model_res_users
msgid "res.users"
msgstr "res.users"
#. module: base_crypt
#: sql_constraint:res.users:0
msgid "You can not have two users with the same login !"
msgstr "Nevar būt divi lietotāji ar vienādu pieteikuma vārdu!"
#. module: base_crypt
#: constraint:res.users:0
msgid "The chosen company is not in the allowed companies for this user"
msgstr "Izvēlētais uzņēmums nav šim lietotājam atļauto uzņēmumu sarakstā"
#. module: base_crypt
#: code:addons/base_crypt/crypt.py:140
#, python-format
msgid "Please specify the password !"
msgstr "Lūdzu norādiet paroli!"
#. module: base_crypt
#: code:addons/base_crypt/crypt.py:140
#, python-format
msgid "Error"
msgstr "Kļūda"
addons/board/static/src/js/dashboard.js
+3 -3
View File
@@ -46,7 +46,7 @@ instance.web.form.DashBoard = instance.web.form.FormWidget.extend({
delete(action.attrs.colspan);
var action_id = _.str.toNumber(action.attrs.name);
if (!_.isNaN(action_id)) {
self.rpc('/web/action/load', {action_id: action_id}, function(result) {
self.rpc('/web/action/load', {action_id: action_id}).then(function(result) {
self.on_load_action(result, column_index + '_' + action_index, action.attrs);
});
}
@@ -81,7 +81,7 @@ instance.web.form.DashBoard = instance.web.form.FormWidget.extend({
this.rpc('/web/view/undo_custom', {
view_id: this.view.fields_view.view_id,
reset: true
}, this.do_reload);
}).then(this.do_reload);
},
on_change_layout: function() {
var self = this;
@@ -382,7 +382,7 @@ instance.board.AddToDashboard = instance.web.search.Input.extend({
domain: domain,
view_mode: view_parent.active_view,
name: this.$el.find("input").val()
}, function(r) {
}).then(function(r) {
if (r === false) {
self.do_warn("Could not add filter to dashboard");
} else {
addons/crm_partner_assign/res_partner_view.xml
+1 -1
View File
@@ -170,7 +170,7 @@
<field name="model">res.partner</field>
<field name="inherit_id" ref="base.view_res_partner_filter"/>
<field name="arch" type="xml">
<filter string="Salesman" position="after">
<filter string="Salesperson" position="after">
<filter string="Activation" context="{'group_by' : 'activation'}" domain="[]" icon="terp-personal" />
</filter>
</field>
addons/document_page/i18n/pt_BR.po
+12 -12
View File
@@ -7,25 +7,25 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-02-08 01:37+0100\n"
"PO-Revision-Date: 2012-08-13 12:14+0000\n"
"Last-Translator: Antony Lesuisse (OpenERP) <al@openerp.com>\n"
"PO-Revision-Date: 2012-10-17 00:06+0000\n"
"Last-Translator: Syllas F. de O. Neto <syllasneto@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-08-28 06:43+0000\n"
"X-Generator: Launchpad (build 15864)\n"
"X-Launchpad-Export-Date: 2012-10-17 04:36+0000\n"
"X-Generator: Launchpad (build 16152)\n"
#. module: document_page
#: field:document.page.type,template:0
msgid "Document page Template"
msgstr ""
msgstr "Modelo de página de Documento"
#. module: document_page
#: model:ir.actions.act_window,name:document_page.action_wiki
#: model:ir.ui.menu,name:document_page.menu_action_wiki_wiki
msgid "Document Pages"
msgstr ""
msgstr "Páginas do Documento"
#. module: document_page
#: field:document.page.type,method:0
@@ -56,7 +56,7 @@ msgstr "Indica se estas páginas têm uma tabela de conteúdo ou não"
#. module: document_page
#: model:ir.model,name:document_page.model_wiki_wiki_history view:document.page.history:0
msgid "Document page History"
msgstr ""
msgstr "Histórico de páginas do Documento"
#. module: document_page
#: field:document.page,minor_edit:0
@@ -269,7 +269,7 @@ msgstr "Todas as Páginas de Históricos"
#. module: document_page
#: model:ir.model,name:document_page.model_wiki_wiki
msgid "document.page"
msgstr ""
msgstr "document.page"
#. module: document_page
#: help:document.page.type,method:0
@@ -284,7 +284,7 @@ msgstr "Fechar"
#. module: document_page
#: model:ir.model,name:document_page.model_wizard_wiki_history_show_diff
msgid "wizard.document.page.history.show_diff"
msgstr ""
msgstr "wizard.document.page.history.show_diff"
#. module: document_page
#: field:document.page.history,wiki_id:0
@@ -357,7 +357,7 @@ msgstr "Esta é uma edição Avançada ?"
#: model:ir.model,name:document_page.model_wiki_groups
#: model:ir.ui.menu,name:document_page.menu_action_wiki_groups view:document.page.type:0
msgid "Document Types"
msgstr ""
msgstr "Tipos de Documento"
#. module: document_page
#: view:document.page:0
@@ -374,12 +374,12 @@ msgstr "Modificado por"
#: field:document.page,type:0
#, python-format
msgid "Type"
msgstr ""
msgstr "Tipo"
#. module: document_page
#: view:document.page.type:0 view:document.page.page.open:0
msgid "Open Document Page"
msgstr ""
msgstr "Página do documento aberto"
#. module: document_page
#: model:ir.model,name:document_page.model_wiki_wiki_page_open
addons/edi/static/src/js/edi.js
+3 -2
View File
@@ -3,6 +3,7 @@ var _t = instance.web._t;
instance.edi = {}
instance.edi.EdiImport = instance.web.Widget.extend({
init: function(parent,url) {
this._super();
this.url = url;
@@ -38,11 +39,11 @@ instance.edi.EdiImport = instance.web.Widget.extend({
},
do_import: function() {
this.rpc('/edi/import_edi_url', {url: this.url}, this.on_imported, this.on_imported_error);
this.rpc('/edi/import_edi_url', {url: this.url}).then(this.on_imported, this.on_imported_error);
},
on_imported: function(response) {
if ('action' in response) {
this.rpc("/web/session/save_session_action", {the_action: response.action}, function(key) {
this.rpc("/web/session/save_session_action", {the_action: response.action}).then(function(key) {
window.location = "/#sa="+encodeURIComponent(key);
});
}
addons/event/event.py
+10
View File
@@ -19,6 +19,7 @@
#
##############################################################################
from datetime import datetime, timedelta
from osv import fields, osv
from tools.translate import _
from openerp import SUPERUSER_ID
@@ -281,6 +282,15 @@ class event_event(osv.osv):
})
return {'value' : values}
def onchange_start_date(self, cr, uid, ids, date_begin=False, date_end=False, context=None):
res = {'value':{}}
if date_end:
return res
if date_begin and isinstance(date_begin, str):
date_begin = datetime.strptime(date_begin, "%Y-%m-%d %H:%M:%S")
date_end = date_begin + timedelta(hours=1)
res['value'] = {'date_end': date_end.strftime("%Y-%m-%d %H:%M:%S")}
return res
# ----------------------------------------
# OpenChatter methods and notifications
addons/event/event_view.xml
+1 -1
View File
@@ -133,7 +133,7 @@
</group>
<group>
<field name="type" on_change="onchange_event_type(type,context)" />
<field name="date_begin"/>
<field name="date_begin" on_change="onchange_start_date(date_begin,date_end)"/>
<field name="date_end"/>
<field name="company_id" groups="base.group_multi_company"/>
</group>
addons/google_docs/static/src/js/gdocs.js
+4 -4
View File
@@ -22,7 +22,7 @@ var _t = instance.web._t;
var form = self.getParent();
form.sidebar_context().then(function (context) {
var ds = new instance.web.DataSet(this, 'ir.attachment', context);
ds.call('google_doc_get', [form.dataset.model, [form.datarecord.id], context], function(r) {
ds.call('google_doc_get', [form.dataset.model, [form.datarecord.id], context]).then(function(r) {
if (r == 'False') {
var params = {
error: response,
@@ -35,7 +35,7 @@ var _t = instance.web._t;
}
form.reload();
});
})
});
}
})
}
});
};
addons/hr/hr_view.xml
+2 -1
View File
@@ -36,9 +36,11 @@
<page string="Public Information">
<group>
<group string="Contact Information">
<field name="address_id" on_change="onchange_address_id(address_id)" context="{'show_address': 1}" options='{"always_reload": True, "highlight_first_line": True}'/>
<field name="work_email" widget="email"/>
<field name="work_phone"/>
<field name="mobile_phone"/>
<field name="work_location"/>
</group>
<group string="Position">
<field name="department_id" on_change="onchange_department_id(department_id)"/>
@@ -49,7 +51,6 @@
<group>
<field name="company_id" groups="base.group_multi_company" on_change="onchange_company(company_id)"/>
<field name="user_id" on_change="onchange_user(user_id)" string="Related User"/>
<field name="address_id" on_change="onchange_address_id(address_id)" context="{'show_address': 1}" options='{"always_reload": True, "highlight_first_line": True}'/>
</group>
</group>
<field name="notes" placeholder="Other Information ..." colspan="4"/>
addons/hr/i18n/pt_BR.po
+10 -9
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: 2012-02-08 01:37+0100\n"
"PO-Revision-Date: 2012-05-10 17:47+0000\n"
"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
"PO-Revision-Date: 2012-10-16 23:42+0000\n"
"Last-Translator: Syllas F. de O. Neto <syllasneto@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-08-28 06:24+0000\n"
"X-Generator: Launchpad (build 15864)\n"
"X-Launchpad-Export-Date: 2012-10-17 04:35+0000\n"
"X-Generator: Launchpad (build 16152)\n"
#. module: hr
#: model:process.node,name:hr.process_node_openerpuser0
@@ -24,7 +24,7 @@ msgstr "Usuário Openerp"
#. module: hr
#: view:hr.job:0 field:hr.job,requirements:0
msgid "Requirements"
msgstr "Requisitos"
msgstr "Pré-requisitos"
#. module: hr
#: constraint:hr.department:0
@@ -197,6 +197,7 @@ msgstr "Feminino"
msgid ""
"Expected number of employees for this job position after new recruitment."
msgstr ""
"Número de empregados para esta posição após o novo processo de contratação."
#. module: hr
#: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_new_config
@@ -289,7 +290,7 @@ msgstr "Categorias"
#. module: hr
#: field:hr.job,expected_employees:0
msgid "Total Employees"
msgstr ""
msgstr "Total de Empregados"
#. module: hr
#: selection:hr.employee,marital:0
@@ -462,7 +463,7 @@ msgstr "Erro! Você não pode criar hierarquia recursiva de funcionários."
#. module: hr
#: model:ir.actions.act_window,name:hr.action2
msgid "Subordinate Hierarchy"
msgstr ""
msgstr "Subordinação hierárquica"
#. module: hr
#: model:ir.actions.act_window,help:hr.view_department_form_installer
@@ -712,12 +713,12 @@ msgstr "Subordinados"
#. module: hr
#: field:hr.job,no_of_employee:0
msgid "Number of employees currently occupying this job position."
msgstr ""
msgstr "Número de empregados atualmente ocupando esta posição"
#. module: hr
#: field:hr.job,no_of_recruitment:0
msgid "Number of new employees you expect to recruit."
msgstr ""
msgstr "Número de novos empregados a serem contratados."
#~ msgid "Sunday"
#~ msgstr "Domingo"
addons/hr_evaluation/i18n/pt_BR.po
+5 -5
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: 2012-02-08 01:37+0100\n"
"PO-Revision-Date: 2012-02-13 11:31+0000\n"
"Last-Translator: Mauricio Pacheco de Andrade <Unknown>\n"
"PO-Revision-Date: 2012-10-17 00:10+0000\n"
"Last-Translator: Syllas F. de O. Neto <syllasneto@gmail.com>\n"
"Language-Team: Brazilian Portuguese <pt_BR@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: 2012-08-28 06:30+0000\n"
"X-Generator: Launchpad (build 15864)\n"
"X-Launchpad-Export-Date: 2012-10-17 04:36+0000\n"
"X-Generator: Launchpad (build 16152)\n"
#. module: hr_evaluation
#: help:hr_evaluation.plan.phase,send_anonymous_manager:0
@@ -317,7 +317,7 @@ msgstr "Avaliações feitas no mês passado"
#. module: hr_evaluation
#: model:ir.model,name:hr_evaluation.model_mail_compose_message
msgid "Email composition wizard"
msgstr ""
msgstr "Assistente para compor Email"
#. module: hr_evaluation
#: view:hr.evaluation.report:0
addons/hr_holidays/i18n/pt_BR.po
+52 -25
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: 2012-02-08 01:37+0100\n"
"PO-Revision-Date: 2012-02-19 15:06+0000\n"
"Last-Translator: Gustavo T <Unknown>\n"
"PO-Revision-Date: 2012-10-17 00:16+0000\n"
"Last-Translator: Syllas F. de O. Neto <syllasneto@gmail.com>\n"
"Language-Team: Brazilian Portuguese <pt_BR@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: 2012-08-28 06:23+0000\n"
"X-Generator: Launchpad (build 15864)\n"
"X-Launchpad-Export-Date: 2012-10-17 04:35+0000\n"
"X-Generator: Launchpad (build 16152)\n"
#. module: hr_holidays
#: selection:hr.holidays.status,color_name:0
@@ -28,7 +28,8 @@ msgid "Allocation Type"
msgstr "Tipo de Alocação"
#. 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 "Aguardando Segunda Aprovação"
@@ -53,7 +54,8 @@ msgid "Allocation Mode"
msgstr "Modo de Alocação"
#. 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 "Departamento"
@@ -63,7 +65,8 @@ msgid "Requests Approve"
msgstr "Aprovar Solicitações"
#. 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 "Recusado"
@@ -140,7 +143,8 @@ msgid "Summary Of Leaves"
msgstr "Resumo das Folgas"
#. 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 "Aprovado"
@@ -204,7 +208,8 @@ msgid "Leaves by Department"
msgstr "Folgas por Departamento"
#. 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 "Cancelado"
@@ -258,7 +263,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
@@ -313,7 +319,8 @@ msgid "Remaining Leaves"
msgstr "Folhas Restantes"
#. module: hr_holidays
#: view:hr.holidays:0 field:hr.holidays,state:0
#: view:hr.holidays:0
#: field:hr.holidays,state:0
msgid "State"
msgstr "Status"
@@ -323,14 +330,17 @@ msgid "Total holidays by type"
msgstr "Total de Folgas por tipo"
#. 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 "Funcionário"
#. 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 "Novo"
@@ -371,7 +381,8 @@ msgid "Allocation for %s"
msgstr "Alocação para %s"
#. 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 "Número de Dias"
@@ -413,9 +424,12 @@ msgid ""
"When selected, the Allocation/Leave Requests for this type require a second "
"validation to be approved."
msgstr ""
"Quando selecionado, a Locação/Requerimento de Saída deste tipo necessita de "
"uma segunda aprovação."
#. 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 "Aguardando Aprovação"
@@ -449,6 +463,7 @@ msgid "Lavender"
msgstr "Lavanda"
#. module: hr_holidays
#: xsl:holidays.summary:0
#: view:hr.holidays:0
msgid "Month"
msgstr "Mês"
@@ -472,7 +487,8 @@ msgid "Employee's Holidays"
msgstr "Férias de Funcionários"
#. 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 "Categoria"
@@ -517,7 +533,8 @@ msgid "Holiday"
msgstr "Feriado"
#. 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 "Reunião"
@@ -559,7 +576,8 @@ msgid "Error ! You cannot create recursive Hierarchy of Employees."
msgstr "Erro! Você não pode criar uma Hierarquia de Funcionários recursiva."
#. 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 "Folgas Restantes"
@@ -641,7 +659,8 @@ msgid "Compensatory Days"
msgstr "Dias Compensatórios"
#. module: hr_holidays
#: view:hr.holidays:0 field:hr.holidays,notes:0
#: view:hr.holidays:0
#: field:hr.holidays,notes:0
msgid "Reasons"
msgstr "Motivos"
@@ -652,7 +671,8 @@ msgid "Leaves Analysis"
msgstr "Análise de Folgas"
#. 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 "Cancelar"
@@ -666,13 +686,15 @@ msgstr ""
"departamento"
#. 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 "Validado"
#. 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 "Solicitação de Alocação"
@@ -688,7 +710,8 @@ msgid "Apply Double Validation"
msgstr "Aplicar Validação Dupla"
#. 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 "Print"
msgstr "Imprimir"
@@ -709,7 +732,8 @@ msgid "By Employee Category"
msgstr "Por Categoria de Funcionário"
#. 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 "Pedido de Folga"
@@ -785,6 +809,8 @@ msgid ""
"If you select this checkbox, the system allows the employees to take more "
"leaves than the available ones for this type."
msgstr ""
"Caso esta caixa seja selecionada, o sistema autoriza os empregados deste "
"tipo a tirarem mais licenças do que as disponíveis para este tipo."
#. module: hr_holidays
#: help:hr.holidays.status,leaves_taken:0
@@ -839,7 +865,8 @@ msgid "Approve"
msgstr "Aprovar"
#. 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 "Data Inicial"
addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+3 -3
View File
@@ -55,11 +55,11 @@
<sheet>
<label for="employee_id" class="oe_edit_only"/>
<h1><field name="employee_id" on_change="onchange_employee_id(employee_id)"/></h1>
<label for="date_from" class="oe_edit_only" string="Timesheet Period"/>
<h2>From <field name="date_from"/> to <field name="date_to"/></h2>
<group>
<group>
<field name="name"/>
<label for="date_from" string="Timesheet Period"/>
<div><field name="date_from"/> to <field name="date_to"/></div>
<field name="name" invisible="1"/>
<field name="department_id"/>
<field name="company_id" groups="base.group_multi_company"/>
</group>
addons/l10n_be/i18n/pt_BR.po
+15 -12
View File
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2011-12-23 09:56+0000\n"
"PO-Revision-Date: 2011-03-10 23:28+0000\n"
"Last-Translator: Emerson <Unknown>\n"
"PO-Revision-Date: 2012-10-17 00:22+0000\n"
"Last-Translator: Syllas F. de O. Neto <syllasneto@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-08-28 06:22+0000\n"
"X-Generator: Launchpad (build 15864)\n"
"X-Launchpad-Export-Date: 2012-10-17 04:35+0000\n"
"X-Generator: Launchpad (build 16152)\n"
#. module: l10n_be
#: field:partner.vat.intra,test_xml:0
@@ -25,6 +25,7 @@ msgstr "Test XML file"
#: view:partner.vat.list_13:0
msgid "You can remove customers which you do not want in exported xml file"
msgstr ""
"Você pode remover os clientes não quer incluir no arquivo xml a ser exportado"
#. module: l10n_be
#: view:partner.vat_13:0
@@ -32,11 +33,13 @@ msgid ""
"This wizard will create an XML file for VAT details and total invoiced "
"amounts per partner."
msgstr ""
"Este assistente irá criar um arquivo XML para detalhamento de VAT e "
"quantidades totais faturadas por parceiro."
#. module: l10n_be
#: model:account.account.type,name:l10n_be.user_type_tiers_receiv
msgid "Tiers - Recevable"
msgstr ""
msgstr "Níveis - Contas a Receber"
#. module: l10n_be
#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:102
@@ -59,7 +62,7 @@ msgstr "Error! You can not create recursive companies."
#. module: l10n_be
#: model:account.account.type,name:l10n_be.user_type_tiers
msgid "Tiers"
msgstr ""
msgstr "Níveis"
#. module: l10n_be
#: field:l1on_be.vat.declaration,period_id:0
@@ -80,7 +83,7 @@ msgstr "Save the File with '.xml' extension."
#. module: l10n_be
#: model:account.account.type,name:l10n_be.user_type_charge
msgid "Charge"
msgstr ""
msgstr "Despesa"
#. module: l10n_be
#: code:addons/l10n_be/wizard/l10n_be_partner_vat_listing.py:47
@@ -100,12 +103,12 @@ msgstr "Create XML"
#. module: l10n_be
#: model:account.account.type,name:l10n_be.user_type_capitaux
msgid "Capital"
msgstr ""
msgstr "Capital"
#. module: l10n_be
#: view:partner.vat.list_13:0
msgid "Print"
msgstr ""
msgstr "Impressão"
#. module: l10n_be
#: view:partner.vat.intra:0
@@ -121,7 +124,7 @@ msgstr "Save"
#. module: l10n_be
#: sql_constraint:res.company:0
msgid "The company name must be unique !"
msgstr ""
msgstr "O nome da empresa deve ser único!"
#. module: l10n_be
#: field:l1on_be.vat.declaration,msg:0
@@ -133,7 +136,7 @@ msgstr "File created"
#. module: l10n_be
#: view:partner.vat.intra:0
msgid "_Close"
msgstr ""
msgstr "_Fechar"
#. module: l10n_be
#: code:addons/l10n_be/wizard/l10n_be_account_vat_declaration.py:131
@@ -144,7 +147,7 @@ msgstr "Save XML For Vat declaration"
#. module: l10n_be
#: view:partner.vat.list_13:0
msgid "Customers"
msgstr ""
msgstr "Clientes"
#. module: l10n_be
#: model:account.account.type,name:l10n_be.user_type_tax_in
addons/l10n_be_hr_payroll/i18n/pt_BR.po
+162
View File
@@ -0,0 +1,162 @@
# Brazilian Portuguese translation for openobject-addons
# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
# This file is distributed under the same license as the openobject-addons package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-02-08 00:36+0000\n"
"PO-Revision-Date: 2012-10-16 23:34+0000\n"
"Last-Translator: Syllas F. de O. Neto <syllasneto@gmail.com>\n"
"Language-Team: Brazilian Portuguese <pt_BR@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: 2012-10-17 04:36+0000\n"
"X-Generator: Launchpad (build 16152)\n"
#. module: l10n_be_hr_payroll
#: help:hr.employee,disabled_spouse_bool:0
msgid "if recipient spouse is declared disabled by law"
msgstr "Caso o cônjuge beneficiário seja considerado incapaz perante a lei"
#. module: l10n_be_hr_payroll
#: help:hr.employee,disabled_children_bool:0
msgid "if recipient children is/are declared disabled by law"
msgstr ""
"Caso o(s) filho(s) beneficiário(s) seja(m) considerado(s) incapaz(es) "
"perante a lei"
#. module: l10n_be_hr_payroll
#: field:hr.contract,misc_onss_deduction:0
msgid "Miscellaneous exempt ONSS "
msgstr "Outros isentos de INSS "
#. module: l10n_be_hr_payroll
#: model:ir.model,name:l10n_be_hr_payroll.model_hr_employee
msgid "Employee"
msgstr "Empregado"
#. module: l10n_be_hr_payroll
#: field:hr.employee,disabled_spouse_bool:0
msgid "Disabled Spouse"
msgstr "Cõnjuge incapaz"
#. module: l10n_be_hr_payroll
#: field:hr.contract,retained_net_amount:0
msgid "Net retained "
msgstr "Líquido retido "
#. module: l10n_be_hr_payroll
#: field:hr.employee,resident_bool:0
msgid "Nonresident"
msgstr "Não residente no país local"
#. module: l10n_be_hr_payroll
#: help:hr.employee,resident_bool:0
msgid "if recipient lives in a foreign country"
msgstr "Caso o beneficiário resida em outro país"
#. module: l10n_be_hr_payroll
#: view:hr.employee:0
msgid "if spouse has professionnel income or not"
msgstr "Caso o cônjuge possua renda"
#. module: l10n_be_hr_payroll
#: view:hr.contract:0
msgid "Miscellaneous"
msgstr "Outros"
#. module: l10n_be_hr_payroll
#: field:hr.contract,insurance_employee_deduction:0
msgid "Insurance Group - by worker "
msgstr "Categoria do Seguro - por empregado "
#. module: l10n_be_hr_payroll
#: selection:hr.employee,spouse_fiscal_status:0
msgid "With Income"
msgstr "Com renda"
#. module: l10n_be_hr_payroll
#: selection:hr.employee,spouse_fiscal_status:0
msgid "Without Income"
msgstr "Sem renda"
#. module: l10n_be_hr_payroll
#: field:hr.employee,disabled_children_number:0
msgid "Number of disabled children"
msgstr "Quantidade de filho(s) incapaz(es)"
#. module: l10n_be_hr_payroll
#: field:hr.contract,additional_net_amount:0
msgid "Net supplements"
msgstr "Renda suplementar"
#. module: l10n_be_hr_payroll
#: constraint:hr.employee:0
msgid "Error ! You cannot create recursive Hierarchy of Employees."
msgstr "Erro! Você não pode criar uma Hierarquia de Empregados recursiva."
#. module: l10n_be_hr_payroll
#: field:hr.contract,car_company_amount:0
msgid "Company car employer"
msgstr "Carro da empresa"
#. module: l10n_be_hr_payroll
#: field:hr.contract,misc_advantage_amount:0
msgid "Benefits of various nature "
msgstr "Benefícios de outras naturezas "
#. module: l10n_be_hr_payroll
#: field:hr.contract,car_employee_deduction:0
msgid "Company Car Deduction for Worker"
msgstr "Dedução referente ao carro da empresa"
#. module: l10n_be_hr_payroll
#: field:hr.employee,disabled_children_bool:0
msgid "Disabled Children"
msgstr "Filho(s) incapaz(es)"
#. module: l10n_be_hr_payroll
#: model:ir.model,name:l10n_be_hr_payroll.model_hr_contract
msgid "Contract"
msgstr "Contrato"
#. module: l10n_be_hr_payroll
#: field:hr.contract,meal_voucher_amount:0
msgid "Check Value Meal "
msgstr "Vale refeição "
#. module: l10n_be_hr_payroll
#: field:hr.contract,travel_reimbursement_amount:0
msgid "Reimbursement of travel expenses"
msgstr "Reembolso de despeza de viagem"
#. module: l10n_be_hr_payroll
#: constraint:hr.contract:0
msgid "Error! contract start-date must be lower then contract end-date."
msgstr ""
"Erro! A data de início do contrato deve ser menor que a data de término do "
"contrato."
#. module: l10n_be_hr_payroll
#: field:hr.employee,spouse_fiscal_status:0
msgid "Tax status for spouse"
msgstr "Situação fiscal do cônjuge"
#. module: l10n_be_hr_payroll
#: view:hr.contract:0
msgid "by Worker"
msgstr "por Empregado"
#. module: l10n_be_hr_payroll
#: view:hr.employee:0
msgid "number of dependent children declared as disabled"
msgstr "Quantidade de filhos declarados como incapazes"
#. module: l10n_be_hr_payroll
#: field:hr.contract,meal_voucher_employee_deduction:0
msgid "Check Value Meal - by worker "
msgstr "Vale refeição - por empregado "
addons/l10n_ch/sterchi_chart/account.xml
-1
View File
@@ -11807,7 +11807,6 @@
<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_cn/account_chart.xml
-1
View File
@@ -957,7 +957,6 @@
<field name="property_account_payable" ref="chart2202"/>
<field name="property_account_expense_categ" ref="chart1401"/>
<field name="property_account_income_categ" ref="chart6001"/>
<field name="property_reserve_and_surplus_account" ref="chart4103"/>
</record>
<!-- 增值税 -->
<record id="vats" model="account.tax.template">
addons/l10n_cn/i18n/pt_BR.po
+17 -17
View File
@@ -8,29 +8,29 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2011-12-23 09:56+0000\n"
"PO-Revision-Date: 2011-03-09 22:08+0000\n"
"Last-Translator: Emerson <Unknown>\n"
"PO-Revision-Date: 2012-10-16 23:56+0000\n"
"Last-Translator: Syllas F. de O. Neto <syllasneto@gmail.com>\n"
"Language-Team: Brazilian Portuguese <pt_BR@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: 2012-08-28 06:42+0000\n"
"X-Generator: Launchpad (build 15864)\n"
"X-Launchpad-Export-Date: 2012-10-17 04:36+0000\n"
"X-Generator: Launchpad (build 16152)\n"
#. module: l10n_cn
#: model:account.account.type,name:l10n_cn.user_type_profit_and_loss
msgid "损益类"
msgstr ""
msgstr "Categoria Lucro ou Prejuízo"
#. module: l10n_cn
#: model:account.account.type,name:l10n_cn.user_type_all
msgid "所有科目"
msgstr ""
msgstr "Todos os assuntos"
#. module: l10n_cn
#: model:account.account.type,name:l10n_cn.user_type_equity
msgid "所有者权益类"
msgstr ""
msgstr "Capital Próprio"
#. module: l10n_cn
#: model:ir.actions.todo,note:l10n_cn.config_call_account_template_cn_chart
@@ -43,28 +43,28 @@ msgid ""
"Management/Configuration/Financial Accounting/Financial Accounts/Generate "
"Chart of Accounts from a Chart Template."
msgstr ""
"Generate Chart of Accounts from a Chart Template. You will be asked to pass "
"the name of the company, the chart template to follow, the no. of digits to "
"generate the code for your accounts and Bank account, currency to create "
"Journals. Thus,the pure copy of chart Template is generated.\n"
"\tThis is the same wizard that runs from Financial "
"Management/Configuration/Financial Accounting/Financial Accounts/Generate "
"Chart of Accounts from a Chart Template."
"Gerar Gráfico de Contas apartir de um modelo. Você deverá informar o nome da "
"empresa, o gráfico modelo, o número de dígitos para gerar o código para suas "
"contas, a conta bancária e a moeda para gerar a sequência. Em seguida uma "
"cópia do gráfico modelo é gerada.\n"
"Este é o mesmo assistente que é executado a partir de Gerenciamento "
"Financeiro/Configuração/Contabilidade Financeira/Contas Financeiras/Gerar "
"Gráfico de Contas a partir de um Gráfico Modelo."
#. module: l10n_cn
#: model:account.account.type,name:l10n_cn.user_type_debt
msgid "负债类"
msgstr ""
msgstr "Classe Passivos"
#. module: l10n_cn
#: model:account.account.type,name:l10n_cn.user_type_cost
msgid "成本类"
msgstr ""
msgstr "Custo da Classe"
#. module: l10n_cn
#: model:account.account.type,name:l10n_cn.user_type_capital
msgid "资产类"
msgstr ""
msgstr "Classe Ativos"
#~ msgid "中国会计科目表"
#~ msgstr "中国会计科目表"
addons/l10n_fr/fr_pcg_taxes.xml
-1
View File
@@ -441,7 +441,6 @@
<field name="property_account_payable" ref="fr_pcg_pay"/>
<field name="property_account_expense_categ" ref="pcg_6071"/>
<field name="property_account_income_categ" ref="pcg_7071"/>
<field name="property_reserve_and_surplus_account" ref="pcg_120"/>
</record>
</data>
addons/l10n_gt/l10n_gt_base.xml
-1
View File
@@ -35,7 +35,6 @@
<field name="bank_account_view_id" ref="cta1101"/>
<field name="property_account_receivable" ref="cta110201"/>
<field name="property_account_payable" ref="cta210101"/>
<field name="property_reserve_and_surplus_account" ref="cta310103"/>
<field name="property_account_income_categ" ref="cta410101"/>
<field name="property_account_expense_categ" ref="cta510101"/>
</record>
addons/l10n_hn/l10n_hn_base.xml
-1
View File
@@ -21,7 +21,6 @@
<field name="bank_account_view_id" ref="cta1101"/>
<field name="property_account_receivable" ref="cta110201"/>
<field name="property_account_payable" ref="cta210101"/>
<field name="property_reserve_and_surplus_account" ref="cta310103"/>
<field name="property_account_income_categ" ref="cta410101"/>
<field name="property_account_expense_categ" ref="cta510101"/>
</record>
addons/l10n_in/l10n_in_private_chart.xml
-1
View File
@@ -514,7 +514,6 @@
<field name="property_account_payable" ref="a215"/>
<field name="property_account_expense_categ" ref="a540"/>
<field name="property_account_income_categ" ref="a311"/>
<field name="property_reserve_and_surplus_account" ref="a260"/>
</record>
addons/l10n_in/l10n_in_public_chart.xml
-1
View File
@@ -668,7 +668,6 @@
<field name="property_account_payable" ref="p21000"/>
<field name="property_account_expense_categ" ref="p41010"/>
<field name="property_account_income_categ" ref="p31010"/>
<field name="property_reserve_and_surplus_account" ref="p24600"/>
</record>
</data>
addons/l10n_ma/i18n/pt_BR.po
+5 -5
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:56+0000\n"
"PO-Revision-Date: 2011-03-10 23:15+0000\n"
"Last-Translator: Emerson <Unknown>\n"
"PO-Revision-Date: 2012-10-16 23:59+0000\n"
"Last-Translator: Syllas F. de O. Neto <syllasneto@gmail.com>\n"
"Language-Team: Brazilian Portuguese <pt_BR@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: 2012-08-28 06:41+0000\n"
"X-Generator: Launchpad (build 15864)\n"
"X-Launchpad-Export-Date: 2012-10-17 04:36+0000\n"
"X-Generator: Launchpad (build 16152)\n"
#. module: l10n_ma
#: model:account.account.type,name:l10n_ma.cpt_type_imm
@@ -81,7 +81,7 @@ msgstr "Name"
#. module: l10n_ma
#: field:l10n.ma.report,line_ids:0
msgid "Lines"
msgstr "Lines"
msgstr "Linhas"
#. module: l10n_ma
#: model:account.account.type,name:l10n_ma.cpt_type_tax
addons/l10n_nl/account_chart_netherlands.xml
-1
View File
@@ -4102,7 +4102,6 @@
<field name="property_account_payable" ref="a_pay"/> <!-- crediteuren -->
<field name="property_account_expense_categ" ref="a_expense"/><!-- aankoop grondstoffen -->
<field name="property_account_income_categ" ref="a_sale"/> <!-- verkoop rekening -->
<field name="property_reserve_and_surplus_account" ref="a_9999"/>
</record>
<!-- BTW Template
addons/l10n_uk/data/account.chart.template.csv
+2 -2
View File
@@ -1,2 +1,2 @@
"id","name","account_root_id:id","tax_code_root_id:id","bank_account_view_id:id","property_account_receivable:id","property_account_payable:id","property_account_expense_categ:id","property_account_income_categ:id","property_reserve_and_surplus_account:id"
"l10n_uk","UK Tax and Account Chart Template (by SmartMode)","UK0","0","1200","1100","2100","5000","4000","3200"
"id","name","account_root_id:id","tax_code_root_id:id","bank_account_view_id:id","property_account_receivable:id","property_account_payable:id","property_account_expense_categ:id","property_account_income_categ:id"
"l10n_uk","UK Tax and Account Chart Template (by SmartMode)","UK0","0","1200","1100","2100","5000","4000"
1 id name account_root_id:id tax_code_root_id:id bank_account_view_id:id property_account_receivable:id property_account_payable:id property_account_expense_categ:id property_account_income_categ:id property_reserve_and_surplus_account:id
2 l10n_uk UK Tax and Account Chart Template (by SmartMode) UK0 0 1200 1100 2100 5000 4000 3200
addons/l10n_uy/account_chart_template.xml
-1
View File
@@ -1895,7 +1895,6 @@
<field name="property_account_payable" ref="uy_code_21100"/>
<field name="property_account_income_categ" ref="uy_code_4100"/>
<field name="property_account_expense_categ" ref="uy_code_5100"/>
<field name="property_reserve_and_surplus_account" ref="uy_code_3313"/>
</record>
addons/lunch/i18n/pt_BR.po
+55 -46
View File
@@ -8,31 +8,31 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-02-08 01:37+0100\n"
"PO-Revision-Date: 2011-03-15 01:10+0000\n"
"Last-Translator: Emerson <Unknown>\n"
"PO-Revision-Date: 2012-10-17 00:27+0000\n"
"Last-Translator: Syllas F. de O. Neto <syllasneto@gmail.com>\n"
"Language-Team: Brazilian Portuguese <pt_BR@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: 2012-08-28 06:40+0000\n"
"X-Generator: Launchpad (build 15864)\n"
"X-Launchpad-Export-Date: 2012-10-17 04:36+0000\n"
"X-Generator: Launchpad (build 16152)\n"
#. module: lunch
#: view:lunch.cashbox.clean:0
msgid "Reset cashbox"
msgstr ""
msgstr "Reiniciar Caixa"
#. module: lunch
#: view:report.lunch.amount:0
msgid "Box amount in current year"
msgstr ""
msgstr "Valor do Caixa total no ano atual"
#. module: lunch
#: model:ir.actions.act_window,name:lunch.action_lunch_order_form
#: model:ir.ui.menu,name:lunch.menu_lunch_order_form
#: model:ir.ui.menu,name:lunch.menu_lunch_reporting_order
msgid "Lunch Orders"
msgstr ""
msgstr "Pedidos de Almoço"
#. module: lunch
#: view:lunch.order.cancel:0
@@ -43,7 +43,7 @@ msgstr "Tem certeza que deseja cancelar este pedido?"
#: model:ir.actions.act_window,name:lunch.action_lunch_cashmove_form
#: model:ir.ui.menu,name:lunch.menu_lunch_cashmove_form
msgid "Cash Moves"
msgstr ""
msgstr "Movimentações Financeiras"
#. module: lunch
#: view:lunch.cashmove:0 view:lunch.order:0 view:report.lunch.amount:0
@@ -96,6 +96,8 @@ msgid ""
"You can create on cashbox by employee if you want to keep track of the "
"amount due by employee according to what have been ordered."
msgstr ""
"Você pode criar um caixa por funcionário se você deseja rastrear o valor "
"devido pelo funcionário de acordo com o que ele solicitou."
#. module: lunch
#: field:lunch.cashmove,amount:0 field:report.lunch.amount,amount:0
@@ -111,7 +113,7 @@ msgstr "Produtos"
#. module: lunch
#: model:ir.model,name:lunch.model_report_lunch_amount
msgid "Amount available by user and box"
msgstr ""
msgstr "Valor disponível por usuário e caixa"
#. module: lunch
#: view:report.lunch.amount:0
@@ -121,12 +123,12 @@ msgstr " Mês "
#. module: lunch
#: model:ir.model,name:lunch.model_report_lunch_order
msgid "Lunch Orders Statistics"
msgstr ""
msgstr "Estatísticas de Pedido de Almoço"
#. module: lunch
#: view:lunch.cashmove:0 field:lunch.order,cashmove:0
msgid "CashMove"
msgstr ""
msgstr "Movimentações de Caixa"
#. module: lunch
#: view:lunch.order:0 selection:lunch.order,state:0
@@ -141,17 +143,17 @@ msgstr "Confirmar"
#. module: lunch
#: view:lunch.order:0
msgid "Search Lunch Order"
msgstr ""
msgstr "Procurar Pedido de Almoço"
#. module: lunch
#: field:lunch.order,state:0
msgid "State"
msgstr "Status"
msgstr "Situação"
#. module: lunch
#: selection:lunch.order,state:0
msgid "New"
msgstr ""
msgstr "Novo"
#. module: lunch
#: field:report.lunch.order,price_total:0
@@ -161,7 +163,7 @@ msgstr "Preço Total"
#. module: lunch
#: view:report.lunch.amount:0
msgid "Box Amount by User"
msgstr ""
msgstr "Valor do Caixa por usuário"
#. module: lunch
#: field:lunch.cashmove,create_date:0
@@ -181,7 +183,7 @@ msgstr "Descrição do Pedido"
#. module: lunch
#: view:report.lunch.amount:0
msgid "Box amount in last month"
msgstr ""
msgstr "Valor do Caixa no último mês"
#. module: lunch
#: model:ir.actions.act_window,name:lunch.action_lunch_order_confirm
@@ -218,7 +220,7 @@ msgstr "Data de Criação"
#. module: lunch
#: model:ir.actions.act_window,name:lunch.action_lunch_category_form
msgid " Product Categories "
msgstr ""
msgstr " Categorias de Produto "
#. module: lunch
#: view:lunch.cashbox.clean:0
@@ -228,12 +230,12 @@ msgstr "Definir como Zero"
#. module: lunch
#: model:ir.model,name:lunch.model_lunch_cashmove
msgid "Cash Move"
msgstr ""
msgstr "Movimentos do Caixa"
#. module: lunch
#: view:report.lunch.order:0
msgid "Tasks performed in last 365 days"
msgstr ""
msgstr "Tarefas realizadas nos últimos 365 dias"
#. module: lunch
#: selection:report.lunch.amount,month:0 selection:report.lunch.order,month:0
@@ -259,7 +261,7 @@ msgstr "Mês"
#. module: lunch
#: field:lunch.order.confirm,confirm_cashbox:0
msgid "Name of box"
msgstr ""
msgstr "Nome do Caixa"
#. module: lunch
#: view:lunch.order.cancel:0
@@ -291,12 +293,12 @@ msgstr "Não"
#. module: lunch
#: view:lunch.order.confirm:0
msgid "Orders Confirmation"
msgstr ""
msgstr "Confirmação dos Pedidos"
#. module: lunch
#: view:lunch.cashbox.clean:0
msgid "Are you sure you want to reset this cashbox ?"
msgstr ""
msgstr "Tem certeza de que quer reiniciar este caixa?"
#. module: lunch
#: model:ir.actions.act_window,help:lunch.view_lunch_product_form_installer
@@ -306,6 +308,10 @@ msgid ""
"by supplier. It will be easier for the lunch manager to filter lunch orders "
"by categories."
msgstr ""
"Definir todos os produtos que os funcionários podem pedir para a hora do "
"almoço. Se encomendar o almoço em vários lugares, você pode usar as "
"categorias de produtos para dividir por fornecedor. Será mais fácil para o "
"gerente de almoço para filtrar almoço pedidos por categorias."
#. module: lunch
#: selection:report.lunch.amount,month:0 selection:report.lunch.order,month:0
@@ -316,7 +322,7 @@ msgstr "Agosto"
#: model:ir.actions.act_window,name:lunch.action_report_lunch_order_all
#: view:report.lunch.order:0
msgid "Lunch Order Analysis"
msgstr ""
msgstr "Análise de Pedidos de Almoço"
#. module: lunch
#: selection:report.lunch.amount,month:0 selection:report.lunch.order,month:0
@@ -337,7 +343,7 @@ msgstr "Análise de Vendas"
#. module: lunch
#: model:ir.ui.menu,name:lunch.menu_lunch_category_root_configuration
msgid "Lunch"
msgstr ""
msgstr "Almoço"
#. module: lunch
#: view:lunch.cashmove:0 view:report.lunch.order:0
@@ -367,12 +373,12 @@ msgstr "Janeiro"
#. module: lunch
#: field:lunch.cashmove,box:0 field:report.lunch.amount,box:0
msgid "Box Name"
msgstr ""
msgstr "Nome do Caixa"
#. module: lunch
#: model:ir.model,name:lunch.model_lunch_cashbox_clean
msgid "clean cashbox"
msgstr ""
msgstr "Limpar caixa"
#. module: lunch
#: field:lunch.cashmove,active:0 field:lunch.product,active:0
@@ -387,18 +393,18 @@ msgstr "Data do Pedido"
#. module: lunch
#: model:ir.model,name:lunch.model_lunch_cashbox
msgid "Cashbox for Lunch "
msgstr ""
msgstr "Caixa do Almoço "
#. module: lunch
#: model:ir.actions.act_window,name:lunch.action_lunch_cashbox_clean
#: model:ir.actions.act_window,name:lunch.action_lunch_cashbox_clean_values
msgid "Set CashBox to Zero"
msgstr ""
msgstr "Zerar Caixa"
#. module: lunch
#: view:lunch.product:0
msgid "General Information"
msgstr ""
msgstr "Informações Gerais"
#. module: lunch
#: view:lunch.order.confirm:0
@@ -408,7 +414,7 @@ msgstr "Cancelar"
#. module: lunch
#: model:ir.actions.act_window,name:lunch.action_lunch_cashbox_form
msgid " Cashboxes "
msgstr ""
msgstr " Caixas "
#. module: lunch
#: report:lunch.order:0
@@ -439,27 +445,27 @@ msgstr "Preço"
#. module: lunch
#: view:lunch.cashmove:0
msgid "Search CashMove"
msgstr ""
msgstr "Procurar Movimento do Caixa"
#. module: lunch
#: view:report.lunch.amount:0
msgid "Total box"
msgstr ""
msgstr "Total do Caixa"
#. module: lunch
#: model:ir.model,name:lunch.model_lunch_product
msgid "Lunch Product"
msgstr ""
msgstr "Produto do Almoço"
#. module: lunch
#: field:lunch.cashbox,sum_remain:0
msgid "Total Remaining"
msgstr ""
msgstr "Total Restante"
#. module: lunch
#: view:lunch.order:0
msgid "Total price"
msgstr ""
msgstr "Preço Total"
#. module: lunch
#: selection:report.lunch.amount,month:0 selection:report.lunch.order,month:0
@@ -480,17 +486,17 @@ msgstr "Valor total"
#. module: lunch
#: view:report.lunch.order:0
msgid "Tasks performed in last 30 days"
msgstr ""
msgstr "Tarefas realizadas nos últimos 30 dias"
#. module: lunch
#: view:lunch.category:0
msgid "Category Related to Products"
msgstr ""
msgstr "Categoria Relativa a Produtos"
#. module: lunch
#: model:ir.ui.menu,name:lunch.menu_lunch_cashbox_form view:lunch.cashbox:0
msgid "Cashboxes"
msgstr ""
msgstr "Caixa"
#. module: lunch
#: view:lunch.category:0 report:lunch.order:0 view:lunch.order:0
@@ -502,28 +508,28 @@ msgstr "Pedido"
#: model:ir.model,name:lunch.model_lunch_order
#: model:ir.ui.menu,name:lunch.menu_lunch report:lunch.order:0
msgid "Lunch Order"
msgstr ""
msgstr "Pedido de Almoço"
#. module: lunch
#: view:report.lunch.amount:0
msgid "Box amount in current month"
msgstr ""
msgstr "Valor do Caixa este mês"
#. module: lunch
#: model:ir.actions.act_window,name:lunch.view_lunch_product_form_installer
msgid "Define Your Lunch Products"
msgstr ""
msgstr "Definir seus produtos de almoço"
#. module: lunch
#: view:report.lunch.order:0
msgid "Tasks during last 7 days"
msgstr ""
msgstr "Tarefas durante os últimos 7 dias"
#. module: lunch
#: model:ir.actions.act_window,name:lunch.action_report_lunch_amount_tree
#: model:ir.ui.menu,name:lunch.menu_lunch_report_amount_tree
msgid "Cash Position by User"
msgstr ""
msgstr "Caixa por usuário"
#. module: lunch
#: field:lunch.cashbox,manager:0
@@ -538,18 +544,21 @@ msgstr " 30 Dias "
#. module: lunch
#: view:lunch.order:0
msgid "To Confirm"
msgstr ""
msgstr "Para Confirmar"
#. module: lunch
#: field:report.lunch.amount,year:0 view:report.lunch.order:0
#: field:report.lunch.order,year:0
msgid "Year"
msgstr ""
msgstr "Ano"
#. module: lunch
#: model:ir.actions.act_window,name:lunch.action_create_cashbox
msgid "Create Lunch Cash Boxes"
msgstr ""
msgstr "Criar Caixa de Almoço"
#~ msgid "Draft"
#~ msgstr "Provisório"
#~ msgid "Category related to Products"
#~ msgstr "Categorias relacionadas a Produtos"
addons/mail/i18n/pt_BR.po
+11 -11
View File
@@ -8,20 +8,20 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-02-09 00:36+0000\n"
"PO-Revision-Date: 2011-01-17 18:39+0000\n"
"Last-Translator: Emerson <Unknown>\n"
"PO-Revision-Date: 2012-10-17 00:25+0000\n"
"Last-Translator: Syllas F. de O. Neto <syllasneto@gmail.com>\n"
"Language-Team: Brazilian Portuguese <pt_BR@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: 2012-08-28 06:40+0000\n"
"X-Generator: Launchpad (build 15864)\n"
"X-Launchpad-Export-Date: 2012-10-17 04:36+0000\n"
"X-Generator: Launchpad (build 16152)\n"
#. module: mail
#: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
#: field:mail.message.common,subtype:0
msgid "Message Type"
msgstr ""
msgstr "Tipo de Mensagem"
#. module: mail
#: help:mail.compose.message,auto_delete:0
@@ -80,7 +80,7 @@ msgstr "Destinatários da mensagem"
#: field:mail.compose.message,body_text:0 field:mail.message,body_text:0
#: field:mail.message.common,body_text:0
msgid "Text Contents"
msgstr ""
msgstr "Conteúdo do Texto"
#. module: mail
#: view:mail.message:0 selection:mail.message,state:0
@@ -196,7 +196,7 @@ msgstr "Destinatários"
#. module: mail
#: model:ir.model,name:mail.model_mail_compose_message
msgid "Email composition wizard"
msgstr ""
msgstr "Assistente para compor Email"
#. module: mail
#: field:mail.compose.message,res_id:0 field:mail.message,res_id:0
@@ -219,7 +219,7 @@ msgstr "Re:"
#: field:mail.compose.message,model:0 field:mail.message,model:0
#: field:mail.message.common,model:0
msgid "Related Document Model"
msgstr ""
msgstr "Modelo de Documento Relacionado"
#. module: mail
#: view:mail.message:0
@@ -287,7 +287,7 @@ msgstr "%(sender_name)s escreveu:"
#: field:mail.compose.message,body_html:0 field:mail.message,body_html:0
#: field:mail.message.common,body_html:0
msgid "Rich-text Contents"
msgstr ""
msgstr "Conteúdo Rich-text"
#. module: mail
#: field:mail.message,original:0
@@ -360,7 +360,7 @@ msgstr "[OpenERP-Forward-Failed] %s"
#. module: mail
#: field:mail.message,user_id:0
msgid "Related User"
msgstr ""
msgstr "Usuário Relacionado"
#. module: mail
#: help:mail.compose.message,headers:0 help:mail.message,headers:0
@@ -455,7 +455,7 @@ msgstr "Mensagens"
#: field:mail.compose.message,headers:0 field:mail.message,headers:0
#: field:mail.message.common,headers:0
msgid "Message Headers"
msgstr ""
msgstr "Cabeçalhos da Mensagem"
#. module: mail
#: field:mail.compose.message,email_bcc:0 field:mail.message,email_bcc:0
addons/mail/static/src/js/mail.js
+2 -9
View File
@@ -1155,14 +1155,7 @@ openerp.mail = function(session) {
_check_visibility: function() {
this.$el.toggle(this.view.get("actual_mode") !== "create");
},
/**
* Reinitialize the widget field and Display the threads
* @param {Object} new_context: context of the refresh
*/
set_value: function() {
var self = this;
this._super.apply(this, arguments);
render_value: function() {
if (! this.view.datarecord.id || session.web.BufferedDataSet.virtual_id_regex.test(this.view.datarecord.id)) {
this.$('oe_mail_thread').hide();
return;
@@ -1267,7 +1260,7 @@ openerp.mail = function(session) {
domains: domains || [],
contexts: contexts || [],
group_by_seq: groupbys || []
}, function (results) {
}).then(function (results) {
self.search_results['context'] = results.context;
self.search_results['domain'] = results.domain;
self.thread.destroy();
addons/mail/static/src/js/mail_followers.js
+2 -2
View File
@@ -88,9 +88,9 @@ openerp_mail_followers = function(session, mail) {
});
},
set_value: function(value_) {
render_value: function() {
this.reinit();
return this.fetch_followers(value_ || this.get_value());
return this.fetch_followers(this.get("value"));
},
set_is_follower: function(value_) {
addons/mrp/mrp.py
+11
View File
@@ -274,6 +274,17 @@ class mrp_bom(osv.osv):
return {'value': {'name': prod.name, 'product_uom': prod.uom_id.id}}
return {}
def onchange_uom(self, cr, uid, ids, product_id, product_uom, context=None):
res = {'value':{}}
if not product_uom or not product_id:
return res
product = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
uom = self.pool.get('product.uom').browse(cr, uid, product_uom, context=context)
if uom.category_id.id != product.uom_id.category_id.id:
res['warning'] = {'title': _('Warning'), 'message': _('The Product Unit of Measure you chose has a different category than in the product form.')}
res['value'].update({'product_uom': product.uom_id.id})
return res
def _bom_find(self, cr, uid, product_id, product_uom, properties=None):
""" Finds BoM for particular product and product uom.
@param product_id: Selected product.
addons/mrp/mrp_view.xml
+2 -2
View File
@@ -351,7 +351,7 @@
<label for="product_qty" string="Quantity"/>
<div>
<field name="product_qty" class="oe_inline"/>
<field name="product_uom" class="oe_inline" groups="product.group_uom"/>
<field name="product_uom" class="oe_inline" on_change="onchange_uom(product_id, product_uom)" groups="product.group_uom"/>
</div>
<label for="product_uos_qty" groups="product.group_uos"/>
<div groups="product.group_uos" >
@@ -382,7 +382,7 @@
<tree string="Components" editable="bottom">
<field name="product_id" on_change="onchange_product_id(product_id, name)"/>
<field name="product_qty"/>
<field name="product_uom" groups="product.group_uom"/>
<field name="product_uom" on_change="onchange_uom(product_id, product_uom)" groups="product.group_uom"/>
<field name="name" invisible="1"/>
<field name="date_start"/>
<field name="date_stop"/>
addons/mrp_repair/i18n/pt_BR.po
+20 -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: 2012-02-08 00:36+0000\n"
"PO-Revision-Date: 2012-05-10 18:03+0000\n"
"Last-Translator: Adriano Prado <adrianojprado@hotmail.com>\n"
"PO-Revision-Date: 2012-10-17 00:28+0000\n"
"Last-Translator: Syllas F. de O. Neto <syllasneto@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-08-28 06:29+0000\n"
"X-Generator: Launchpad (build 15864)\n"
"X-Launchpad-Export-Date: 2012-10-17 04:36+0000\n"
"X-Generator: Launchpad (build 16152)\n"
#. module: mrp_repair
#: view:mrp.repair:0
@@ -35,6 +35,15 @@ msgid ""
"* The 'Done' state is set when repairing is completed. \n"
"* The 'Cancelled' state is used when user cancel repair order."
msgstr ""
" * 'Provisória' é usada quando um usuário está preparando uma nova ordem de "
"reparo não confirmada.\n"
"* 'Confirmada' é usado quando o usuário confirma a ordem de reparo.\n"
"* 'Pronto para Reparo\" é usado para iniciar o reparo, o usuário pode "
"começar a reparar somente após a confirmação da ordem de reparo.\n"
"* 'Faturar' é usado para gerar a fatura antes ou após o reparo feito.\n"
"* 'Concluído' é definido quando o reparo finalizar.\n"
"* O 'Cancelado' estado é usado quando o usuário cancelar a ordem de "
"reparação."
#. module: mrp_repair
#: field:mrp.repair.line,move_id:0
@@ -179,7 +188,7 @@ msgstr "Atenção !"
#. module: mrp_repair
#: report:repair.order:0
msgid "Tax"
msgstr ""
msgstr "Imposto"
#. module: mrp_repair
#: view:mrp.repair:0
@@ -312,6 +321,12 @@ msgid ""
" \n"
"* The 'Cancelled' state is set automatically when user cancel repair order."
msgstr ""
" * 'Provisório' é definido automaticamente, quando a ordem de reparo está em "
"situação provisória.\n"
"* 'Confirmado' é definido automaticamente quando a ordem for confirmada.\n"
"* 'Concluído' é definido automaticamente quando o reparo estiver concluído.\n"
"* 'Cancelado' é definido automaticamente quando o usuário cancelar a ordem "
"de reparos."
#. module: mrp_repair
#: report:repair.order:0
addons/mrp_subproduct/mrp_subproduct.py
+12
View File
@@ -22,6 +22,7 @@
from osv import fields
from osv import osv
import decimal_precision as dp
from tools.translate import _
class mrp_subproduct(osv.osv):
_name = 'mrp.subproduct'
@@ -51,6 +52,17 @@ class mrp_subproduct(osv.osv):
return {'value': v}
return {}
def onchange_uom(self, cr, uid, ids, product_id, product_uom, context=None):
res = {'value':{}}
if not product_uom or not product_id:
return res
product = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
uom = self.pool.get('product.uom').browse(cr, uid, product_uom, context=context)
if uom.category_id.id != product.uom_id.category_id.id:
res['warning'] = {'title': _('Warning'), 'message': _('The Product Unit of Measure you chose has a different category than in the product form.')}
res['value'].update({'product_uom': product.uom_id.id})
return res
mrp_subproduct()
class mrp_bom(osv.osv):
addons/mrp_subproduct/mrp_subproduct_view.xml
+2 -2
View File
@@ -11,13 +11,13 @@
<field name="sub_products">
<tree string="sub products" editable="top">
<field name="product_id" on_change="onchange_product_id(product_id)"/>
<field name="product_uom" groups="product.group_uom"/>
<field name="product_uom" on_change="onchange_uom(product_id, product_uom)" groups="product.group_uom"/>
<field name="product_qty"/>
<field name="subproduct_type"/>
</tree>
<form string="Sub Products">
<field name="product_id" on_change="onchange_product_id(product_id)"/>
<field name="product_uom" groups="product.group_uom"/>
<field name="product_uom" on_change="onchange_uom(product_id, product_uom)" groups="product.group_uom"/>
<field name="product_qty"/>
<field name="subproduct_type"/>
</form>
addons/pad/static/src/js/pad.js
+5 -8
View File
@@ -4,16 +4,13 @@ openerp.pad = function(instance) {
template: 'FieldPad',
configured: false,
content: "",
set_value: function(val) {
render_value: function() {
var self = this;
var _super = self._super;
_super.apply(self,[val]);
if (val === false || val === "") {
self.field_manager.dataset.call('pad_generate_url',{context:{
model: self.field_manager.model,
if (this.get("value") === false || this.get("value") === "") {
self.view.dataset.call('pad_generate_url',{context:{
model: self.view.model,
field_name: self.name,
object_id: self.field_manager.datarecord.id
object_id: self.view.datarecord.id
}}).then(function(data) {
if(data&&data.url){
_super.apply(self,[data.url]);
addons/point_of_sale/i18n/id.po
+23 -13
View File
@@ -7,19 +7,19 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-02-08 01:37+0100\n"
"PO-Revision-Date: 2009-11-09 18:58+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
"PO-Revision-Date: 2012-10-16 23:09+0000\n"
"Last-Translator: BlueSeptin <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-08-28 06:03+0000\n"
"X-Generator: Launchpad (build 15864)\n"
"X-Launchpad-Export-Date: 2012-10-17 04:35+0000\n"
"X-Generator: Launchpad (build 16152)\n"
#. module: point_of_sale
#: field:report.transaction.pos,product_nb:0
msgid "Product Nb."
msgstr ""
msgstr "Catatan"
#. module: point_of_sale
#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_today
@@ -37,11 +37,17 @@ msgid ""
"new payment methods directly from menu \"PoS Backend > Configuration > "
"Payment Methods\"."
msgstr ""
"Anda harus menentukan metode pembayaran yang digunakan pada pint of sale "
"berdasarkan bank dan cash yang terdapat pada \"Acconting > Konfigurasi > "
"Financial Akunting > Journals\". Pilih salah satu journal dan centang pada "
"field \"PoS Payment Method\" dari tab \"Point of Sale\". Anda juga bisa "
"langsung membuat Metode Pembayaran secara langsung dari menu \"Pos Backend > "
"Konfigurasi > Payment Methods\""
#. module: point_of_sale
#: view:pos.order:0 view:report.pos.order:0
msgid "Today"
msgstr "Hari Ini"
msgstr "Hari ini"
#. module: point_of_sale
#: model:pos.category,name:point_of_sale.plain_water
@@ -51,12 +57,12 @@ msgstr ""
#. module: point_of_sale
#: view:report.cash.register:0
msgid "Year from Creation date of cash register"
msgstr ""
msgstr "Tahun dari Tanggal Pembuatan Cash Register"
#. module: point_of_sale
#: view:pos.confirm:0
msgid "Post All Orders"
msgstr ""
msgstr "Posting Semua Transaksi"
#. module: point_of_sale
#: model:product.template,name:point_of_sale.spa_2l_product_template
@@ -89,12 +95,12 @@ msgstr "Hari"
#. module: point_of_sale
#: view:pos.make.payment:0
msgid "Add payment :"
msgstr ""
msgstr "Masukkan Pembayaran"
#. module: point_of_sale
#: field:pos.box.out,name:0
msgid "Description / Reason"
msgstr ""
msgstr "Keterangan"
#. module: point_of_sale
#: field:report.sales.by.margin.pos,product_name:0
@@ -105,7 +111,7 @@ msgstr "Nama Produk"
#. module: point_of_sale
#: view:report.cash.register:0
msgid "Month from Creation date of cash register"
msgstr ""
msgstr "Bulan dari Tanggal Terbentuknya Cash Register"
#. module: point_of_sale
#: report:account.statement:0 field:pos.box.entries,amount:0
@@ -121,12 +127,14 @@ msgid ""
"Configuration error! The currency chosen should be shared by the default "
"accounts too."
msgstr ""
"Konfigurasi salah ! Mata uang yang dipilih harus sama dengan mata uang pada "
"akun"
#. module: point_of_sale
#: model:ir.actions.act_window,name:point_of_sale.pos_category_action
#: model:ir.ui.menu,name:point_of_sale.menu_pos_category view:pos.category:0
msgid "PoS Categories"
msgstr ""
msgstr "Kategori PoS"
#. module: point_of_sale
#: model:ir.actions.act_window,name:point_of_sale.action_box_out
@@ -161,6 +169,8 @@ msgid ""
"You do not have any open cash register. You must create a payment method or "
"open a cash register."
msgstr ""
"Anda tidak memiliki satupun Cash Register yang terbuka. Anda seharusnya "
"membuat Metode Pembayaran atau Open Cash Register terlebih dahulu"
#. module: point_of_sale
#: report:account.statement:0 field:report.pos.order,partner_id:0
@@ -180,7 +190,7 @@ msgstr "Harga Rata-rata"
#. module: point_of_sale
#: report:pos.lines:0
msgid "Disc. (%)"
msgstr ""
msgstr "Diskon"
#. module: point_of_sale
#: model:ir.ui.menu,name:point_of_sale.menu_point_open_config
addons/point_of_sale/i18n/lv.po
+2720
View File
File diff suppressed because it is too large Load Diff
addons/point_of_sale/i18n/pt_BR.po
+9 -9
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: 2012-02-08 01:37+0100\n"
"PO-Revision-Date: 2011-07-23 01:46+0000\n"
"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
"PO-Revision-Date: 2012-10-17 00:01+0000\n"
"Last-Translator: Syllas F. de O. Neto <syllasneto@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-08-28 06:04+0000\n"
"X-Generator: Launchpad (build 15864)\n"
"X-Launchpad-Export-Date: 2012-10-17 04:35+0000\n"
"X-Generator: Launchpad (build 16152)\n"
#. module: point_of_sale
#: field:report.transaction.pos,product_nb:0
@@ -304,7 +304,7 @@ msgstr "Vendas Mensais por Usuário"
#. module: point_of_sale
#: report:all.closed.cashbox.of.the.day:0
msgid "Today's Closed Cashbox"
msgstr ""
msgstr "Fechamento de Caixa do dia"
#. module: point_of_sale
#: view:report.cash.register:0
@@ -916,7 +916,7 @@ msgstr "Linhas da Ordem de Venda"
#. module: point_of_sale
#: view:pos.receipt:0
msgid "Receipt :"
msgstr ""
msgstr "Recibo"
#. module: point_of_sale
#: field:account.bank.statement.line,pos_statement_id:0
@@ -1177,7 +1177,7 @@ msgstr ""
#: report:pos.payment.report.user:0 report:pos.sales.user:0
#: report:pos.sales.user.today:0 report:pos.user.product:0
msgid "Print Date"
msgstr ""
msgstr "Data de Impressão"
#. module: point_of_sale
#: code:addons/point_of_sale/point_of_sale.py:282
@@ -2323,7 +2323,7 @@ msgstr "PRO-FORMA"
#: code:addons/point_of_sale/point_of_sale.py:358
#, python-format
msgid "Please provide a partner for the sale."
msgstr ""
msgstr "Por favor informe um parceiro para a venda"
#. module: point_of_sale
#: model:pos.category,name:point_of_sale.fruity_beers
@@ -2422,7 +2422,7 @@ msgstr "Reembolso"
#: code:addons/point_of_sale/report/pos_invoice.py:46
#, python-format
msgid "Please create an invoice for this sale."
msgstr ""
msgstr "Por favor crie uma fatura para esta venda."
#. module: point_of_sale
#: model:product.template,name:point_of_sale.oetker_mozzarella_product_template
addons/point_of_sale/static/src/js/devices.js
+1 -2
View File
@@ -37,8 +37,7 @@ function openerp_pos_devices(instance,module){ //module is instance.point_of_sal
callbacks[i](params);
}
this.connection.rpc('/pos/'+name, params || {},
function(result){
this.connection.rpc('/pos/'+name, params || {}).then(function(result){
ret.resolve(result);
},
function(error){
addons/process/static/src/js/process.js
+2 -3
View File
@@ -216,13 +216,12 @@ instance.web.ViewManager.include({
var dataset = new instance.web.DataSet(this, 'ir.values', this.session.user_context);
var action_manager = new instance.web.ActionManager(self);
dataset.call('get',
['action', 'tree_but_open',[['ir.ui.menu', id]], dataset.context],
function(res) {
['action', 'tree_but_open',[['ir.ui.menu', id]], dataset.context]).then(function(res) {
var action = res[0][res[0].length - 1];
self.rpc("/web/action/load", {
action_id: action.id,
context: dataset.context
}, function(result) {
}).then(function(result) {
action_manager.replace(self.$el);
action_manager.do_action(result.result);
})
addons/product/product_view.xml
+1 -1
View File
@@ -13,7 +13,7 @@
<filter string="Consumable" name="consumable" icon="terp-accessories-archiver" domain="[('type','=','consu')]" help="Consumable products"/>
<separator/>
<filter string="Can be Sold" name="filter_to_sell" icon="terp-accessories-archiver-minus" domain="[('sale_ok','=',1)]"/>
<field name="categ_id" operator="child_of"/>
<field name="categ_id"/>
<group expand="0" string="Context...">
<field name="pricelist_id" context="{'pricelist': self}" groups="product.group_sale_pricelist"/>
<field name="company_id" groups="base.group_multi_company"/>
addons/project/i18n/pt_BR.po
+6 -6
View File
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: pt_BR\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-02-08 01:37+0100\n"
"PO-Revision-Date: 2012-02-20 19:37+0000\n"
"Last-Translator: Rafael Sales - http://www.tompast.com.br <Unknown>\n"
"PO-Revision-Date: 2012-10-17 00:02+0000\n"
"Last-Translator: Syllas F. de O. Neto <syllasneto@gmail.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: 2012-09-21 04:42+0000\n"
"X-Generator: Launchpad (build 15985)\n"
"X-Launchpad-Export-Date: 2012-10-17 04:35+0000\n"
"X-Generator: Launchpad (build 16152)\n"
#. module: project
#: view:report.project.task.user:0
@@ -663,7 +663,7 @@ msgstr "Horas Restantes"
#. module: project
#: model:ir.model,name:project.model_mail_compose_message
msgid "Email composition wizard"
msgstr ""
msgstr "Assistente de composição de Email"
#. module: project
#: view:report.project.task.user:0
@@ -1332,7 +1332,7 @@ msgstr ""
#. module: project
#: view:project.task:0
msgid "Delegation"
msgstr ""
msgstr "Delegar Responsabilidade"
#. module: project
#: model:ir.model,name:project.model_res_users
addons/project/project_view.xml
+1 -1
View File
@@ -135,7 +135,7 @@
<field name="resource_calendar_id"/>
</group>
<group string="Miscellaneous" name="misc">
<field name="date"/>
<field name="date" string="End Date"/>
<field name="priority" groups="base.group_no_one"/>
<field name="active" attrs="{'invisible':[('state','in',['open', 'pending', 'template'])]}"/>
addons/project/security/project_security.xml
+2 -2
View File
@@ -42,10 +42,10 @@
</record>
<record model="ir.rule" id="project_public_members_rule">
<field name="name">public Members</field>
<field name="name">Public Members</field>
<field name="model_id" ref="model_project_project"/>
<field name="global" eval="True"/>
<field name="domain_force">['|','|',('privacy_visibility','in',[False,'public']),('members','in',[user.id]),('message_follower_ids','in',[user.partner_id.id])]</field>
<field name="domain_force">['|',('privacy_visibility','in',[False,'public']),('message_follower_ids','in',[user.partner_id.id])]</field>
</record>
<record model="ir.rule" id="task_comp_rule">
addons/project_gtd/project_gtd_view.xml
+1 -3
View File
@@ -78,8 +78,6 @@
<field name="arch" type="xml">
<field name="remaining_hours" position="after">
<field string="Timebox" name="timebox_id" invisible=" not context.get('gtd', False)"/>
<button name="prev_timebox" type="object" icon="gtk-go-back" string="Previous" states="draft,pending,open" invisible=" not context.get('gtd',False)"/>
<button name="next_timebox" type="object" icon="gtk-go-forward" string="Next" states="draft,pending,open" invisible=" not context.get('gtd',False)"/>
<field name="context_id" invisible="not context.get('context_show', False)" widget="selection"/>
<button name="do_reopen" states="done,cancelled" string="Reactivate" type="object" icon="gtk-convert" help="For reopening the tasks" invisible="not context.get('set_visible',False)"/>
</field>
@@ -123,7 +121,7 @@
<field name="context">{'set_editable':True,'set_visible':True,'gtd':True,'user_invisible':True, "search_default_open": 1}</field>
<field name="domain">[('user_id','=',uid)]</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar,gantt,graph,kanban</field>
<field name="view_mode">kanban,tree,form,calendar,gantt,graph</field>
</record>
<menuitem action="open_gtd_task" id="menu_open_gtd_timebox_tree" parent="project.menu_project_management" sequence="10"/>
addons/project_long_term/i18n/pt_BR.po
+5 -5
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: 2012-02-08 00:37+0000\n"
"PO-Revision-Date: 2012-02-20 19:35+0000\n"
"Last-Translator: Rafael Sales - http://www.tompast.com.br <Unknown>\n"
"PO-Revision-Date: 2012-10-17 00:36+0000\n"
"Last-Translator: Syllas F. de O. Neto <syllasneto@gmail.com>\n"
"Language-Team: Brazilian Portuguese <pt_BR@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: 2012-08-28 06:39+0000\n"
"X-Generator: Launchpad (build 15864)\n"
"X-Launchpad-Export-Date: 2012-10-17 04:36+0000\n"
"X-Generator: Launchpad (build 16152)\n"
#. module: project_long_term
#: model:ir.actions.act_window,name:project_long_term.act_project_phases
@@ -62,7 +62,7 @@ msgstr "Fases em Progresso"
#. module: project_long_term
#: view:project.phase:0
msgid "Displaying Settings"
msgstr ""
msgstr "Exibindo Configurações"
#. module: project_long_term
#: field:project.compute.phases,target_project:0
addons/purchase/i18n/lv.po
+5 -5
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: 2012-02-08 01:37+0100\n"
"PO-Revision-Date: 2012-03-20 14:39+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"PO-Revision-Date: 2012-10-16 16:24+0000\n"
"Last-Translator: Vladimirs Kuzmins <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: 2012-09-07 04:56+0000\n"
"X-Generator: Launchpad (build 15914)\n"
"X-Launchpad-Export-Date: 2012-10-17 04:35+0000\n"
"X-Generator: Launchpad (build 16152)\n"
#. module: purchase
#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1297,7 +1297,7 @@ msgstr ""
#. module: purchase
#: view:purchase.order:0
msgid "Not Invoiced"
msgstr ""
msgstr "Nav Izrakstīts Rēķins"
#. module: purchase
#: report:purchase.order:0 field:purchase.order.line,price_unit:0
addons/sale/sale_demo.xml
+6 -7
View File
@@ -294,8 +294,8 @@
<field name="model">sale.order</field>
<field name="res_id" ref="sale_order_2"/>
<field name="body">Hi,
I have a confusion for pricing of Services, I have heard there is a discount above 25 hours.
Can you clarify please?</field>
I have a question regarding services pricing: I heard of a possible discount for quantities exceeding 25 hours.
Could you confirm, please?</field>
<field name="type">comment</field>
<field name="author_id" ref="base.partner_demo"/>
</record>
@@ -305,10 +305,9 @@ Can you clarify please?</field>
<field name="res_id" ref="sale_order_2"/>
<field name="parent_id" ref="message_sale_1"/>
<field name="body">Hello,
Sorry but that scheme is not available for now,
We would like to know if you confirm the quotation with pricing we sent to you.
Thanks,
Sales Department</field>
Unfortunately that was a temporary discount that is not available anymore.
Do you still plan to confirm the order based on the quoted prices?
Thanks!</field>
<field name="type">comment</field>
<field name="author_id" ref="base.partner_root"/>
</record>
@@ -317,7 +316,7 @@ Sales Department</field>
<field name="model">sale.order</field>
<field name="res_id" ref="sale_order_2"/>
<field name="parent_id" ref="message_sale_2"/>
<field name="body">Ok, fine, we will intimate you after discussing with our team.</field>
<field name="body">Alright, thanks for the clarification. I will confirm the order as soon as I get my manager's approval.</field>
<field name="type">comment</field>
<field name="author_id" ref="base.partner_demo"/>
</record>
addons/sale/sale_view.xml
+2 -12
View File
@@ -440,16 +440,6 @@
<field name="search_view_id" ref="view_sales_order_filter"/>
</record>
<record id="view_order_line_graph" model="ir.ui.view">
<field name="name">sale.order.line.graph</field>
<field name="model">sale.order.line</field>
<field name="arch" type="xml">
<graph string="Sales Order Lines">
<field name="product_id"/>
<field name="price_subtotal" operator="+"/>
</graph>
</field>
</record>
<record id="view_order_line_tree" model="ir.ui.view">
<field name="name">sale.order.line.tree</field>
@@ -562,7 +552,7 @@
<field name="type">ir.actions.act_window</field>
<field name="res_model">sale.order.line</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,graph</field>
<field name="view_mode">tree,form</field>
<field name="search_view_id" ref="view_sales_order_uninvoiced_line_filter"/>
<field name="context">{"search_default_uninvoiced":1}</field>
<field name="filter" eval="True"/>
@@ -581,7 +571,7 @@
<field name="type">ir.actions.act_window</field>
<field name="res_model">sale.order.line</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,graph</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('invoiced','&lt;&gt;', 1),('state','=','done')]</field>
<field name="filter" eval="True"/>
</record>
addons/share/static/src/js/share.js
+3 -4
View File
@@ -15,7 +15,7 @@ openerp.share = function(session) {
self.rpc('/web/session/eval_domain_and_context', {
domains: [domain],
contexts: [view.dataset.context]
}, function (result) {
}).then(function (result) {
Share.create({
name: action.name,
record_name: rec_name,
@@ -24,9 +24,8 @@ openerp.share = function(session) {
user_type: user_type || 'embedded',
view_type: view.fields_view.type,
invite: invite || false,
}, function(result) {
var share_id = result.result;
var step1 = Share.call('go_step_1', [[share_id],], function(result) {
}).then(function(share_id) {
var step1 = Share.call('go_step_1', [[share_id]]).then(function(result) {
var action = result;
self.do_action(action);
});
addons/stock/i18n/pt_BR.po
+737 -402
View File
File diff suppressed because it is too large Load Diff
addons/survey/i18n/pt_BR.po
+17 -10
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: 2012-02-08 00:37+0000\n"
"PO-Revision-Date: 2012-05-10 18:26+0000\n"
"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
"PO-Revision-Date: 2012-10-17 00:09+0000\n"
"Last-Translator: ERIVELTON PIRES GUEDES <Unknown>\n"
"Language-Team: Brazilian Portuguese <pt_BR@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: 2012-08-28 06:31+0000\n"
"X-Generator: Launchpad (build 15864)\n"
"X-Launchpad-Export-Date: 2012-10-17 04:36+0000\n"
"X-Generator: Launchpad (build 16152)\n"
#. module: survey
#: view:survey.print:0
@@ -534,6 +534,11 @@ msgid ""
"etc. You can edit survey manually or click on the 'Edit Survey' for a "
"WYSIWYG interface."
msgstr ""
"Você pode criar pesquisas para vários propósitos: entrevistas de "
"recrutamento, avaliação periódica de empregados, campanhas de marketing, "
"etc. Uma pesquisa é feita de páginas contendo questões de vários tipos: "
"texto, múltipla escolha, etc. Você pode editar a pesquisa manualmente ou "
"clicar em \"Editar pesquisa\" para uma interface do tipo WYSIWYG."
#. module: survey
#: view:survey:0
@@ -745,7 +750,7 @@ msgstr ""
#: view:survey.page:0
#: view:survey.question:0
msgid "When the question is not answered, display this error message:"
msgstr ""
msgstr "Quando a questão não for respondida mostrar esta mensagem de erro:"
#. module: survey
#: view:survey:0
@@ -762,7 +767,7 @@ msgstr ""
#. module: survey
#: model:ir.ui.menu,name:survey.menu_browse_survey_response
msgid "Browse Answers"
msgstr ""
msgstr "Navegar pelas respostas"
#. module: survey
#: field:survey.response.answer,comment_field:0
@@ -796,7 +801,7 @@ msgstr "Responder Pesquisa"
#: view:survey.page:0
#: view:survey.question:0
msgid "Comment Field"
msgstr ""
msgstr "Campo de comentário"
#. module: survey
#: selection:survey.response,response_type:0
@@ -823,7 +828,7 @@ msgstr "Página"
#. module: survey
#: field:survey.question,comment_column:0
msgid "Add comment column in matrix"
msgstr ""
msgstr "Acrescentar coluna de comentário na matriz"
#. module: survey
#: field:survey.answer,response:0
@@ -842,6 +847,8 @@ msgstr ""
#: view:survey.question:0
msgid "When the comment is an invalid format, display this error message"
msgstr ""
"Quando o comentário estiver num formato inválido mostrar esta mensagem de "
"erro"
#. module: survey
#: code:addons/survey/wizard/survey_selection.py:83
@@ -860,7 +867,7 @@ msgstr "Questões"
#. module: survey
#: help:survey,response_user:0
msgid "Set to one if you require only one Answer per user"
msgstr ""
msgstr "Informe 1 caso somente uma resposta por usuário sejá requerida"
#. module: survey
#: field:survey,users:0
@@ -1645,7 +1652,7 @@ msgstr "Ponto Flutuante"
#. module: survey
#: view:survey.response.line:0
msgid "Single Textboxes"
msgstr ""
msgstr "Caixas de texto simples"
#. module: survey
#: code:addons/survey/wizard/survey_send_invitation.py:74
addons/web_shortcuts/static/src/js/web_shortcuts.js
+2 -2
View File
@@ -46,7 +46,7 @@ instance.web_shortcuts.Shortcuts = instance.web.Widget.extend({
load: function() {
var self = this;
this.$el.find('.oe_systray_shortcuts_items').empty();
return this.rpc('/web/shortcuts/list', {}, function(shortcuts) {
return this.rpc('/web/shortcuts/list', {}).then(function(shortcuts) {
_.each(shortcuts, function(sc) {
self.trigger('display', sc);
});
@@ -80,7 +80,7 @@ instance.web_shortcuts.Shortcuts = instance.web.Widget.extend({
id = $link.data('id');
self.session.active_id = id;
// TODO: Use do_action({menu_id: id, type: 'ir.actions.menu'})
self.rpc('/web/menu/action', {'menu_id': id}, function(ir_menu_data) {
self.rpc('/web/menu/action', {'menu_id': id}).then(function(ir_menu_data) {
if (ir_menu_data.action.length){
instance.webclient.user_menu.on_action({action_id: ir_menu_data.action[0][2].id});
}