[MERGE]: Merge with lp:openobject-addons
bzr revid: mma@tinyerp.com-20121016055745-eb1l2lfwgv2b0hbc bzr revid: mma@tinyerp.com-20121018054042-xbc4y194y5nmsklc bzr revid: mma@tinyerp.com-20121019052843-972s2b2y08cbs9vo
This commit is contained in:
Mayur Maheshwari (OpenERP)
commit
47419788ca
|
|
@ -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:
|
||||
|
|
|
|||
|
|
@ -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)."),
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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 = {
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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">
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
-->
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -163,7 +163,7 @@
|
|||
<para style="terp_tblheader_Details_Right">[[ formatLang(sum_all(get_objects(data['form']['empty_acc']),data['form']['date1'],data['form']['date2'],'credit')) ]] </para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="terp_tblheader_Details_Right">[[ formatLang(sum_balance(get_objects(data['form']['empty_acc']),data['form']['date1'],data['form']['date2'])) ]] [[ company.currency_id.symbol]]</para>
|
||||
<para style="terp_tblheader_Details_Right">[[ formatLang(sum_balance(get_objects(data['form']['empty_acc']),data['form']['date1'],data['form']['date2']), currency_obj = company.currency_id)]]</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="terp_tblheader_Details_Right">[[ formatLang(sum_all(get_objects(data['form']['empty_acc']),data['form']['date1'],data['form']['date2'],'quantity')) ]]</para>
|
||||
|
|
@ -187,7 +187,7 @@
|
|||
<para style="terp_default_Right_9_Bold">[[ formatLang(move_sum(o['id'],data['form']['date1'],data['form']['date2'],'credit')) ]] </para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="terp_default_Right_9_Bold">[[ formatLang(move_sum_balance(o['id'],data['form']['date1'],data['form']['date2'])) ]] [[ company.currency_id.symbol]]</para>
|
||||
<para style="terp_default_Right_9_Bold">[[ formatLang(move_sum_balance(o['id'],data['form']['date1'],data['form']['date2']), currency_obj = company.currency_id)]]</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="terp_default_Right_9_Bold">[[ formatLang(move_sum(o['id'],data['form']['date1'],data['form']['date2'],'quantity')) ]]</para>
|
||||
|
|
@ -211,7 +211,7 @@
|
|||
<para style="terp_default_Right_9">[[ formatLang(move_g['credit']) ]] </para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="terp_default_Right_9">[[ formatLang(move_g['balance'])]] [[ company.currency_id.symbol ]]</para>
|
||||
<para style="terp_default_Right_9">[[ formatLang(move_g['balance'], currency_obj = company.currency_id) ]]</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="terp_default_Right_9">[[ formatLang(move_g['quantity']) ]]</para>
|
||||
|
|
|
|||
|
|
@ -224,7 +224,7 @@
|
|||
<para style="terp_Default_Bold_Right_9_U">[[ formatLang (sum_credit(objects,data['form']['date1'],data['form']['date2'])) ]] </para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="terp_Default_Bold_Right_9_U">[[ formatLang (sum_balance(objects,data['form']['date1'],data['form']['date2'])) ]] [[ company.currency_id.symbol ]]</para>
|
||||
<para style="terp_Default_Bold_Right_9_U">[[ formatLang (sum_balance(objects,data['form']['date1'],data['form']['date2']), currency_obj = company.currency_id) ]]</para>
|
||||
</td>
|
||||
</tr>
|
||||
</blockTable>
|
||||
|
|
@ -245,7 +245,7 @@
|
|||
<para style="terp_Default_Bold_Right_9_U">[[ formatLang (account_sum_credit(account,data['form']['date1'],data['form']['date2'])) ]] </para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="terp_Default_Bold_Right_9_U">[[ formatLang (account_sum_balance(account,data['form']['date1'],data['form']['date2']))]] [[ company.currency_id.symbol ]]</para>
|
||||
<para style="terp_Default_Bold_Right_9_U">[[ formatLang (account_sum_balance(account,data['form']['date1'],data['form']['date2']), currency_obj = company.currency_id) ]]</para>
|
||||
</td>
|
||||
</tr>
|
||||
</blockTable>
|
||||
|
|
@ -266,7 +266,7 @@
|
|||
<para style="terp_Default_Bold_Right_9_U">[[ formatLang( move_g['credit']) ]] </para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="terp_Default_Bold_Right_9_U">[[ formatLang( move_g['balance']) ]] [[ company.currency_id.symbol ]]</para>
|
||||
<para style="terp_Default_Bold_Right_9_U">[[ formatLang( move_g['balance'], currency_obj = company.currency_id) ]]</para>
|
||||
</td>
|
||||
</tr>
|
||||
</blockTable>
|
||||
|
|
@ -290,7 +290,7 @@
|
|||
<para style="terp_default_9_italic_Rignt">[[ formatLang( move_a['credit']) ]] </para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="terp_default_9_italic_Rignt">[[ formatLang( move_a['balance']) ]] [[ company.currency_id.symbol]]</para>
|
||||
<para style="terp_default_9_italic_Rignt">[[ formatLang( move_a['balance'], currency_obj = company.currency_id)]]</para>
|
||||
</td>
|
||||
</tr>
|
||||
</blockTable>
|
||||
|
|
|
|||
|
|
@ -164,7 +164,7 @@
|
|||
<para style="terp_tblheader_Details_Right">[[ formatLang(sum_credit(objects,data['form']['date1'],data['form']['date2']))]]</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="terp_tblheader_Details_Right">[[ formatLang(sum_balance(objects,data['form']['date1'],data['form']['date2']))]] [[ company.currency_id.symbol]]</para>
|
||||
<para style="terp_tblheader_Details_Right">[[ formatLang(sum_balance(objects,data['form']['date1'],data['form']['date2']), currency_obj = company.currency_id)]]</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="terp_tblheader_Details_Right">[[ formatLang(sum_quantity(objects,data['form']['date1'],data['form']['date2'])) ]]</para>
|
||||
|
|
@ -188,7 +188,7 @@
|
|||
<para style="terp_tblheader_Details_Right">[[formatLang(move_g['credit'])]]</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="terp_tblheader_Details_Right">[[ formatLang(move_g['balance'])]] [[ company.currency_id.symbol]]</para>
|
||||
<para style="terp_tblheader_Details_Right">[[ formatLang(move_g['balance'], currency_obj = company.currency_id)]]</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="terp_tblheader_Details_Right">[[formatLang(move_g['quantity']) ]]</para>
|
||||
|
|
@ -212,7 +212,7 @@
|
|||
<para style="terp_default_Right_9">[[ formatLang(move_a['credit']) ]] </para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="terp_default_Right_9">[[ formatLang(move_a['balance']) ]] [[ company.currency_id.symbol]]</para>
|
||||
<para style="terp_default_Right_9">[[ formatLang(move_a['balance'], currency_obj = company.currency_id)]]</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="terp_default_Right_9">[[ formatLang(move_a['quantity']) ]]</para>
|
||||
|
|
|
|||
|
|
@ -63,8 +63,12 @@ class account_analytic_journal_report(osv.osv_memory):
|
|||
if context is None:
|
||||
context = {}
|
||||
res = super(account_analytic_journal_report, self).default_get(cr, uid, fields, context=context)
|
||||
if not context.has_key('active_ids'):
|
||||
journal_ids = self.pool.get('account.analytic.journal').search(cr, uid, [], context=context)
|
||||
else:
|
||||
journal_ids = context.get('active_ids')
|
||||
if 'analytic_account_journal_id' in fields:
|
||||
res.update({'analytic_account_journal_id': context.get('active_ids',[])})
|
||||
res.update({'analytic_account_journal_id': journal_ids})
|
||||
return res
|
||||
|
||||
account_analytic_journal_report()
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -29,34 +29,11 @@ class Overdue(report_sxw.rml_parse):
|
|||
super(Overdue, self).__init__(cr, uid, name, context=context)
|
||||
self.localcontext.update( {
|
||||
'time': time,
|
||||
'adr_get': self._adr_get,
|
||||
'getLines': self._lines_get,
|
||||
'tel_get': self._tel_get,
|
||||
'message': self._message,
|
||||
})
|
||||
self.context = context
|
||||
def _adr_get(self, partner, type):
|
||||
res = []
|
||||
res_partner = pooler.get_pool(self.cr.dbname).get('res.partner')
|
||||
addresses = res_partner.address_get(self.cr, self.uid, [partner.id], [type])
|
||||
adr_id = addresses and addresses[type] or False
|
||||
result = {
|
||||
'name': False,
|
||||
'street': False,
|
||||
'street2': False,
|
||||
'city': False,
|
||||
'zip': False,
|
||||
'state_id':False,
|
||||
'country_id': False,
|
||||
}
|
||||
if adr_id:
|
||||
result = res_partner.read(self.cr, self.uid, [adr_id], context=self.context.copy())
|
||||
result[0]['country_id'] = result[0]['country_id'] and result[0]['country_id'][1] or False
|
||||
result[0]['state_id'] = result[0]['state_id'] and result[0]['state_id'][1] or False
|
||||
return result
|
||||
|
||||
res.append(result)
|
||||
return res
|
||||
|
||||
def _tel_get(self,partner):
|
||||
if not partner:
|
||||
|
|
|
|||
|
|
@ -126,15 +126,10 @@
|
|||
<blockTable colWidths="286.0,224.0" style="Tableau2">
|
||||
<tr>
|
||||
<td>
|
||||
<para style="terp_default_9">[[ repeatIn(adr_get(o, 'invoice'),'addr') ]]</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="terp_default_9">[[ o.title.name or '' ]] [[ o.name ]]</para>
|
||||
<para style="terp_default_9">[[ addr['street'] ]]</para>
|
||||
<para style="terp_default_9">[[ addr['street2'] or removeParentNode('para') ]]</para>
|
||||
<para style="terp_default_9">[[ addr['zip'] ]] [[ addr['city'] ]]</para>
|
||||
<para style="terp_default_9">[[ addr['state_id'] or removeParentNode('para')]]</para>
|
||||
<para style="terp_default_9">[[ addr['country_id'] ]]</para>
|
||||
<para style="terp_default_9">[[ display_address(o.partner_id) ]]</para>
|
||||
<para style="terp_default_9">
|
||||
<font color="white"> </font>
|
||||
</para>
|
||||
|
|
@ -216,7 +211,7 @@
|
|||
<para style="terp_default_Right_9">[[ (line['account_id']['type'] == 'receivable' and formatLang(line['credit']) or 0) or (line['account_id']['type'] == 'payable' and formatLang(line['debit'] * -1) or 0) ]]</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="terp_default_Right_9">[[ time.strftime('%Y-%m-%d') > formatLang((line['date_maturity'])) and formatLang(line['debit'] - line['credit']) ]] [[ company.currency_id.symbol ]]</para>
|
||||
<para style="terp_default_Right_9">[[ time.strftime('%Y-%m-%d') > formatLang((line['date_maturity'])) and formatLang(line['debit'] - line['credit'], currency_obj = company.currency_id) ]]</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="terp_default_Centre_9">[[ line['blocked'] and 'X' or '' ]]</para>
|
||||
|
|
@ -241,7 +236,7 @@
|
|||
<para style="terp_default_Right_9">[[ formatLang((reduce(lambda x, y: x + ((y['account_id']['type'] == 'receivable' and y['credit'] or 0) or (y['account_id']['type'] == 'payable' and y['debit'] * -1 or 0)), getLines(o), 0))) ]] </para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="terp_default_Right_9">[[ formatLang((reduce(lambda x, y: x + (y['debit'] - y['credit']), filter(lambda x: x['date_maturity'] < time.strftime('%Y-%m-%d'), getLines(o)), 0))) ]] [[ company.currency_id.symbol ]]</para>
|
||||
<para style="terp_default_Right_9">[[ formatLang((reduce(lambda x, y: x + (y['debit'] - y['credit']), filter(lambda x: x['date_maturity'] < time.strftime('%Y-%m-%d'), getLines(o)), 0)), currency_obj=company.currency_id) ]]</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="terp_default_9">
|
||||
|
|
@ -261,7 +256,7 @@
|
|||
<para style="terp_default_Bold_9">Balance :</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="terp_tblheader_Details_Right">[[ formatLang((reduce(lambda x, y: x +(y['debit'] - y['credit']), getLines(o), 0))) ]] [[ company.currency_id.symbol ]]</para>
|
||||
<para style="terp_tblheader_Details_Right">[[ formatLang((reduce(lambda x, y: x +(y['debit'] - y['credit']), getLines(o), 0)), currency_obj = company.currency_id) ]]</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="terp_default_8">
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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,13 +101,15 @@ 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 || {};
|
||||
result.flags.new_window = true;
|
||||
return self.do_action(result, function () {
|
||||
self.do_search(self.last_domain, self.last_context, self.last_group_by);
|
||||
return self.do_action(result, {
|
||||
on_close: function () {
|
||||
self.do_search(self.last_domain, self.last_context, self.last_group_by);
|
||||
}
|
||||
});
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -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:35+0000\n"
|
||||
"PO-Revision-Date: 2012-02-08 08:45+0000\n"
|
||||
"PO-Revision-Date: 2012-10-12 23:19+0000\n"
|
||||
"Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
|
||||
"Language-Team: \n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
|
||||
"X-Generator: Launchpad (build 15864)\n"
|
||||
"X-Launchpad-Export-Date: 2012-10-14 04:39+0000\n"
|
||||
"X-Generator: Launchpad (build 16137)\n"
|
||||
|
||||
#. module: account_analytic_plans
|
||||
#: view:analytic.plan.create.model:0
|
||||
|
|
@ -471,7 +471,7 @@ msgstr "Analyt. Verrechnungsvorlage"
|
|||
#. module: account_analytic_plans
|
||||
#: field:account.analytic.plan.instance,code:0
|
||||
msgid "Distribution Code"
|
||||
msgstr "Kurzbezeichnung"
|
||||
msgstr "Verteilungs-Schlüssel"
|
||||
|
||||
#. module: account_analytic_plans
|
||||
#: report:account.analytic.account.crossovered.analytic:0
|
||||
|
|
@ -526,6 +526,8 @@ msgid ""
|
|||
"analytic accounts for each plan set. Then, you must attach a plan set to "
|
||||
"your account journals."
|
||||
msgstr ""
|
||||
"Für jede Kostenrechnung muss ein Stammkonto definiert werden. Dann muss ein "
|
||||
"Plan definiert werden"
|
||||
|
||||
#. module: account_analytic_plans
|
||||
#: constraint:account.move.line:0
|
||||
|
|
|
|||
|
|
@ -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-04-18 07:47+0000\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"PO-Revision-Date: 2012-10-17 08:25+0000\n"
|
||||
"Last-Translator: filsys <office@filsystem.ro>\n"
|
||||
"Language-Team: Romanian <ro@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-18 04:41+0000\n"
|
||||
"X-Generator: Launchpad (build 16160)\n"
|
||||
|
||||
#. module: account_asset
|
||||
#: view:account.asset.asset:0
|
||||
|
|
@ -440,12 +440,12 @@ msgstr "Metoda Timp"
|
|||
#. module: account_asset
|
||||
#: view:account.asset.category:0
|
||||
msgid "Analytic Information"
|
||||
msgstr ""
|
||||
msgstr "Informatii analitice"
|
||||
|
||||
#. module: account_asset
|
||||
#: view:asset.modify:0
|
||||
msgid "Asset Durations to Modify"
|
||||
msgstr ""
|
||||
msgstr "Durata de modificat"
|
||||
|
||||
#. module: account_asset
|
||||
#: constraint:account.move.line:0
|
||||
|
|
@ -622,7 +622,7 @@ msgstr "Prorata Temporis"
|
|||
#. module: account_asset
|
||||
#: view:account.asset.category:0
|
||||
msgid "Accounting Information"
|
||||
msgstr ""
|
||||
msgstr "Informații contabile"
|
||||
|
||||
#. module: account_asset
|
||||
#: model:ir.model,name:account_asset.model_account_invoice
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -1,13 +1,8 @@
|
|||
<?xml version="1.0" ?>
|
||||
<openerp>
|
||||
<data>
|
||||
<!-- budget form and tree view from account module *********************************** -->
|
||||
<record id="action_account_budget_post_tree" model="ir.actions.act_window">
|
||||
<field name="name">Budgets</field>
|
||||
<field name="res_model">account.budget.post</field>
|
||||
<field name="view_type">tree</field>
|
||||
</record>
|
||||
<menuitem action="action_account_budget_post_tree" id="menu_action_account_budget_post_tree" parent="account.menu_finance_generic_reporting" sequence="6"/>
|
||||
|
||||
<menuitem name="Budgets" id="menu_action_account_budget_post_tree" parent="account.menu_finance_generic_reporting" sequence="6"/>
|
||||
|
||||
<!--
|
||||
Budgets
|
||||
|
|
|
|||
|
|
@ -32,7 +32,6 @@ class report_print_check(report_sxw.rml_parse):
|
|||
'time': time,
|
||||
'get_lines': self.get_lines,
|
||||
'fill_stars' : self.fill_stars,
|
||||
'get_zip_line': self.get_zip_line,
|
||||
})
|
||||
def fill_stars(self, amount):
|
||||
amount = amount.replace('Dollars','')
|
||||
|
|
@ -41,25 +40,6 @@ class report_print_check(report_sxw.rml_parse):
|
|||
return ' '.join([amount,'*'*stars])
|
||||
|
||||
else: return amount
|
||||
|
||||
def get_zip_line(self, address):
|
||||
'''
|
||||
Get the address line
|
||||
'''
|
||||
ret = ''
|
||||
if address:
|
||||
if address.city:
|
||||
ret += address.city
|
||||
if address.state_id:
|
||||
if address.state_id.name:
|
||||
if ret:
|
||||
ret += ', '
|
||||
ret += address.state_id.name
|
||||
if address.zip:
|
||||
if ret:
|
||||
ret += ' '
|
||||
ret += address.zip
|
||||
return ret
|
||||
|
||||
def get_lines(self, voucher_lines):
|
||||
result = []
|
||||
|
|
|
|||
|
|
@ -281,10 +281,7 @@
|
|||
</td>
|
||||
<td>
|
||||
<para style="P15">[[ voucher.partner_id.name ]]</para>
|
||||
<para style="P15">[[ voucher.partner_id.street or removeParentNode('para') ]]</para>
|
||||
<para style="P15">[[ voucher.partner_id.street2 or removeParentNode('para') ]]</para>
|
||||
<para style="P15">[[ get_zip_line(voucher.partner_id) ]] </para>
|
||||
<para style="P15">[[ voucher.partner_id.country_id.name]]</para>
|
||||
<para style="P15">[[ display_address(voucher.partner_id) or removeParentNode('para') ]]</para>
|
||||
</td>
|
||||
</tr>
|
||||
</blockTable>
|
||||
|
|
|
|||
|
|
@ -237,10 +237,7 @@
|
|||
</td>
|
||||
<td>
|
||||
<para style="P15">[[ voucher.partner_id.name ]]</para>
|
||||
<para style="P15">[[ voucher.partner_id.street or removeParentNode('para') ]]</para>
|
||||
<para style="P15">[[ voucher.partner_id.street2 or removeParentNode('para') ]]</para>
|
||||
<para style="P15">[[ get_zip_line(voucher.partner_id) ]] </para>
|
||||
<para style="P15">[[ voucher.partner_id.country_id.name]]</para>
|
||||
<para style="P15">[[ display_address(voucher.partner_id) or removeParentNode('para') ]]</para>
|
||||
</td>
|
||||
</tr>
|
||||
</blockTable>
|
||||
|
|
|
|||
|
|
@ -153,9 +153,7 @@
|
|||
</td>
|
||||
<td>
|
||||
<para style="P9">[[ voucher.partner_id.name ]] </para>
|
||||
<para style="P15">[[ voucher.partner_id.street2 or removeParentNode('para') ]]</para>
|
||||
<para style="P15">[[ get_zip_line(voucher.partner_id) ]] </para>
|
||||
<para style="P15">[[ voucher.partner_id.country_id.name]]</para>
|
||||
<para style="P15">[[ display_address(voucher.partner_id) or removeParentNode('para') ]]</para>
|
||||
</td>
|
||||
<td>
|
||||
<para/>
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -30,7 +30,6 @@ class report_rappel(report_sxw.rml_parse):
|
|||
self.localcontext.update({
|
||||
'time': time,
|
||||
'ids_to_objects': self._ids_to_objects,
|
||||
'adr_get': self._adr_get,
|
||||
'getLines': self._lines_get,
|
||||
'get_text': self._get_text
|
||||
})
|
||||
|
|
@ -43,11 +42,6 @@ class report_rappel(report_sxw.rml_parse):
|
|||
all_lines.append(line)
|
||||
return all_lines
|
||||
|
||||
def _adr_get(self, stat_line, type):
|
||||
res_partner = pooler.get_pool(self.cr.dbname).get('res.partner')
|
||||
adr = res_partner.address_get(self.cr, self.uid, [stat_line.partner_id.id], [type])[type]
|
||||
return adr and res_partner.read(self.cr, self.uid, [adr]) or [{}]
|
||||
|
||||
def _lines_get(self, stat_by_partner_line):
|
||||
pool = pooler.get_pool(self.cr.dbname)
|
||||
moveline_obj = pool.get('account.move.line')
|
||||
|
|
|
|||
|
|
@ -129,15 +129,10 @@
|
|||
<blockTable colWidths="298.0,234.0" style="Tableau2">
|
||||
<tr>
|
||||
<td>
|
||||
<para style="terp_default_9">[[ repeatIn(adr_get(o,'invoice'),'a' )]]</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="terp_default_9">[[ o.partner_id.name or '' ]]</para>
|
||||
<para style="terp_default_9">[[ a['street'] or '']]</para>
|
||||
<para style="terp_default_9">[[ a['street2'] or removeParentNode('para') ]]</para>
|
||||
<para style="terp_default_9">[[ a['zip'] or '' ]] [[ a['city'] or '' ]]</para>
|
||||
<para style="terp_default_9">[[( a['state_id'] and a['state_id'][1]) or removeParentNode('para') ]]</para>
|
||||
<para style="terp_default_9">[[( a['country_id'] and a['country_id'][1]) or '']]</para>
|
||||
<para style="terp_default_9">[[ display_address(o.partner_id) or '']]</para>
|
||||
<para style="terp_default_9">
|
||||
<font color="white"> </font>
|
||||
</para>
|
||||
|
|
|
|||
|
|
@ -256,10 +256,10 @@
|
|||
<para style="terp_default_Centre_9">[[line.date=='False' and '-' or formatLang(line.date,date=True) ]]</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="terp_default_Right_9">[[formatLang(line.amount) or '-' ]] [[get_company_currency_symbol()]] </para>
|
||||
<para style="terp_default_Right_9">[[formatLang(line.amount, currency_obj= user.company_id.currency_id) or '-' ]] </para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="terp_default_Right_9">[[ formatLang(line.amount_currency) ]] [[ line.currency.symbol]] </para>
|
||||
<para style="terp_default_Right_9">[[ formatLang(line.amount_currency, currency_obj= line.currency)]]</para>
|
||||
</td>
|
||||
</tr>
|
||||
</blockTable>
|
||||
|
|
@ -275,10 +275,10 @@
|
|||
<para style="terp_default_Bold_9">Total:</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="terp_default_Right_9">[[ formatLang(get_amount_total(o)) or '' ]] [[get_company_currency_symbol()]] </para>
|
||||
<para style="terp_default_Right_9">[[ formatLang(get_amount_total(o), currency_obj= user.company_id.currency_id) or '' ]] </para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="terp_default_Right_9">[[ formatLang(get_amount_total_in_currency(o)) or '' ]] [[get_company_currency_symbol()]] </para>
|
||||
<para style="terp_default_Right_9">[[ formatLang(get_amount_total_in_currency(o), currency_obj= user.company_id.currency_id) or '' ]] </para>
|
||||
</td>
|
||||
</tr>
|
||||
</blockTable>
|
||||
|
|
|
|||
|
|
@ -32,7 +32,6 @@ class payment_order(report_sxw.rml_parse):
|
|||
'time': time,
|
||||
'get_invoice_name': self._get_invoice_name,
|
||||
'get_company_currency': self._get_company_currency,
|
||||
'get_company_currency_symbol': self._get_company_currency_symbol,
|
||||
'get_amount_total_in_currency': self._get_amount_total_in_currency,
|
||||
'get_amount_total': self._get_amount_total,
|
||||
'get_account_name': self._get_account_name,
|
||||
|
|
@ -72,12 +71,8 @@ class payment_order(report_sxw.rml_parse):
|
|||
user = pool.get('res.users').browse(self.cr, self.uid, self.uid)
|
||||
return user.company_id and user.company_id.currency_id and user.company_id.currency_id.symbol or False
|
||||
|
||||
def _get_company_currency_symbol(self):
|
||||
pool = pooler.get_pool(self.cr.dbname)
|
||||
user = pool.get('res.users').browse(self.cr, self.uid, self.uid)
|
||||
return user.company_id and user.company_id.currency_id and user.company_id.currency_id.symbol or False
|
||||
|
||||
def _get_account_name(self, bank_id):
|
||||
def _get_account_name(self,bank_id):
|
||||
if bank_id:
|
||||
pool = pooler.get_pool(self.cr.dbname)
|
||||
value_name = pool.get('res.partner.bank').name_get(self.cr, self.uid, [bank_id])
|
||||
|
|
|
|||
|
|
@ -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 = {}
|
||||
|
|
|
|||
|
|
@ -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', '<>', 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>
|
||||
|
||||
|
|
|
|||
|
|
@ -219,7 +219,7 @@
|
|||
<para style="terp_default_9_30cm">[[ p['pname'] ]]</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="terp_default_Right_9">[[ p['amount'] ]] [[ voucher.currency_id.symbol ]]</para>
|
||||
<para style="terp_default_Right_9">[[ formatLang(p['amount'], currency_obj=voucher.currency_id) ]]</para>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
|
|
@ -323,7 +323,7 @@
|
|||
</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="terp_default_Right_9_Bold">[[ voucher.amount ]] [[ voucher.currency_id.symbol ]]</para>
|
||||
<para style="terp_default_Right_9_Bold">[[ formatLang(voucher.amount, currency_obj=voucher.currency_id) ]]</para>
|
||||
</td>
|
||||
</tr>
|
||||
</blockTable>
|
||||
|
|
|
|||
|
|
@ -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!"
|
||||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
@ -1,3 +1,54 @@
|
|||
.oe_import{
|
||||
display: inline-block;
|
||||
width: 600px;
|
||||
padding: 16px;
|
||||
}
|
||||
.oe_import > p {
|
||||
margin-left: 8px;
|
||||
margin-right: 8px;
|
||||
text-align: justify
|
||||
}
|
||||
|
||||
/* ----------- IMPORT BOX ----------- */
|
||||
|
||||
.oe_import .oe_import_box{
|
||||
margin: 16px;
|
||||
padding: 16px;
|
||||
background: #F0EEEE;
|
||||
border-radius: 3px;
|
||||
border: solid 1px #dddddd;
|
||||
}
|
||||
.oe_import .oe_import_toggle{
|
||||
margin-top: 8px;
|
||||
}
|
||||
.oe_import .oe_import_options{
|
||||
margin-top: 8px;
|
||||
}
|
||||
.oe_import .oe_import_options input{
|
||||
width: 150px;
|
||||
}
|
||||
|
||||
.oe_import a.oe_import_toggle {
|
||||
display: block;
|
||||
}
|
||||
.oe_import a.oe_import_toggle:before {
|
||||
content: '+'
|
||||
}
|
||||
|
||||
.oe_import .oe_import_options p {
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
}
|
||||
.oe_import .oe_import_options label {
|
||||
display: inline-block;
|
||||
width: 100px;
|
||||
height:32px;
|
||||
line-height:32px;
|
||||
text-align: right;
|
||||
}
|
||||
|
||||
/* ----------- INITIAL SETUP ------------ */
|
||||
|
||||
.openerp .oe_list_buttons .oe_alternative {
|
||||
visibility: visible;
|
||||
}
|
||||
|
|
@ -25,38 +76,85 @@
|
|||
display: block;
|
||||
}
|
||||
|
||||
.oe_import .oe_import_error_report ul .oe_import_report_error {
|
||||
background-color: #FFD9DB;
|
||||
}
|
||||
.oe_import .oe_import_error_report ul .oe_import_report_warning {
|
||||
background-color: #FEFFD9;
|
||||
}
|
||||
.oe_import .oe_import_error_report ul .oe_import_report_info {
|
||||
background-color: #d3ffd3;
|
||||
}
|
||||
|
||||
.oe_import .oe_import_noheaders {
|
||||
color: #888;
|
||||
}
|
||||
|
||||
.oe_import a.oe_import_toggle {
|
||||
display: block;
|
||||
}
|
||||
.oe_import a.oe_import_toggle:before {
|
||||
content: '> '
|
||||
}
|
||||
|
||||
.oe_import .oe_import_options p {
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
}
|
||||
.oe_import .oe_import_options label {
|
||||
display: inline-block;
|
||||
width: 8em;
|
||||
text-align: right;
|
||||
}
|
||||
|
||||
.oe_import_selector ul,
|
||||
.oe_import_selector li {
|
||||
margin: 0; padding: 0;
|
||||
}
|
||||
|
||||
/* ------------- ERRORS AND WARNINGS REPORT ------------ */
|
||||
|
||||
.oe_import .oe_import_error_report ul{
|
||||
padding-left: 16px;
|
||||
}
|
||||
.oe_import .oe_import_report {
|
||||
margin-right: 16px;
|
||||
padding: 4px;
|
||||
list-style: none;
|
||||
border-bottom: solid 1px rgba(0,0,0,0.05);
|
||||
}
|
||||
.oe_import .oe_import_report:first-child{
|
||||
border-top-left-radius: 3px;
|
||||
border-top-right-radius: 3px;
|
||||
}
|
||||
.oe_import .oe_import_report:last-child{
|
||||
border-bottom-left-radius:3px;
|
||||
border-bottom-right-radius:3px;
|
||||
border-bottom: none;
|
||||
}
|
||||
.oe_import .oe_import_report_error {
|
||||
background-color: #FFD9DB;
|
||||
color: #AF5F5E;
|
||||
}
|
||||
.oe_import .oe_import_report_error:last-of-type{
|
||||
border-bottom:none;
|
||||
}
|
||||
.oe_import .oe_import_report_warning {
|
||||
background-color: #FEFFD9;
|
||||
color: #918743;
|
||||
}
|
||||
.oe_import .oe_import_report_warning:last-of-type{
|
||||
border-bottom:none;
|
||||
}
|
||||
.oe_import .oe_import_report_info {
|
||||
background-color: #d3ffd3;
|
||||
}
|
||||
.oe_import .oe_import_report_info:last-of-type{
|
||||
border-bottom:none;
|
||||
}
|
||||
|
||||
/* ------------- THE CSV TABLE ------------ */
|
||||
|
||||
.oe_import .oe_import_grid{
|
||||
margin: 16px;
|
||||
border-radius:3px;
|
||||
border: solid 1px #909090;
|
||||
}
|
||||
.oe_import .oe_import_grid tr{
|
||||
height:16px;
|
||||
}
|
||||
.oe_import .oe_import_grid tr.oe_import_grid-header:first-child{
|
||||
height: 24px;
|
||||
background: #909090;
|
||||
color: white;
|
||||
}
|
||||
.oe_import .oe_import_grid tr:nth-child(odd){
|
||||
background: rgba(0,0,0,0.05);
|
||||
}
|
||||
.oe_import .oe_import_grid td{
|
||||
padding: 2px;
|
||||
padding-left: 4px;
|
||||
}
|
||||
.oe_import .oe_import_grid tr.oe_import_grid-header td:not(:last-child){
|
||||
border-right: 1px solid #707070;
|
||||
}
|
||||
.oe_import .oe_import_grid td:not(:last-child){
|
||||
border-right: 1px solid #D0D0D0;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -53,8 +53,10 @@ openerp.base_import = function (instance) {
|
|||
params: {
|
||||
model: self.dataset.model
|
||||
}
|
||||
}, void 0, void 0, function () {
|
||||
self.reload();
|
||||
}, {
|
||||
on_reverse_breadcrumb: function () {
|
||||
self.reload();
|
||||
},
|
||||
});
|
||||
return false;
|
||||
});
|
||||
|
|
@ -416,7 +418,7 @@ openerp.base_import = function (instance) {
|
|||
'</div>'
|
||||
].join('')
|
||||
},
|
||||
})).get(0).scrollIntoView();
|
||||
}));
|
||||
},
|
||||
});
|
||||
// FSM-ize DataImport
|
||||
|
|
|
|||
|
|
@ -21,24 +21,26 @@
|
|||
class="oe_import_csv" target="_blank">.CSV</a>
|
||||
file to import. If you need a sample importable file, you
|
||||
can use the export tool to generate one.</p>
|
||||
<label t-attf-for="file_#{_id}" autofocus="autofocus">CSV File:</label>
|
||||
<input type="file" id-attf-id="file_#{_id}"
|
||||
name="file" class="oe_import_file"/>
|
||||
<button type="button" class="oe_import_file_reload">
|
||||
<img src="/web/static/src/img/icons/gtk-refresh.png"/>
|
||||
</button>
|
||||
<div class="oe_import_with_file">
|
||||
<a href="#" class="oe_import_toggle">
|
||||
File Format Options…</a>
|
||||
<div class="oe_import_toggled oe_import_options">
|
||||
<p t-foreach="widget.opts" t-as="option">
|
||||
<!-- no @name, avoid submission when file_update called -->
|
||||
<label t-attf-for="#{option.name}_#{_id}">
|
||||
<t t-esc="option.label"/></label>
|
||||
<input t-attf-id="#{option.name}_#{_id}"
|
||||
t-attf-class="oe_import_#{option.name}"
|
||||
t-att-value="option.value"/>
|
||||
</p>
|
||||
<div class="oe_import_box">
|
||||
<label t-attf-for="file_#{_id}" autofocus="autofocus">CSV File:</label>
|
||||
<input type="file" id-attf-id="file_#{_id}"
|
||||
name="file" class="oe_import_file"/>
|
||||
<button type="button" class="oe_import_file_reload">
|
||||
<img src="/web/static/src/img/icons/gtk-refresh.png"/>
|
||||
</button>
|
||||
<div class="oe_import_with_file">
|
||||
<a href="#" class="oe_import_toggle">
|
||||
File Format Options…</a>
|
||||
<div class="oe_import_toggled oe_import_options">
|
||||
<p t-foreach="widget.opts" t-as="option">
|
||||
<!-- no @name, avoid submission when file_update called -->
|
||||
<label t-attf-for="#{option.name}_#{_id}">
|
||||
<t t-esc="option.label"/></label>
|
||||
<input t-attf-id="#{option.name}_#{_id}"
|
||||
t-attf-class="oe_import_#{option.name}"
|
||||
t-att-value="option.value"/>
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
@ -54,7 +56,7 @@
|
|||
simpler especially when the file has many columns.</p>
|
||||
|
||||
<div class="oe_import_error_report"></div>
|
||||
<table class="oe_import_grid" width="100%"/>
|
||||
<table class="oe_import_grid" />
|
||||
|
||||
<h2>Frequently Asked Questions</h2>
|
||||
<dl>
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
|
|
|||
|
|
@ -777,7 +777,6 @@ class crm_lead(base_stage, format_address, osv.osv):
|
|||
'default_user_id': uid,
|
||||
'default_section_id': opportunity.section_id and opportunity.section_id.id or False,
|
||||
'default_email_from': opportunity.email_from,
|
||||
'default_state': 'open',
|
||||
'default_name': opportunity.name,
|
||||
}
|
||||
return res
|
||||
|
|
|
|||
|
|
@ -105,7 +105,23 @@
|
|||
<field name="allow_unlink"/>
|
||||
</group>
|
||||
<separator string="Team Members"/>
|
||||
<field name="member_ids"/>
|
||||
<field name="member_ids" widget="many2many_kanban">
|
||||
<kanban quick_create="false" create="true">
|
||||
<field name="name"/>
|
||||
<templates>
|
||||
<t t-name="kanban-box">
|
||||
<div style="position: relative">
|
||||
<a t-if="! read_only_mode" type="delete" style="position: absolute; right: 0; padding: 4px; diplay: inline-block">X</a>
|
||||
<div class="oe_module_vignette">
|
||||
<div class="oe_module_desc">
|
||||
<field name="name"/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</t>
|
||||
</templates>
|
||||
</kanban>
|
||||
</field>
|
||||
</page>
|
||||
<page string="Stages">
|
||||
<separator string="Select Stages for this Sales Team"/>
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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-18 04:41+0000\n"
|
||||
"X-Generator: Launchpad (build 16160)\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
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ openerp.edi.EdiView = openerp.web.Widget.extend({
|
|||
this._super();
|
||||
var self = this;
|
||||
var param = {"db": self.db, "token": self.token};
|
||||
return self.rpc('/edi/get_edi_document', param, this.on_document_loaded, this.on_document_failed);
|
||||
return self.rpc('/edi/get_edi_document', param).then(this.on_document_loaded, this.on_document_failed);
|
||||
},
|
||||
on_document_loaded: function(docs){
|
||||
this.doc = docs[0];
|
||||
|
|
@ -149,11 +149,11 @@ openerp.edi.EdiImport = openerp.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);
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -175,7 +175,7 @@ class email_template(osv.osv):
|
|||
'res_model': 'mail.compose.message',
|
||||
'src_model': src_obj,
|
||||
'view_type': 'form',
|
||||
'context': "{'default_composition_mode': 'mass_mail', 'default_template_id' : %d}" % (template.id),
|
||||
'context': "{'default_composition_mode': 'mass_mail', 'default_template_id' : %d, 'default_use_template': True}" % (template.id),
|
||||
'view_mode':'form,tree',
|
||||
'view_id': res_id,
|
||||
'target': 'new',
|
||||
|
|
|
|||
|
|
@ -24,7 +24,8 @@ import tools
|
|||
from osv import osv
|
||||
from osv import fields
|
||||
|
||||
class mail_compose_message(osv.osv_memory):
|
||||
|
||||
class mail_compose_message(osv.TransientModel):
|
||||
_inherit = 'mail.compose.message'
|
||||
|
||||
def _get_templates(self, cr, uid, context=None):
|
||||
|
|
|
|||
|
|
@ -8,38 +8,15 @@
|
|||
<field name="inherit_id" ref="mail.email_compose_message_wizard_form"/>
|
||||
<field name="arch" type="xml">
|
||||
<data>
|
||||
<xpath expr="//form/footer/button" position="before">
|
||||
<field name="use_template" invisible="1"/>
|
||||
<button icon="gtk-paste" type="object" name="toggle_template"
|
||||
string="" help="Use a message template" invisible="1"/>
|
||||
<button icon="gtk-save" type="object" name="save_as_template"
|
||||
string="" help="Save as a new template" invisible="1"/>
|
||||
</xpath>
|
||||
<xpath expr="//form/notebook" position="after">
|
||||
<group attrs="{'invisible':[('use_template','=',False)]}" colspan="4" col="4">
|
||||
<field name="use_template" invisible="1"/>
|
||||
<field name="template_id" colspan="3" invisible="1"
|
||||
<group attrs="{'invisible':[('use_template','=',False)]}">
|
||||
<field name="use_template" invisible="1"
|
||||
on_change="onchange_use_template(use_template, template_id, composition_mode, model, res_id, context)"/>
|
||||
<field name="template_id"
|
||||
on_change="onchange_template_id(use_template, template_id, composition_mode, model, res_id, context)"/>
|
||||
</group>
|
||||
</xpath>
|
||||
</data>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record model="ir.ui.view" id="email_compose_message_wizard_inherit_form_chatter">
|
||||
<field name="name">mail.compose.message.form</field>
|
||||
<field name="model">mail.compose.message</field>
|
||||
<field name="inherit_id" ref="mail.email_compose_message_wizard_form_chatter"/>
|
||||
<field name="arch" type="xml">
|
||||
<data>
|
||||
<xpath expr="//field[@name='partner_ids']" position="after">
|
||||
<field name="use_template" colspan="2" nolabel="1" invisible="1"
|
||||
on_change="onchange_use_template(use_template, template_id, composition_mode, model, res_id, context)"/>
|
||||
<field name="template_id" colspan="2" nolabel="1"
|
||||
attrs="{'invisible':[('use_template','=',False)]}"
|
||||
on_change="onchange_template_id(use_template, template_id, composition_mode, model, res_id, context)"/>
|
||||
</xpath>
|
||||
<xpath expr="//button[@name='dummy']" position="before">
|
||||
<xpath expr="//form/footer/button" position="after">
|
||||
<button icon="/email_template/static/src/img/email_template.png"
|
||||
type="object" name="toggle_template" string=""
|
||||
help="Use a message template"
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -116,30 +116,28 @@
|
|||
<label for="name" class="oe_edit_only"/>
|
||||
<h1><field name="name"/></h1>
|
||||
</div>
|
||||
<div>
|
||||
<group>
|
||||
<group>
|
||||
<group>
|
||||
<label for="address_id" string="Location"/>
|
||||
<div>
|
||||
<field name="address_id" on_change="on_change_address_id(address_id)" />
|
||||
<field name="street" placeholder="Street..."/>
|
||||
<field name="street2"/>
|
||||
<div class="address_format">
|
||||
<field name="city" placeholder="City" style="width: 40%%"/>
|
||||
<field name="state_id" class="oe_no_button" placeholder="State" style="width: 37%%" options='{"no_open": True}'/>
|
||||
<field name="zip" placeholder="ZIP" style="width: 20%%"/>
|
||||
</div>
|
||||
<field name="country_id" placeholder="Country" class="oe_no_button" options='{"no_open": True}'/>
|
||||
</div>
|
||||
</group>
|
||||
<group>
|
||||
<field name="type" on_change="onchange_event_type(type,context)"/>
|
||||
<field name="date_begin"/>
|
||||
<field name="date_end"/>
|
||||
<field name="company_id" groups="base.group_multi_company"/>
|
||||
</group>
|
||||
<label for="address_id" string="Location"/>
|
||||
<div>
|
||||
<field name="address_id" on_change="on_change_address_id(address_id)" />
|
||||
<field name="street" placeholder="Street..."/>
|
||||
<field name="street2"/>
|
||||
<div class="address_format">
|
||||
<field name="city" placeholder="City" style="width: 40%%"/>
|
||||
<field name="state_id" class="oe_no_button" placeholder="State" style="width: 37%%" options='{"no_open": true}'/>
|
||||
<field name="zip" placeholder="ZIP" style="width: 20%%"/>
|
||||
</div>
|
||||
<field name="country_id" placeholder="Country" class="oe_no_button" options='{"no_open": true}'/>
|
||||
</div>
|
||||
</group>
|
||||
</div>
|
||||
<group>
|
||||
<field name="type" on_change="onchange_event_type(type,context)" />
|
||||
<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>
|
||||
</group>
|
||||
<notebook>
|
||||
<page string="Email Configuration" groups="base.group_no_one">
|
||||
<group>
|
||||
|
|
@ -284,13 +282,13 @@
|
|||
<t t-if="record.register_avail.raw_value != 0">
|
||||
<t t-if="!record.is_subscribed.raw_value">
|
||||
<input t-att-id="record.id.raw_value" type="text" name="subscribe" class="no_of_seats" value="1" onchange="document.getElementById('btn_sub' +this.id).setAttribute('data-context',JSON.stringify({'ticket':this.value}))"/>
|
||||
<button t-att-id="'btn_sub'+record.id.raw_value" type="object" name="subscribe_to_event" class="oe_mail_button_follow">
|
||||
<button t-att-id="'btn_sub'+record.id.raw_value" type="object" name="subscribe_to_event" class="oe_subscribe_button">
|
||||
<span >Subscribe</span>
|
||||
</button>
|
||||
</t>
|
||||
</t>
|
||||
<t t-if="record.is_subscribed.raw_value">
|
||||
<button type="object" name="unsubscribe_to_event" class="oe_mail_button_unfollow">
|
||||
<button type="object" name="unsubscribe_to_event" class="oe_unsubscribe_button ">
|
||||
<span>Subscribed</span>
|
||||
<span class="unsubscribe">Unsubscribe</span>
|
||||
</button>
|
||||
|
|
|
|||
|
|
@ -42,4 +42,10 @@
|
|||
width:256px;
|
||||
border: 1px solid #eeeeee;
|
||||
}
|
||||
.oe_unsubscribe, .oe_unsubscribe_button:hover span {
|
||||
display: none;
|
||||
}
|
||||
.oe_unsubscribe_button:hover .oe_unsubscribe {
|
||||
display: inline;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
});
|
||||
})
|
||||
});
|
||||
}
|
||||
})
|
||||
}
|
||||
});
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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"/>
|
||||
|
|
|
|||
|
|
@ -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-18 04:40+0000\n"
|
||||
"X-Generator: Launchpad (build 16160)\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"
|
||||
|
|
|
|||
|
|
@ -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-18 04:40+0000\n"
|
||||
"X-Generator: Launchpad (build 16160)\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
|
||||
|
|
|
|||
|
|
@ -231,7 +231,7 @@
|
|||
<para style="terp_default_Right_9">[[ formatLang(line.unit_quantity) ]]</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="terp_default_Right_9">[[ formatLang(line.total_amount) ]] [[ o.currency_id.symbol ]] </para>
|
||||
<para style="terp_default_Right_9">[[ formatLang(line.total_amount, currency_obj=o.currency_id) ]] </para>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
|
|
@ -277,7 +277,7 @@
|
|||
<para style="terp_tblheader_Details">Total:</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="terp_tblheader_Details_Right">[[ formatLang(o.amount) ]] [[ o.currency_id.symbol ]]</para>
|
||||
<para style="terp_tblheader_Details_Right">[[ formatLang(o.amount, currency_obj=o.currency_id) ]]</para>
|
||||
</td>
|
||||
</tr>
|
||||
</blockTable>
|
||||
|
|
|
|||
|
|
@ -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-18 04:40+0000\n"
|
||||
"X-Generator: Launchpad (build 16160)\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"
|
||||
|
||||
|
|
|
|||
|
|
@ -8,15 +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: 2011-06-11 13:23+0000\n"
|
||||
"Last-Translator: Christopher Ormaza - (Ecuadorenlinea.net) "
|
||||
"<chris.ormaza@gmail.com>\n"
|
||||
"PO-Revision-Date: 2012-10-17 04:38+0000\n"
|
||||
"Last-Translator: Cristian Salamea (Gnuthink) <ovnicraft@gmail.com>\n"
|
||||
"Language-Team: Spanish (Ecuador) <es_EC@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:33+0000\n"
|
||||
"X-Generator: Launchpad (build 15864)\n"
|
||||
"X-Launchpad-Export-Date: 2012-10-18 04:41+0000\n"
|
||||
"X-Generator: Launchpad (build 16160)\n"
|
||||
|
||||
#. module: hr_payroll
|
||||
#: field:hr.payslip.line,condition_select:0
|
||||
|
|
@ -170,7 +169,7 @@ msgstr "Todas las reglas hijas"
|
|||
#. module: hr_payroll
|
||||
#: view:hr.payslip:0 view:hr.salary.rule:0
|
||||
msgid "Input Data"
|
||||
msgstr ""
|
||||
msgstr "Datos de entrada"
|
||||
|
||||
#. module: hr_payroll
|
||||
#: constraint:hr.payslip:0
|
||||
|
|
@ -228,7 +227,7 @@ msgstr "Detalle regla salarial"
|
|||
#. module: hr_payroll
|
||||
#: report:paylip.details:0 report:payslip:0
|
||||
msgid "Note"
|
||||
msgstr ""
|
||||
msgstr "Notas"
|
||||
|
||||
#. module: hr_payroll
|
||||
#: field:hr.payroll.structure,code:0 field:hr.payslip,number:0
|
||||
|
|
@ -271,7 +270,7 @@ msgstr "Suma de el sueldo de todos los contratos actuales del empleado"
|
|||
#. module: hr_payroll
|
||||
#: view:hr.payslip:0
|
||||
msgid "Total Working Days"
|
||||
msgstr ""
|
||||
msgstr "Total de días trabajado"
|
||||
|
||||
#. module: hr_payroll
|
||||
#: help:hr.payslip.line,code:0 help:hr.salary.rule,code:0
|
||||
|
|
@ -363,7 +362,7 @@ msgstr "Semi-anualmente"
|
|||
#. module: hr_payroll
|
||||
#: view:hr.salary.rule:0
|
||||
msgid "Children Definition"
|
||||
msgstr ""
|
||||
msgstr "Definición de Hijos"
|
||||
|
||||
#. module: hr_payroll
|
||||
#: report:paylip.details:0 report:payslip:0
|
||||
|
|
@ -373,29 +372,29 @@ msgstr "Correo electrónico"
|
|||
#. module: hr_payroll
|
||||
#: view:hr.payslip.run:0
|
||||
msgid "Search Payslip Batches"
|
||||
msgstr ""
|
||||
msgstr "Buscar bloque de roles"
|
||||
|
||||
#. module: hr_payroll
|
||||
#: field:hr.payslip.line,amount_percentage_base:0
|
||||
#: field:hr.salary.rule,amount_percentage_base:0
|
||||
msgid "Percentage based on"
|
||||
msgstr ""
|
||||
msgstr "Porcentaje basado en"
|
||||
|
||||
#. module: hr_payroll
|
||||
#: help:hr.payslip.line,amount_percentage:0
|
||||
#: help:hr.salary.rule,amount_percentage:0
|
||||
msgid "For example, enter 50.0 to apply a percentage of 50%"
|
||||
msgstr ""
|
||||
msgstr "Por ejemplo, ingrese 50.0 para aplicar el 50%"
|
||||
|
||||
#. module: hr_payroll
|
||||
#: field:hr.payslip,paid:0
|
||||
msgid "Made Payment Order ? "
|
||||
msgstr ""
|
||||
msgstr "Orden de Pago generada ? "
|
||||
|
||||
#. module: hr_payroll
|
||||
#: report:contribution.register.lines:0
|
||||
msgid "PaySlip Lines by Contribution Register"
|
||||
msgstr ""
|
||||
msgstr "Detalle de nómina por contribución registrada"
|
||||
|
||||
#. module: hr_payroll
|
||||
#: help:hr.payslip,state:0
|
||||
|
|
@ -513,7 +512,7 @@ msgstr "Regla de salario hija"
|
|||
#: field:hr.payslip.run,date_end:0 report:paylip.details:0 report:payslip:0
|
||||
#: field:payslip.lines.contribution.register,date_to:0
|
||||
msgid "Date To"
|
||||
msgstr ""
|
||||
msgstr "Fecha hasta"
|
||||
|
||||
#. module: hr_payroll
|
||||
#: selection:hr.payslip.line,condition_select:0
|
||||
|
|
@ -576,7 +575,7 @@ msgstr "El contrato al cual aplica este ingreso"
|
|||
#. module: hr_payroll
|
||||
#: view:hr.salary.rule:0
|
||||
msgid "Computation"
|
||||
msgstr ""
|
||||
msgstr "Cálculo"
|
||||
|
||||
#. module: hr_payroll
|
||||
#: help:hr.payslip.input,amount:0
|
||||
|
|
@ -711,7 +710,7 @@ msgstr "Expresión de python"
|
|||
#. module: hr_payroll
|
||||
#: report:paylip.details:0 report:payslip:0
|
||||
msgid "Designation"
|
||||
msgstr ""
|
||||
msgstr "Designación"
|
||||
|
||||
#. module: hr_payroll
|
||||
#: code:addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py:52
|
||||
|
|
@ -839,7 +838,7 @@ msgstr "Registrar Nombre"
|
|||
#. module: hr_payroll
|
||||
#: view:hr.salary.rule:0
|
||||
msgid "General"
|
||||
msgstr ""
|
||||
msgstr "General"
|
||||
|
||||
#. module: hr_payroll
|
||||
#: code:addons/hr_payroll/hr_payroll.py:664
|
||||
|
|
@ -913,7 +912,7 @@ msgstr "Detalle del rol"
|
|||
#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payslip_form
|
||||
#: model:ir.ui.menu,name:hr_payroll.menu_department_tree
|
||||
msgid "Employee Payslips"
|
||||
msgstr ""
|
||||
msgstr "Roles de Empleado"
|
||||
|
||||
#. module: hr_payroll
|
||||
#: view:hr.payslip.line:0 field:hr.payslip.line,register_id:0
|
||||
|
|
@ -1004,7 +1003,7 @@ msgstr "Lineas de roles por registro de contribuciones"
|
|||
#. module: hr_payroll
|
||||
#: selection:hr.payslip,state:0
|
||||
msgid "Waiting"
|
||||
msgstr ""
|
||||
msgstr "Esperando"
|
||||
|
||||
#. module: hr_payroll
|
||||
#: report:paylip.details:0 report:payslip:0
|
||||
|
|
|
|||
|
|
@ -206,7 +206,7 @@
|
|||
<para style="P2">[[ formatLang(r['amount']) ]]</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="P3">[[ formatLang(r['total']) ]] [[o.company_id and o.company_id.currency_id.symbol or '']]</para>
|
||||
<para style="P3">[[ formatLang(r['total'], currency_obj = o.company_id and o.company_id.currency_id)]]</para>
|
||||
</td>
|
||||
</tr>
|
||||
</blockTable>
|
||||
|
|
@ -222,7 +222,7 @@
|
|||
<para style="P15">Total:</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="P11">[[ formatLang(sum_total()) ]] [[o.company_id and o.company_id.currency_id.symbol or '']]</para>
|
||||
<para style="P11">[[ formatLang(sum_total(), currency_obj = o.company_id and o.company_id.currency_id)]]</para>
|
||||
</td>
|
||||
</tr>
|
||||
</blockTable>
|
||||
|
|
|
|||
|
|
@ -197,7 +197,8 @@
|
|||
</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="P4">[[o.employee_id.address_home_id and o.employee_id.address_home_id.name or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.street or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.street2 or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.zip or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.city or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.state_id and o.employee_id.address_home_id.state_id.name or '' ]] [[o.employee_id.address_home_id and o.employee_id.address_home_id.country_id and o.employee_id.address_home_id.country_id.name or '' ]]</para>
|
||||
<para style="P4">[[o.employee_id.address_home_id and o.employee_id.address_home_id.name or '' ]]
|
||||
[[o.employee_id.address_home_id and display_address(o.employee_id.address_home_id)]]</para>
|
||||
</td>
|
||||
</tr>
|
||||
</blockTable>
|
||||
|
|
@ -293,7 +294,7 @@
|
|||
<para style="P4">[[ formatLang(p.amount) ]]</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="P5">[[ formatLang(p.total) ]] [[o.company_id and o.company_id.currency_id.symbol or '']]</para>
|
||||
<para style="P5">[[ formatLang(p.total, currency_obj = o.company_id and o.company_id.currency_id)]]</para>
|
||||
</td>
|
||||
</tr>
|
||||
</blockTable>
|
||||
|
|
|
|||
|
|
@ -234,7 +234,8 @@
|
|||
</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="P5">[[o.employee_id.address_home_id and o.employee_id.address_home_id.name or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.street or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.street2 or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.zip or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.city or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.state_id and o.employee_id.address_home_id.state_id.name or '' ]] [[o.employee_id.address_home_id and o.employee_id.address_home_id.country_id and o.employee_id.address_home_id.country_id.name or '' ]]</para>
|
||||
<para style="P5">[[o.employee_id.address_home_id and o.employee_id.address_home_id.name or '' ]]
|
||||
[[o.employee_id.address_home_id and display_address(o.employee_id.address_home_id)]]</para>
|
||||
</td>
|
||||
</tr>
|
||||
</blockTable>
|
||||
|
|
@ -334,7 +335,7 @@
|
|||
<para style="P17"><font face="Helvetica" color="white">[[ '..'*h['level'] ]]</font>[[ h['rule_category'] ]]<font face="Helvetica">[[ h['level']!=0 and ( setTag('para','para',{'style':'terp_default_8'})) or removeParentNode('font') ]]</font></para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="P6">[[ formatLang(h['total']) ]] [[o.company_id and o.company_id.currency_id.symbol or '']] <font face="Helvetica" size="8.0">[[ h['level']==0 and ( setTag('para','para',{'style':'terp_default_10'})) or removeParentNode('font') ]]</font></para>
|
||||
<para style="P6">[[ formatLang(h['total'], currency_obj = o.company_id and o.company_id.currency_id)]] <font face="Helvetica" size="8.0">[[ h['level']==0 and ( setTag('para','para',{'style':'terp_default_10'})) or removeParentNode('font') ]]</font></para>
|
||||
</td>
|
||||
</tr>
|
||||
</blockTable>
|
||||
|
|
@ -391,7 +392,7 @@
|
|||
<para style="P5">[[ formatLang(r['amount']) ]]</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="P6">[[ formatLang(r['total']) ]] [[ o.company_id and o.company_id.currency_id.symbol or '']]<font face="Helvetica">[[ r.get('register_name', False) and ( setTag('para','para',{'style':'terp_default_10'})) or removeParentNode('font')]]</font></para>
|
||||
<para style="P6">[[ formatLang(r['total'], currency_obj = o.company_id and o.company_id.currency_id)]]<font face="Helvetica">[[ r.get('register_name', False) and ( setTag('para','para',{'style':'terp_default_10'})) or removeParentNode('font')]]</font></para>
|
||||
</td>
|
||||
</tr>
|
||||
</blockTable>
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ class hr_payslip(osv.osv):
|
|||
|
||||
_columns = {
|
||||
'period_id': fields.many2one('account.period', 'Force Period',states={'draft': [('readonly', False)]}, readonly=True, domain=[('state','<>','done')], help="Keep empty to use the period of the validation(Payslip) date."),
|
||||
'journal_id': fields.many2one('account.journal', 'Expense Journal',states={'draft': [('readonly', False)]}, readonly=True, required=True),
|
||||
'journal_id': fields.many2one('account.journal', 'Salary Journal',states={'draft': [('readonly', False)]}, readonly=True, required=True),
|
||||
'move_id': fields.many2one('account.move', 'Accounting Entry', readonly=True),
|
||||
}
|
||||
|
||||
|
|
@ -215,7 +215,7 @@ class hr_payslip_run(osv.osv):
|
|||
_inherit = 'hr.payslip.run'
|
||||
_description = 'Payslip Run'
|
||||
_columns = {
|
||||
'journal_id': fields.many2one('account.journal', 'Expense Journal', states={'draft': [('readonly', False)]}, readonly=True, required=True),
|
||||
'journal_id': fields.many2one('account.journal', 'Salary Journal', states={'draft': [('readonly', False)]}, readonly=True, required=True),
|
||||
}
|
||||
|
||||
def _get_default_journal(self, cr, uid, context=None):
|
||||
|
|
|
|||
|
|
@ -297,7 +297,6 @@ class hr_applicant(base_stage, osv.Model):
|
|||
res['context'] = {
|
||||
'default_partner_ids': applicant.partner_id and [applicant.partner_id.id] or False,
|
||||
'default_user_id': uid,
|
||||
'default_state': 'open',
|
||||
'default_name': applicant.name,
|
||||
'default_categ_ids': category and [category.id] or False,
|
||||
}
|
||||
|
|
|
|||
|
|
@ -289,7 +289,8 @@
|
|||
</div>
|
||||
<div class="oe_kanban_content" tooltip="kanban-tooltip">
|
||||
<div>
|
||||
<b><field name="name"/></b><br/>
|
||||
<t t-if="record.partner_name.raw_value"><b><field name="partner_name"/></b><br/></t>
|
||||
<i><field name="name"/></i><br/>
|
||||
<field name="job_id"/><br/>
|
||||
<t t-if="record.partner_mobile.raw_value">Mobile: <field name="partner_mobile"/><br/></t>
|
||||
<t t-if="record.title_action.raw_value"><field name="title_action"/><br/></t>
|
||||
|
|
|
|||
|
|
@ -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:04+0000\n"
|
||||
"Last-Translator: Ferdinand-camptocamp <Unknown>\n"
|
||||
"PO-Revision-Date: 2012-10-12 23:22+0000\n"
|
||||
"Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
|
||||
"Language-Team: \n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
|
||||
"X-Generator: Launchpad (build 15864)\n"
|
||||
"X-Launchpad-Export-Date: 2012-10-14 04:39+0000\n"
|
||||
"X-Generator: Launchpad (build 16137)\n"
|
||||
|
||||
#. module: hr_timesheet_invoice
|
||||
#: view:report.timesheet.line:0
|
||||
|
|
@ -769,7 +769,7 @@ msgstr "Menge"
|
|||
#. module: hr_timesheet_invoice
|
||||
#: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
|
||||
msgid "Date/Code"
|
||||
msgstr "Datum/Kurzbez."
|
||||
msgstr "Dat/Kurzb."
|
||||
|
||||
#. module: hr_timesheet_invoice
|
||||
#: field:report.timesheet.line,general_account_id:0
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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-18 04:40+0000\n"
|
||||
"X-Generator: Launchpad (build 16160)\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
|
||||
|
|
|
|||
|
|
@ -108,7 +108,7 @@
|
|||
<para style="terp_default_9">[[ l['code'] (l['intra_code']) ]]</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="terp_default_Right_9">[[ l['amount'] or O.OO ]] [[ company.currency_id.symbol ]]</para>
|
||||
<para style="terp_default_Right_9">[[ formatLang(l['amount'], currency_obj=company.currency_id) ]]</para>
|
||||
</td>
|
||||
</tr>
|
||||
</blockTable>
|
||||
|
|
@ -129,7 +129,7 @@
|
|||
<para style="terp_tblheader_General_Right">Total:</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="terp_tblheader_General_Right">[[ data['form']['amountsum'] or 0.00 ]] [[ company.currency_id.symbol ]]</para>
|
||||
<para style="terp_tblheader_General_Right">[[ formatLang(data['form']['amountsum'], currency_obj=company.currency_id) ]]</para>
|
||||
</td>
|
||||
</tr>
|
||||
</blockTable>
|
||||
|
|
|
|||
|
|
@ -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-18 04:41+0000\n"
|
||||
"X-Generator: Launchpad (build 16160)\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 "
|
||||
|
|
@ -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 -->
|
||||
|
|
|
|||
|
|
@ -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">
|
||||
|
|
|
|||
|
|
@ -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-18 04:41+0000\n"
|
||||
"X-Generator: Launchpad (build 16160)\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 "中国会计科目表"
|
||||
|
|
|
|||
|
|
@ -8,24 +8,24 @@ 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-04-11 18:21+0000\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"PO-Revision-Date: 2012-10-17 04:39+0000\n"
|
||||
"Last-Translator: Cristian Salamea (Gnuthink) <ovnicraft@gmail.com>\n"
|
||||
"Language-Team: Spanish (Ecuador) <es_EC@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-18 04:41+0000\n"
|
||||
"X-Generator: Launchpad (build 16160)\n"
|
||||
|
||||
#. module: l10n_ec
|
||||
#: model:account.account.type,name:l10n_ec.account_type_expense
|
||||
msgid "Gasto"
|
||||
msgstr ""
|
||||
msgstr "Gasto"
|
||||
|
||||
#. module: l10n_ec
|
||||
#: model:account.account.type,name:l10n_ec.account_type_stock
|
||||
msgid "Inventario"
|
||||
msgstr ""
|
||||
msgstr "Inventario"
|
||||
|
||||
#. module: l10n_ec
|
||||
#: model:ir.actions.todo,note:l10n_ec.config_call_account_template_ec
|
||||
|
|
@ -50,47 +50,47 @@ msgstr ""
|
|||
#. module: l10n_ec
|
||||
#: model:account.account.type,name:l10n_ec.account_type_receivable
|
||||
msgid "Por Cobrar"
|
||||
msgstr ""
|
||||
msgstr "Por Cobrar"
|
||||
|
||||
#. module: l10n_ec
|
||||
#: model:account.account.type,name:l10n_ec.account_type_asset
|
||||
msgid "Activo"
|
||||
msgstr ""
|
||||
msgstr "Activo"
|
||||
|
||||
#. module: l10n_ec
|
||||
#: model:account.account.type,name:l10n_ec.account_type_tax
|
||||
msgid "Impuesto"
|
||||
msgstr ""
|
||||
msgstr "Impuesto"
|
||||
|
||||
#. module: l10n_ec
|
||||
#: model:account.account.type,name:l10n_ec.account_type_liability
|
||||
msgid "Pasivo"
|
||||
msgstr ""
|
||||
msgstr "Pasivo"
|
||||
|
||||
#. module: l10n_ec
|
||||
#: model:account.account.type,name:l10n_ec.account_type_capital
|
||||
msgid "Capital"
|
||||
msgstr ""
|
||||
msgstr "Capital"
|
||||
|
||||
#. module: l10n_ec
|
||||
#: model:account.account.type,name:l10n_ec.account_type_cash
|
||||
msgid "Efectivo"
|
||||
msgstr ""
|
||||
msgstr "Efectivo"
|
||||
|
||||
#. module: l10n_ec
|
||||
#: model:account.account.type,name:l10n_ec.account_type_payable
|
||||
msgid "Por Pagar"
|
||||
msgstr ""
|
||||
msgstr "Por Pagar"
|
||||
|
||||
#. module: l10n_ec
|
||||
#: model:account.account.type,name:l10n_ec.account_type_income
|
||||
msgid "Ingreso"
|
||||
msgstr ""
|
||||
msgstr "Ingreso"
|
||||
|
||||
#. module: l10n_ec
|
||||
#: model:account.account.type,name:l10n_ec.account_type_view
|
||||
msgid "View"
|
||||
msgstr ""
|
||||
msgstr "Vista"
|
||||
|
||||
#~ msgid ""
|
||||
#~ "\n"
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -290,9 +290,7 @@
|
|||
<tr>
|
||||
<td>
|
||||
<para style="terp_default_Bold_8">[[o.employee_id.name or '_']]</para>
|
||||
<para style="terp_default_Bold_8">[[o.employee_id.address_home_id.street or '_' ]]</para>
|
||||
<para style="terp_default_Bold_8">[[o.employee_id.address_home_id.street2 or '' ]]</para>
|
||||
<para style="terp_default_Bold_8">[[o.employee_id.address_home_id.zip or '_' ]] [[o.employee_id.address_home_id.city or '' ]]</para>
|
||||
<para style="terp_default_Bold_8">[[display_address(o.employee_id.address_home_id) or '_' ]]</para>
|
||||
</td>
|
||||
</tr>
|
||||
</blockTable>
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -234,7 +234,7 @@
|
|||
</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="terp_default_Right_9_Bold">[[ formatLang(e[13]) ]] [[company.currency_id.symbol]]</para>
|
||||
<para style="terp_default_Right_9_Bold">[[ formatLang(e[13],currency_obj= company.currency_id)]] </para>
|
||||
</td>
|
||||
</tr>
|
||||
</blockTable>
|
||||
|
|
@ -248,43 +248,43 @@
|
|||
<para style="terp_tblheader_Details">Total</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="terp_tblheader_General_Right">[[ formatLang(t[1]) or removeParentNode('para') ]] [[company.currency_id.symbol]]</para>
|
||||
<para style="terp_tblheader_General_Right">[[ formatLang(t[1],currency_obj= company.currency_id) or removeParentNode('para') ]] </para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="terp_tblheader_General_Right">[[ formatLang(t[2]) or removeParentNode('para')]] [[company.currency_id.symbol]]</para>
|
||||
<para style="terp_tblheader_General_Right">[[ formatLang(t[2],currency_obj= company.currency_id) or removeParentNode('para')]] </para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="terp_tblheader_General_Right">[[ formatLang(t[3]) or removeParentNode('para')]] [[company.currency_id.symbol]]</para>
|
||||
<para style="terp_tblheader_General_Right">[[ formatLang(t[3],currency_obj= company.currency_id) or removeParentNode('para')]] </para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="terp_tblheader_General_Right">[[ formatLang(t[4]) or removeParentNode('para')]] [[company.currency_id.symbol]]</para>
|
||||
<para style="terp_tblheader_General_Right">[[ formatLang(t[4],currency_obj= company.currency_id) or removeParentNode('para')]] </para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="terp_tblheader_General_Right">[[ formatLang(t[5]) or removeParentNode('para')]] [[company.currency_id.symbol]]</para>
|
||||
<para style="terp_tblheader_General_Right">[[ formatLang(t[5],currency_obj= company.currency_id) or removeParentNode('para')]] </para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="terp_tblheader_General_Right">[[ formatLang(t[6]) or removeParentNode('para')]] [[company.currency_id.symbol]]</para>
|
||||
<para style="terp_tblheader_General_Right">[[ formatLang(t[6],currency_obj= company.currency_id) or removeParentNode('para')]] </para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="terp_tblheader_General_Right">[[ formatLang(t[7]) or removeParentNode('para')]] [[company.currency_id.symbol]]</para>
|
||||
<para style="terp_tblheader_General_Right">[[ formatLang(t[7],currency_obj= company.currency_id) or removeParentNode('para')]] ]</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="terp_tblheader_General_Right">[[ formatLang(t[8]) or removeParentNode('para')]] [[company.currency_id.symbol]]</para>
|
||||
<para style="terp_tblheader_General_Right">[[ formatLang(t[8],currency_obj= company.currency_id) or removeParentNode('para')]] </para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="terp_tblheader_General_Right">[[ formatLang(t[9]) or removeParentNode('para')]] [[company.currency_id.symbol]]</para>
|
||||
<para style="terp_tblheader_General_Right">[[ formatLang(t[9],currency_obj= company.currency_id) or removeParentNode('para')]] </para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="terp_tblheader_General_Right">[[ formatLang(t[10]) or removeParentNode('para')]] [[company.currency_id.symbol]]</para>
|
||||
<para style="terp_tblheader_General_Right">[[ formatLang(t[10],currency_obj= company.currency_id) or removeParentNode('para')]] </para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="terp_tblheader_General_Right">[[ formatLang(t[11]) or removeParentNode('para')]] [[company.currency_id.symbol]]</para>
|
||||
<para style="terp_tblheader_General_Right">[[ formatLang(t[11],currency_obj= company.currency_id) or removeParentNode('para')]] </para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="terp_tblheader_General_Right">[[ formatLang(t[12]) or removeParentNode('para')]] [[company.currency_id.symbol]]</para>
|
||||
<para style="terp_tblheader_General_Right">[[ formatLang(t[12],currency_obj= company.currency_id) or removeParentNode('para')]] </para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="terp_tblheader_General_Right">[[ formatLang(get_total()) ]] [[company.currency_id.symbol]]</para>
|
||||
<para style="terp_tblheader_General_Right">[[ formatLang(get_total(), currency_obj = company.currency_id)]]</para>
|
||||
</td>
|
||||
</tr>
|
||||
</blockTable>
|
||||
|
|
|
|||
|
|
@ -478,7 +478,7 @@
|
|||
</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="terp_default_Right_9_Bold">[[ formatLang(e1[13]) ]] [[ company.currency_id.symbol ]]</para>
|
||||
<para style="terp_default_Right_9_Bold">[[ formatLang(e1[13],currency_obj= company.currency_id) ]] </para>
|
||||
</td>
|
||||
</tr>
|
||||
</blockTable>
|
||||
|
|
@ -571,7 +571,7 @@
|
|||
</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="terp_default_Right_9_Bold">[[ formatLang(e2[13]) ]] [[ company.currency_id.symbol ]]</para>
|
||||
<para style="terp_default_Right_9_Bold">[[ formatLang(e2[13],currency_obj= company.currency_id) ]] </para>
|
||||
</td>
|
||||
</tr>
|
||||
</blockTable>
|
||||
|
|
|
|||
|
|
@ -247,7 +247,7 @@
|
|||
<para style="P5">[[ line['acc_no'] ]]</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="P8">[[formatLang(line['bysal'])]] [[ (company.currency_id and company.currency_id.symbol) or '' ]]</para>
|
||||
<para style="P8">[[formatLang(line['bysal'], currency_obj = company.currency_id) ]]</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="P5">[[ line['debit_credit'] ]]</para>
|
||||
|
|
@ -296,7 +296,7 @@
|
|||
<para style="P5">[[ line['ifsc_code'] ]]</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="P8">[[formatLang(line['bysal'])]] [[ (company.currency_id and company.currency_id.symbol) or '' ]]</para>
|
||||
<para style="P8">[[formatLang(line['bysal'], currency_obj = company.currency_id) ]]</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="P5">[[ line['debit_credit'] ]]</para>
|
||||
|
|
@ -321,7 +321,7 @@
|
|||
<para style="P4"/>
|
||||
</td>
|
||||
<td>
|
||||
<para style="P4"><font face="Helvetica" size="6.0">[[ o.line_ids==[] and removeParentNode('para') ]]</font>[[ formatLang(get_bysal_total()) ]] [[ (company.currency_id and company.currency_id.symbol) or '' ]]</para>
|
||||
<para style="P4"><font face="Helvetica" size="6.0">[[ o.line_ids==[] and removeParentNode('para') ]]</font>[[ formatLang(get_bysal_total(), currency_obj = company.currency_id) ]]</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="P4">
|
||||
|
|
@ -347,7 +347,7 @@
|
|||
<para style="P4"/>
|
||||
</td>
|
||||
<td>
|
||||
<para style="P4"><font face="Helvetica" size="6.0">[[ o.line_ids==[] and removeParentNode('para') ]]</font>[[ formatLang(get_bysal_total()) ]] [[ (company.currency_id and company.currency_id.symbol) or '' ]]</para>
|
||||
<para style="P4"><font face="Helvetica" size="6.0">[[ o.line_ids==[] and removeParentNode('para') ]]</font>[[ formatLang(get_bysal_total(), currency_obj = company.currency_id) ]]</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="P4">
|
||||
|
|
|
|||
|
|
@ -234,7 +234,7 @@
|
|||
</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="P5">[[o.employee_id.address_home_id and o.employee_id.address_home_id.name or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.street or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.street2 or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.zip or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.city or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.state_id and o.employee_id.address_home_id.state_id.name or '' ]] [[o.employee_id.address_home_id and o.employee_id.address_home_id.country_id and o.employee_id.address_home_id.country_id.name or '' ]]</para>
|
||||
<para style="P5">[[o.employee_id.address_home_id and o.employee_id.address_home_id.name or '' ]],[[o.employee_id.address_home_id and display_address(o.employee_id.address_home_id)]]</para>
|
||||
</td>
|
||||
</tr>
|
||||
</blockTable>
|
||||
|
|
@ -334,7 +334,7 @@
|
|||
<para style="P17"><font face="Helvetica" color="white">[[ '..'*h['level'] ]]</font>[[ h['rule_category'] ]]<font face="Helvetica">[[ h['level']!=0 and ( setTag('para','para',{'style':'terp_default_8'})) or removeParentNode('font') ]]</font></para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="P6">[[ formatLang(h['total']) ]] [[o.company_id and o.company_id.currency_id.symbol or '']] <font face="Helvetica" size="8.0">[[ h['level']==0 and ( setTag('para','para',{'style':'terp_default_10'})) or removeParentNode('font') ]]</font></para>
|
||||
<para style="P6">[[ formatLang(h['total'], currency_obj = o.company_id and o.company_id.currency_id)]] <font face="Helvetica" size="8.0">[[ h['level']==0 and ( setTag('para','para',{'style':'terp_default_10'})) or removeParentNode('font') ]]</font></para>
|
||||
</td>
|
||||
</tr>
|
||||
</blockTable>
|
||||
|
|
|
|||
|
|
@ -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-18 04:41+0000\n"
|
||||
"X-Generator: Launchpad (build 16160)\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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
|
@ -69,29 +69,29 @@
|
|||
"51800_advertising","51800","Merchant Account Fees","other","l10n_us.user_type_cogs","cost_of_goods_sold","FALSE","l10n_us.account_chart_template_advertising"
|
||||
"53500_advertising","53500","Subcontracted Services","other","l10n_us.user_type_cogs","cost_of_goods_sold","FALSE","l10n_us.account_chart_template_advertising"
|
||||
"64200_advertising","64200","Marketing Expense","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_advertising"
|
||||
"41200_agriculture","41200","Agricultural Program Payments","other","l10n_us.user_type_income","income","FALSE","l10n_us.account_chart_template_agricultar"
|
||||
"42500_agriculture","42500","Commodity Credit Loans","other","l10n_us.user_type_income","income","FALSE","l10n_us.account_chart_template_agricultar"
|
||||
"42800_agriculture","42800","Cooperative Distributions","other","l10n_us.user_type_income","income","FALSE","l10n_us.account_chart_template_agricultar"
|
||||
"42900_agriculture","42900","Crop Insurance Proceeds","other","l10n_us.user_type_income","income","FALSE","l10n_us.account_chart_template_agricultar"
|
||||
"43000_agriculture","43000","Crop Sales","other","l10n_us.user_type_income","income","FALSE","l10n_us.account_chart_template_agricultar"
|
||||
"43100_agriculture","43100","Custom Hire Income","other","l10n_us.user_type_income","income","FALSE","l10n_us.account_chart_template_agricultar"
|
||||
"43600_agriculture","43600","Farmers Market Sales","other","l10n_us.user_type_income","income","FALSE","l10n_us.account_chart_template_agricultar"
|
||||
"44100_agriculture","44100","Fuel Tax Credits and Other Inc.","other","l10n_us.user_type_income","income","FALSE","l10n_us.account_chart_template_agricultar"
|
||||
"45500_agriculture","45500","Livestock Sales","other","l10n_us.user_type_income","income","FALSE","l10n_us.account_chart_template_agricultar"
|
||||
"47400_agriculture","47400","Rental Income","other","l10n_us.user_type_income","income","FALSE","l10n_us.account_chart_template_agricultar"
|
||||
"61100_agriculture","61100","Car and Truck Expenses","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_agricultar"
|
||||
"61500_agriculture","61500","Chemicals Purchased","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_agricultar"
|
||||
"61900_agriculture","61900","Conservation Expenses","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_agricultar"
|
||||
"62300_agriculture","62300","Custom Hire and Contract Labor","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_agricultar"
|
||||
"62900_agriculture","62900","Feed Purchased","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_agricultar"
|
||||
"63000_agriculture","63000","Fertilizers and Lime","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_agricultar"
|
||||
"63100_agriculture","63100","Freight and Trucking","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_agricultar"
|
||||
"63200_agriculture","63200","Gasoline, Fuel and Oil","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_agricultar"
|
||||
"67500_agriculture","67500","Seeds and Plants Purchased","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_agricultar"
|
||||
"67800_agriculture","67800","Small Tools and Equipment","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_agricultar"
|
||||
"67900_agriculture","67900","Storage and Warehousing","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_agricultar"
|
||||
"68500_agriculture","68500","Uniforms","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_agricultar"
|
||||
"68800_agriculture","68800","Veterinary, Breeding, Medicine","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_agricultar"
|
||||
"41200_agriculture","41200","Agricultural Program Payments","other","l10n_us.user_type_income","income","FALSE","l10n_us.account_chart_template_agriculture"
|
||||
"42500_agriculture","42500","Commodity Credit Loans","other","l10n_us.user_type_income","income","FALSE","l10n_us.account_chart_template_agriculture"
|
||||
"42800_agriculture","42800","Cooperative Distributions","other","l10n_us.user_type_income","income","FALSE","l10n_us.account_chart_template_agriculture"
|
||||
"42900_agriculture","42900","Crop Insurance Proceeds","other","l10n_us.user_type_income","income","FALSE","l10n_us.account_chart_template_agriculture"
|
||||
"43000_agriculture","43000","Crop Sales","other","l10n_us.user_type_income","income","FALSE","l10n_us.account_chart_template_agriculture"
|
||||
"43100_agriculture","43100","Custom Hire Income","other","l10n_us.user_type_income","income","FALSE","l10n_us.account_chart_template_agriculture"
|
||||
"43600_agriculture","43600","Farmers Market Sales","other","l10n_us.user_type_income","income","FALSE","l10n_us.account_chart_template_agriculture"
|
||||
"44100_agriculture","44100","Fuel Tax Credits and Other Inc.","other","l10n_us.user_type_income","income","FALSE","l10n_us.account_chart_template_agriculture"
|
||||
"45500_agriculture","45500","Livestock Sales","other","l10n_us.user_type_income","income","FALSE","l10n_us.account_chart_template_agriculture"
|
||||
"47400_agriculture","47400","Rental Income","other","l10n_us.user_type_income","income","FALSE","l10n_us.account_chart_template_agriculture"
|
||||
"61100_agriculture","61100","Car and Truck Expenses","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_agriculture"
|
||||
"61500_agriculture","61500","Chemicals Purchased","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_agriculture"
|
||||
"61900_agriculture","61900","Conservation Expenses","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_agriculture"
|
||||
"62300_agriculture","62300","Custom Hire and Contract Labor","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_agriculture"
|
||||
"62900_agriculture","62900","Feed Purchased","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_agriculture"
|
||||
"63000_agriculture","63000","Fertilizers and Lime","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_agriculture"
|
||||
"63100_agriculture","63100","Freight and Trucking","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_agriculture"
|
||||
"63200_agriculture","63200","Gasoline, Fuel and Oil","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_agriculture"
|
||||
"67500_agriculture","67500","Seeds and Plants Purchased","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_agriculture"
|
||||
"67800_agriculture","67800","Small Tools and Equipment","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_agriculture"
|
||||
"67900_agriculture","67900","Storage and Warehousing","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_agriculture"
|
||||
"68500_agriculture","68500","Uniforms","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_agriculture"
|
||||
"68800_agriculture","68800","Veterinary, Breeding, Medicine","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_agriculture"
|
||||
"24600_construction_trades","24600","Customer Deposits Received","other","l10n_us.user_type_other_current_liability","other_current_liability","FALSE","l10n_us.account_chart_template_construction"
|
||||
"45100_construction_trades","45100","Job Income","other","l10n_us.user_type_income","income","FALSE","l10n_us.account_chart_template_construction"
|
||||
"50800_construction_trades","50800","Commissions Paid","other","l10n_us.user_type_cogs","cost_of_goods_sold","FALSE","l10n_us.account_chart_template_construction"
|
||||
|
|
|
|||
|
|
|
@ -19,8 +19,8 @@
|
|||
<field name="complete_tax_set" eval="False" />
|
||||
<field name="parent_id" ref="account_chart_template_cogs"/>
|
||||
</record>
|
||||
<record id="account_chart_template_agricultar" model="account.chart.template">
|
||||
<field name="name">Agricultar</field>
|
||||
<record id="account_chart_template_agriculture" model="account.chart.template">
|
||||
<field name="name">Agriculture</field>
|
||||
<field name="complete_tax_set" eval="False" />
|
||||
<field name="parent_id" ref="account_chart_template_basic"/>
|
||||
</record>
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
<field name="bank_account_view_id" ref="cash_expenditure"/>
|
||||
</record>
|
||||
|
||||
<record id="account_chart_template_agricultar" model="account.chart.template">
|
||||
<record id="account_chart_template_agriculture" model="account.chart.template">
|
||||
<field name="bank_account_view_id" ref="cash_expenditure"/>
|
||||
</record>
|
||||
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -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-18 04:41+0000\n"
|
||||
"X-Generator: Launchpad (build 16160)\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"
|
||||
|
|
|
|||
|
|
@ -137,7 +137,7 @@
|
|||
</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="terp_default_9_right_bold"><u>[[ formatLang(get_total(o,objects)) ]] [[ (o.company_id and o.company_id.currency_id and o.company_id.currency_id.symbol) or '' ]]</u></para>
|
||||
<para style="terp_default_9_right_bold"><u>[[ formatLang(get_total(o,objects), currency_obj = o.company_id and o.company_id.currency_id) ]]</u></para>
|
||||
</td>
|
||||
</tr>
|
||||
</blockTable>
|
||||
|
|
@ -155,7 +155,7 @@
|
|||
<para style="terp_default_9">[[ lines.descript]]</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="terp_default_9_right">[[ lines.price ]] [[ (o.company_id and o.company_id.currency_id and o.company_id.currency_id.symbol) or '' ]]</para>
|
||||
<para style="terp_default_9_right">[[ formatLang(lines.price , currency_obj = o.company_id and o.company_id.currency_id) ]]</para>
|
||||
</td>
|
||||
</tr>
|
||||
</blockTable>
|
||||
|
|
@ -172,7 +172,7 @@
|
|||
<para style="terp_tbl_detail_header">Total :</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="terp_default_9_right_bold">[[ formatLang(get_nettotal()) ]] [[ (o.company_id and o.company_id.currency_id and o.company_id.currency_id.symbol) or '' ]]</para>
|
||||
<para style="terp_default_9_right_bold">[[ formatLang(get_nettotal(), currency_obj = o.company_id and o.company_id.currency_id) ]]</para>
|
||||
</td>
|
||||
</tr>
|
||||
</blockTable>
|
||||
|
|
|
|||
|
|
@ -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-18 04:41+0000\n"
|
||||
"X-Generator: Launchpad (build 16160)\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
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue