odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] trunk 

bzr revid: qdp-launchpad@openerp.com-20120712085654-sdkvz3b596r1gfer
This commit is contained in:
Quentin (OpenERP) 2012-07-12 10:56:54 +02:00
parent 5a7e06c4a4 b0b5a5988f
commit 269af2189d
169 changed files with 1959 additions and 2978 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
addons/account/account.py
View File

@ -1862,8 +1862,10 @@ class account_tax(osv.osv):
'applicable_type': fields.selection( [('true','Always'), ('code','Given by Python Code')], 'Applicability', required=True,
help="If not applicable (computed through a Python code), the tax won't appear on the invoice."),
'domain':fields.char('Domain', size=32, help="This field is only used if you develop your own module allowing developers to create specific taxes in a custom domain."),
'account_collected_id':fields.many2one('account.account', 'Invoice Tax Account'),
'account_paid_id':fields.many2one('account.account', 'Refund Tax Account'),
'account_collected_id':fields.many2one('account.account', 'Invoice Tax Account', help="Set the account that will be set by default on invoice tax lines for invoices. Leave empty to use the expense account."),
'account_paid_id':fields.many2one('account.account', 'Refund Tax Account', help="Set the account that will be set by default on invoice tax lines for refunds. Leave empty to use the expense account."),
'account_analytic_collected_id':fields.many2one('account.analytic.account', 'Invoice Tax Analytic Account', help="Set the analytic account that will be used by default on the invoice tax lines for invoices. Leave empty if you don't want to use an analytic account on the invoice tax lines by default."),
'account_analytic_paid_id':fields.many2one('account.analytic.account', 'Refund Tax Analytic Account', help="Set the analytic account that will be used by default on the invoice tax lines for refunds. Leave empty if you don't want to use an analytic account on the invoice tax lines by default."),
'parent_id':fields.many2one('account.tax', 'Parent Tax Account', select=True),
'child_ids':fields.one2many('account.tax', 'parent_id', 'Child Tax Accounts'),
'child_depend':fields.boolean('Tax on Children', help="Set if the tax computation is based on the computation of child taxes rather than on the total amount."),
@ -2001,6 +2003,8 @@ class account_tax(osv.osv):
'name':tax.description and tax.description + " - " + tax.name or tax.name,
'account_collected_id':tax.account_collected_id.id,
'account_paid_id':tax.account_paid_id.id,
'account_analytic_collected_id': tax.account_analytic_collected_id.id,
'account_analytic_paid_id': tax.account_analytic_paid_id.id,
'base_code_id': tax.base_code_id.id,
'ref_base_code_id': tax.ref_base_code_id.id,
'sequence': tax.sequence,
@ -2066,7 +2070,20 @@ class account_tax(osv.osv):
'taxes': [] # List of taxes, see compute for the format
}
"""
# By default, for each tax, tax amount will first be computed
# and rounded at the 'Account' decimal precision for each
# PO/SO/invoice line and then these rounded amounts will be
# summed, leading to the total amount for that tax. But, if the
# company has tax_calculation_rounding_method = round_globally,
# we still follow the same method, but we use a much larger
# precision when we round the tax amount for each line (we use
# the 'Account' decimal precision + 5), and that way it's like
# rounding after the sum of the tax amounts of each line
precision = self.pool.get('decimal.precision').precision_get(cr, uid, 'Account')
tax_compute_precision = precision
if taxes and taxes[0].company_id.tax_calculation_rounding_method == 'round_globally':
tax_compute_precision += 5
totalin = totalex = round(price_unit * quantity, precision)
tin = []
tex = []
@ -2075,7 +2092,7 @@ class account_tax(osv.osv):
tex.append(tax)
else:
tin.append(tax)
tin = self.compute_inv(cr, uid, tin, price_unit, quantity, product=product, partner=partner)
tin = self.compute_inv(cr, uid, tin, price_unit, quantity, product=product, partner=partner, precision=tax_compute_precision)
for r in tin:
totalex -= r.get('amount', 0.0)
totlex_qty = 0.0
@ -2083,7 +2100,7 @@ class account_tax(osv.osv):
totlex_qty = totalex/quantity
except:
pass
tex = self._compute(cr, uid, tex, totlex_qty, quantity,product=product, partner=partner)
tex = self._compute(cr, uid, tex, totlex_qty, quantity, product=product, partner=partner, precision=tax_compute_precision)
for r in tex:
totalin += r.get('amount', 0.0)
return {
@ -2096,7 +2113,7 @@ class account_tax(osv.osv):
_logger.warning("Deprecated, use compute_all(...)['taxes'] instead of compute(...) to manage prices with tax included")
return self._compute(cr, uid, taxes, price_unit, quantity, product, partner)
def _compute(self, cr, uid, taxes, price_unit, quantity, product=None, partner=None):
def _compute(self, cr, uid, taxes, price_unit, quantity, product=None, partner=None, precision=None):
"""
Compute tax values for given PRICE_UNIT, QUANTITY and a buyer/seller ADDRESS_ID.
@ -2105,14 +2122,15 @@ class account_tax(osv.osv):
tax = {'name':'', 'amount':0.0, 'account_collected_id':1, 'account_paid_id':2}
one tax for each tax id in IDS and their children
"""
if not precision:
precision = self.pool.get('decimal.precision').precision_get(cr, uid, 'Account')
res = self._unit_compute(cr, uid, taxes, price_unit, product, partner, quantity)
total = 0.0
precision_pool = self.pool.get('decimal.precision')
for r in res:
if r.get('balance',False):
r['amount'] = round(r.get('balance', 0.0) * quantity, precision_pool.precision_get(cr, uid, 'Account')) - total
r['amount'] = round(r.get('balance', 0.0) * quantity, precision) - total
else:
r['amount'] = round(r.get('amount', 0.0) * quantity, precision_pool.precision_get(cr, uid, 'Account'))
r['amount'] = round(r.get('amount', 0.0) * quantity, precision)
total += r['amount']
return res
@ -2160,6 +2178,8 @@ class account_tax(osv.osv):
'amount': amount,
'account_collected_id': tax.account_collected_id.id,
'account_paid_id': tax.account_paid_id.id,
'account_analytic_collected_id': tax.account_analytic_collected_id.id,
'account_analytic_paid_id': tax.account_analytic_paid_id.id,
'base_code_id': tax.base_code_id.id,
'ref_base_code_id': tax.ref_base_code_id.id,
'sequence': tax.sequence,
@ -2188,7 +2208,7 @@ class account_tax(osv.osv):
r['todo'] = 0
return res
def compute_inv(self, cr, uid, taxes, price_unit, quantity, product=None, partner=None):
def compute_inv(self, cr, uid, taxes, price_unit, quantity, product=None, partner=None, precision=None):
"""
Compute tax values for given PRICE_UNIT, QUANTITY and a buyer/seller ADDRESS_ID.
Price Unit is a VAT included price
@ -2198,15 +2218,15 @@ class account_tax(osv.osv):
tax = {'name':'', 'amount':0.0, 'account_collected_id':1, 'account_paid_id':2}
one tax for each tax id in IDS and their children
"""
if not precision:
precision = self.pool.get('decimal.precision').precision_get(cr, uid, 'Account')
res = self._unit_compute_inv(cr, uid, taxes, price_unit, product, partner=None)
total = 0.0
obj_precision = self.pool.get('decimal.precision')
for r in res:
prec = obj_precision.precision_get(cr, uid, 'Account')
if r.get('balance',False):
r['amount'] = round(r['balance'] * quantity, prec) - total
r['amount'] = round(r['balance'] * quantity, precision) - total
else:
r['amount'] = round(r['amount'] * quantity, prec)
r['amount'] = round(r['amount'] * quantity, precision)
total += r['amount']
return res

6
addons/account/account_bank.py
View File

@ -43,6 +43,12 @@ class bank(osv.osv):
"Return the name to use when creating a bank journal"
return (bank.bank_name or '') + ' ' + bank.acc_number
def _prepare_name_get(self, cr, uid, bank_type_obj, bank_obj, context=None):
"""Add ability to have %(currency_name)s in the format_layout of
res.partner.bank.type"""
bank_obj._data[bank_obj.id]['currency_name'] = bank_obj.currency_id and bank_obj.currency_id.name or ''
return super(bank, self)._prepare_name_get(cr, uid, bank_type_obj, bank_obj, context=context)
def post_write(self, cr, uid, ids, context={}):
if isinstance(ids, (int, long)):
ids = [ids]

12
addons/account/account_invoice.py
View File

@ -756,7 +756,7 @@ class account_invoice(osv.osv):
for tax in inv.tax_line:
if tax.manual:
continue
key = (tax.tax_code_id.id, tax.base_code_id.id, tax.account_id.id)
key = (tax.tax_code_id.id, tax.base_code_id.id, tax.account_id.id, tax.account_analytic_id.id)
tax_key.append(key)
if not key in compute_taxes:
raise osv.except_osv(_('Warning !'), _('Global taxes defined, but they are not in invoice lines !'))
@ -1002,7 +1002,7 @@ class account_invoice(osv.osv):
'quantity': x.get('quantity',1.00),
'product_id': x.get('product_id', False),
'product_uom_id': x.get('uos_id', False),
'analytic_account_id': x.get('account_analytic_id', False),
'analytic_account_id': x.get('analytic_account_id', False),
}
def action_number(self, cr, uid, ids, context=None):
@ -1578,6 +1578,7 @@ class account_invoice_tax(osv.osv):
'invoice_id': fields.many2one('account.invoice', 'Invoice Line', ondelete='cascade', select=True),
'name': fields.char('Tax Description', size=64, required=True),
'account_id': fields.many2one('account.account', 'Tax Account', required=True, domain=[('type','<>','view'),('type','<>','income'), ('type', '<>', 'closed')]),
'account_analytic_id': fields.many2one('account.analytic.account', 'Analytic account'),
'base': fields.float('Base', digits_compute=dp.get_precision('Account')),
'amount': fields.float('Amount', digits_compute=dp.get_precision('Account')),
'manual': fields.boolean('Manual'),
@ -1648,14 +1649,16 @@ class account_invoice_tax(osv.osv):
val['base_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, val['base'] * tax['base_sign'], context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')}, round=False)
val['tax_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, val['amount'] * tax['tax_sign'], context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')}, round=False)
val['account_id'] = tax['account_collected_id'] or line.account_id.id
val['account_analytic_id'] = tax['account_analytic_collected_id']
else:
val['base_code_id'] = tax['ref_base_code_id']
val['tax_code_id'] = tax['ref_tax_code_id']
val['base_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, val['base'] * tax['ref_base_sign'], context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')}, round=False)
val['tax_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, val['amount'] * tax['ref_tax_sign'], context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')}, round=False)
val['account_id'] = tax['account_paid_id'] or line.account_id.id
val['account_analytic_id'] = tax['account_analytic_paid_id']
key = (val['tax_code_id'], val['base_code_id'], val['account_id'])
key = (val['tax_code_id'], val['base_code_id'], val['account_id'], val['account_analytic_id'])
if not key in tax_grouped:
tax_grouped[key] = val
else:
@ -1687,7 +1690,8 @@ class account_invoice_tax(osv.osv):
'price': t['amount'] or 0.0,
'account_id': t['account_id'],
'tax_code_id': t['tax_code_id'],
'tax_amount': t['tax_amount']
'tax_amount': t['tax_amount'],
'analytic_account_id': t['account_analytic_id'],
})
return res

2
addons/account/account_invoice_view.xml
View File

@ -98,6 +98,7 @@
<field name="name"/>
<field name="sequence"/>
<field name="account_id" groups="account.group_account_user"/>
<field name="account_analytic_id" domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id), ('parent_id', '!=', False)]" groups="analytic.group_analytic_accounting"/>
<field name="manual"/>
<field name="amount"/>
<field name="base" readonly="0"/>
@ -215,6 +216,7 @@
<tree editable="bottom" string="Taxes">
<field name="name"/>
<field name="account_id" groups="account.group_account_invoice"/>
<field name="account_analytic_id" domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id), ('parent_id', '!=', False)]" groups="analytic.group_analytic_accounting"/>
<field name="base" on_change="base_change(base,parent.currency_id,parent.company_id,parent.date_invoice)" readonly="1"/>
<field name="amount" on_change="amount_change(amount,parent.currency_id,parent.company_id,parent.date_invoice)"/>

4
addons/account/account_view.xml
View File

@ -909,9 +909,9 @@
<field name="amount" attrs="{'readonly':[('type','in',('none', 'code', 'balance'))]}"/>
<separator colspan="4" string="Accounting Information"/>
<field name="account_collected_id" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
<label colspan="2" nolabel="1" string="Keep empty to use the income account"/>
<field name="account_analytic_collected_id" domain="[('type','&lt;&gt;','view'), ('company_id', '=', company_id), ('parent_id', '&lt;&gt;', False)]" groups="analytic.group_analytic_accounting"/>
<field name="account_paid_id" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
<label colspan="2" nolabel="1" string="Keep empty to use the expense account"/>
<field name="account_analytic_paid_id" domain="[('type','&lt;&gt;','view'), ('company_id', '=', company_id), ('parent_id', '&lt;&gt;', False)]" groups="analytic.group_analytic_accounting"/>
<separator colspan="4" string="Tax Declaration: Invoices"/>
<field name="base_code_id"/>
<field name="base_sign"/>

6
addons/account/company.py
View File

@ -25,6 +25,11 @@ class res_company(osv.osv):
_inherit = "res.company"
_columns = {
'expects_chart_of_accounts': fields.boolean('Expects a Chart of Accounts'),
'tax_calculation_rounding_method': fields.selection([
('round_per_line', 'Round per Line'),
('round_globally', 'Round Globally'),
], 'Tax Calculation Rounding Method',
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(
@ -39,6 +44,7 @@ class res_company(osv.osv):
_defaults = {
'expects_chart_of_accounts': True,
'tax_calculation_rounding_method': 'round_per_line',
'overdue_msg': '''Dear Sir, dear Madam,
Our records indicate that some payments on your account are still due. Please find details below.

1
addons/account/company_view.xml
View File

@ -24,6 +24,7 @@
<field name="arch" type="xml">
<field name="currency_id" position="after">
<field name="property_reserve_and_surplus_account" colspan="2"/>
<field name="tax_calculation_rounding_method"/>
<field name="paypal_account" placeholder="sales@openerp.com"/>
</field>
</field>

14
addons/account/i18n/zh_CN.po
View File

@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-02-08 00:35+0000\n"
"PO-Revision-Date: 2012-06-20 16:17+0000\n"
"Last-Translator: Jeff Wang <wjfonhand@hotmail.com>\n"
"PO-Revision-Date: 2012-07-11 03:05+0000\n"
"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-06-22 04:44+0000\n"
"X-Generator: Launchpad (build 15461)\n"
"X-Launchpad-Export-Date: 2012-07-12 04:41+0000\n"
"X-Generator: Launchpad (build 15593)\n"
#. module: account
#: view:account.invoice.report:0
@ -4963,7 +4963,7 @@ msgstr "资产负债表"
#: view:account.general.journal:0
#: model:ir.ui.menu,name:account.menu_account_general_journal
msgid "General Journals"
msgstr "一般账簿"
msgstr "总账账簿"
#. module: account
#: field:account.journal,allow_date:0
@ -5702,7 +5702,7 @@ msgstr "发票税科目"
#: model:ir.actions.act_window,name:account.action_account_general_journal
#: model:ir.model,name:account.model_account_general_journal
msgid "Account General Journal"
msgstr "一般账簿"
msgstr "科目总账账簿"
#. module: account
#: field:account.payment.term.line,days:0
@ -10184,7 +10184,7 @@ msgstr "周期次数"
#: report:account.general.journal:0
#: model:ir.actions.report.xml,name:account.account_general_journal
msgid "General Journal"
msgstr "一般账簿"
msgstr "总账账簿"
#. module: account
#: view:account.invoice:0

7
addons/account/res_config.py
View File

@ -49,6 +49,12 @@ class account_config_settings(osv.osv_memory):
'has_chart_of_accounts': fields.boolean('Company has a chart of accounts'),
'chart_template_id': fields.many2one('account.chart.template', 'Chart Template', domain="[('visible','=', True)]"),
'code_digits': fields.integer('# of Digits', help="No. of Digits to use for account code"),
'tax_calculation_rounding_method': fields.related('company_id',
'tax_calculation_rounding_method', type='selection', selection=[
('round_per_line', 'Round per Line'),
('round_globally', 'Round Globally'),
], string='Tax Calculation Rounding Method',
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."),
'sale_tax': fields.many2one("account.tax.template", "Default Sale Tax"),
'purchase_tax': fields.many2one("account.tax.template", "Default Purchase Tax"),
'sale_tax_rate': fields.float('Sales Tax (%)'),
@ -152,6 +158,7 @@ class account_config_settings(osv.osv_memory):
'has_chart_of_accounts': has_chart_of_accounts,
'has_fiscal_year': bool(fiscalyear_count),
'chart_template_id': False,
'tax_calculation_rounding_method': company.tax_calculation_rounding_method,
}
# update journals and sequences
for journal_type in ('sale', 'sale_refund', 'purchase', 'purchase_refund'):

1
addons/account/res_config_view.xml
View File

@ -76,6 +76,7 @@
<group>
<field name="default_purchase_tax" domain="[('type_tax_use','=','purchase'), ('company_id','=',company_id)]"
attrs="{'invisible': [('has_chart_of_accounts','=',False)]}"/>
<field name="tax_calculation_rounding_method"/>
<field name="module_account_asset"/>
<field name="module_account_budget"/>
</group>

10
addons/account/wizard/account_automatic_reconcile_view.xml
View File

@ -8,11 +8,6 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Reconciliation" version="7.0">
<header>
<button name="reconcile" string="Reconcile" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<separator string="Reconciliation"/>
<label string="For an invoice to be considered as paid, the invoice entries must be reconciled with counterparts, usually payments. With the automatic reconciliation functionality, OpenERP makes its own search for entries to reconcile in a series of accounts. It finds entries for each partner where the amounts correspond."/>
<field name="account_ids" domain="[('reconcile','=',1)]"/>
@ -26,6 +21,11 @@
<field name="journal_id" attrs="{ 'required':[('allow_write_off', '=', True)]}"/>
<field name="period_id" attrs="{ 'required':[('allow_write_off', '=', True)]}"/>
</group>
<footer>
<button name="reconcile" string="Reconcile" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</footer>
</form>
</field>
</record>

10
addons/account/wizard/account_change_currency_view.xml
View File

@ -7,14 +7,14 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Invoice Currency" version="7.0">
<header>
<button name="change_currency" string="Change Currency" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<group string="This wizard will change the currency of the invoice">
<field name="currency_id"/>
</group>
<footer>
<button name="change_currency" string="Change Currency" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</footer>
</form>
</field>
</record>

10
addons/account/wizard/account_chart_view.xml
View File

@ -7,11 +7,6 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Account charts" version="7.0">
<header>
<button string="Open Charts" name="account_chart_open_window" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<group colspan="4">
<field name="fiscalyear" on_change="onchange_fiscalyear(fiscalyear)"/>
<field name="target_move"/>
@ -20,6 +15,11 @@
<field name="period_from"/>
<field name="period_to"/>
</group>
<footer>
<button string="Open Charts" name="account_chart_open_window" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</footer>
</form>
</field>
</record>

10
addons/account/wizard/account_fiscalyear_close_view.xml
View File

@ -7,11 +7,6 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Generate Fiscal Year Opening Entries" version="7.0">
<header>
<button string="Create" name="data_save" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<separator string="Generate Fiscal Year Opening Entries"/>
<label string="This wizard will generate the end of year journal entries of selected fiscal year. Note that you can run this wizard many times for the same fiscal year: it will simply replace the old opening entries with the new ones."/>
<newline/>
@ -22,6 +17,11 @@
<field name="period_id" domain ="[('fiscalyear_id','=',fy2_id),('special','=', True)]" />
<field name="report_name"/>
</group>
<footer>
<button string="Create" name="data_save" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</footer>
</form>
</field>
</record>

10
addons/account/wizard/account_invoice_refund_view.xml
View File

@ -8,11 +8,6 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Credit Note" version="7.0">
<header>
<button string='Refund' name="invoice_refund" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<separator string="Credit Note Options"/>
<group col="4">
<field name="description"/>
@ -24,6 +19,11 @@
<label string="Modify Invoice: Cancels the current invoice and creates a new copy of it ready for editing."/>
<label string="Credit Note: Creates the credit note, ready for editing."/>
<label string="Cancel Invoice: Creates the credit note, validate and reconcile it to cancel the current invoice."/>
<footer>
<button string='Refund' name="invoice_refund" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</footer>
</form>
</field>
</record>

32
addons/account/wizard/account_invoice_state_view.xml
View File

@ -6,14 +6,14 @@
<field name="model">account.invoice.confirm</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Confirm Draft Invoices" version="7.0">
<header>
<button string="Confirm Invoices" name="invoice_confirm" type="object" default_focus="1" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<separator string="Confirm Draft Invoices"/>
</form>
<form string="Confirm Draft Invoices" version="7.0">
<separator string="Confirm Draft Invoices"/>
<footer>
<button string="Confirm Invoices" name="invoice_confirm" type="object" default_focus="1" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</footer>
</form>
</field>
</record>
@ -28,14 +28,14 @@
<field name="model">account.invoice.cancel</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Cancel Selected Invoices" version="7.0">
<header>
<button string="Cancel Invoices" name="invoice_cancel" type="object" default_focus="1" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<separator string="Cancel Selected Invoices"/>
</form>
<form string="Cancel Selected Invoices" version="7.0">
<separator string="Cancel Selected Invoices"/>
<footer>
<button string="Cancel Invoices" name="invoice_cancel" type="object" default_focus="1" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</footer>
</form>
</field>
</record>

14
addons/account/wizard/account_journal_select_view.xml
View File

@ -7,14 +7,14 @@
<field name="model">account.journal.select</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Journal Select" version="7.0">
<header>
<button string="Open Entries" name="action_open_window" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<form string="Journal Select" version="7.0">
<label string="Are you sure you want to open Journal Entries?"/>
</form>
<footer>
<button string="Open Entries" name="action_open_window" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</footer>
</form>
</field>
</record>

10
addons/account/wizard/account_move_bank_reconcile_view.xml
View File

@ -7,14 +7,14 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Bank reconciliation" version="7.0">
<header>
<button string="Open for Bank Reconciliation" name="action_open_window" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<group>
<field name="journal_id"/>
</group>
<footer>
<button string="Open for Bank Reconciliation" name="action_open_window" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</footer>
</form>
</field>
</record>

10
addons/account/wizard/account_move_line_reconcile_select_view.xml
View File

@ -7,14 +7,14 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Reconciliation" version="7.0">
<header>
<button string="Open for Reconciliation" name="action_open_window" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<group>
<field name="account_id"/>
</group>
<footer>
<button string="Open for Reconciliation" name="action_open_window" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</footer>
</form>
</field>
</record>

6
addons/account/wizard/account_move_line_select_view.xml
View File

@ -8,12 +8,12 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Account Select" version="7.0">
<header>
<label string="Are you sure you want to open Account move line entries?"/>
<footer>
<button string="Open Entries" name="open_window" type="object" default_focus="1" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<label string="Are you sure you want to open Account move line entries?"/>
</footer>
</form>
</field>
</record>

10
addons/account/wizard/account_move_line_unreconcile_select_view.xml
View File

@ -7,14 +7,14 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Unreconciliation" version="7.0">
<header>
<button string="Open for Unreconciliation" name="action_open_window" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<group>
<field name="account_id"/>
</group>
<footer>
<button string="Open for Unreconciliation" name="action_open_window" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</footer>
</form>
</field>
</record>

10
addons/account/wizard/account_open_closed_fiscalyear_view.xml
View File

@ -7,14 +7,14 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Choose Fiscal Year " version="7.0">
<header>
<button string="Open" name="remove_entries" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<group>
<field name="fyear_id" domain="[('state','=','draft')]"/>
</group>
<footer>
<button string="Open" name="remove_entries" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</footer>
</form>
</field>
</record>

10
addons/account/wizard/account_period_close_view.xml
View File

@ -8,14 +8,14 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Close Period" version="7.0">
<header>
<button string="Close Period" name="data_save" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<group string="Are you sure?">
<field name="sure"/>
</group>
<footer>
<button string="Close Period" name="data_save" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</footer>
</form>
</field>
</record>

6
addons/account/wizard/account_reconcile_partner_process_view.xml
View File

@ -7,15 +7,15 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Partner Reconciliation" version="7.0">
<header>
<button name="next_partner" icon="terp-gtk-jump-to-ltr" type="object" string="Go to Next Partner" class="oe_highlight" />
</header>
<group col="4">
<field name="next_partner_id"/>
<field name="progress" widget="progressbar" colspan="4"/>
<field name="today_reconciled"/>
<field name="to_reconcile"/>
</group>
<footer>
<button name="next_partner" icon="terp-gtk-jump-to-ltr" type="object" string="Go to Next Partner" class="oe_highlight" />
</footer>
</form>
</field>
</record>

14
addons/account/wizard/account_reconcile_view.xml
View File

@ -8,13 +8,6 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Reconciliation" version="7.0">
<header>
<button string="Reconcile" name="trans_rec_reconcile_full" type="object" default_focus="1" attrs="{'invisible':[('writeoff','!=',0)]}" class="oe_highlight"/>
<button string="Reconcile With Write-Off" name="trans_rec_addendum_writeoff" type="object" attrs="{'invisible':[('writeoff','==',0)]}" class="oe_highlight"/>
<button string="Partial Reconcile" name="trans_rec_reconcile_partial_reconcile" type="object" attrs="{'invisible':[('writeoff','==',0)]}" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<group col="4" string="Reconciliation Transactions">
<field name="trans_nbr"/>
<newline/>
@ -23,6 +16,13 @@
</group><group string="Write-Off">
<field name="writeoff"/>
</group>
<footer>
<button string="Reconcile" name="trans_rec_reconcile_full" type="object" default_focus="1" attrs="{'invisible':[('writeoff','!=',0)]}" class="oe_highlight"/>
<button string="Reconcile With Write-Off" name="trans_rec_addendum_writeoff" type="object" attrs="{'invisible':[('writeoff','==',0)]}" class="oe_highlight"/>
<button string="Partial Reconcile" name="trans_rec_reconcile_partial_reconcile" type="object" attrs="{'invisible':[('writeoff','==',0)]}" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</footer>
</form>
</field>
</record>

10
addons/account/wizard/account_report_aged_partner_balance_view.xml
View File

@ -9,11 +9,6 @@
<!--<field name="inherit_id" ref="account_common_report_view" />-->
<field name="arch" type="xml">
<form string="Report Options" version="7.0">
<header>
<button name="check_report" string="Print" type="object" default_focus="1" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<separator string="Aged Partner Balance"/>
<label string="Aged Partner Balance is a more detailed report of your receivables by intervals. When opening that report, OpenERP asks for the name of the company, the fiscal period and the size of the interval to be analyzed (in days). OpenERP then calculates a table of credit balance by period. So if you request an interval of 30 days OpenERP generates an analysis of creditors for the past month, past two months, and so on. "/>
<group col="4">
@ -26,6 +21,11 @@
<field name="direction_selection"/>
</group>
<field name="journal_ids" required="0" invisible="1"/>
<footer>
<button name="check_report" string="Print" type="object" default_focus="1" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</footer>
</form>
</field>
</record>

10
addons/account/wizard/account_report_common_view.xml
View File

@ -8,11 +8,6 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Report Options" version="7.0">
<header>
<button name="check_report" string="Print" type="object" default_focus="1" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</header>
<label string=""/> <!-- binding for inherited views -->
<group col="4">
<field name="chart_account_id" widget='selection' on_change="onchange_chart_id(chart_account_id, context)"/>
@ -38,6 +33,11 @@
<field name="journal_ids"/>
</page>
</notebook>
<footer>
<button name="check_report" string="Print" type="object" default_focus="1" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</footer>
</form>
</field>
</record>

10
addons/account/wizard/account_state_open_view.xml
View File

@ -8,14 +8,14 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Open Invoice" version="7.0">
<header>
<button name="change_inv_state" string="Yes" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<label string="Are you sure you want to open this invoice ?"/>
<newline/>
<label string="(Invoice should be unreconciled if you want to open it)"/>
<footer>
<button name="change_inv_state" string="Yes" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</footer>
</form>
</field>
</record>

10
addons/account/wizard/account_subscription_generate_view.xml
View File

@ -8,16 +8,16 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Subscription Compute" version="7.0">
<header>
<button string="Generate Entries" name="action_generate" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</header>
<separator string="Generate Entries before:"/>
<label string ="Automatically generate entries based on what has been entered in the system before a specific date."/>
<group>
<field name="date"/>
</group>
<footer>
<button string="Generate Entries" name="action_generate" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</footer>
</form>
</field>
</record>

10
addons/account/wizard/account_tax_chart_view.xml
View File

@ -8,16 +8,16 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Account tax charts" version="7.0">
<header>
<button string="Open Charts" name="account_tax_chart_open_window" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<group>
<field name="period_id"/>
<label colspan="4" string="(If you do not select period it will take all open periods)"/>
<field name="target_move"/>
</group>
<footer>
<button string="Open Charts" name="account_tax_chart_open_window" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</footer>
</form>
</field>
</record>

8
addons/account/wizard/account_unreconcile_view.xml
View File

@ -8,13 +8,13 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Unreconciliation" version="7.0">
<header>
<separator string="Unreconciliate Transactions"/>
<label string="If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disabled"/>
<footer>
<button string="Unreconcile" name="trans_unrec" type="object" default_focus="1" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<separator string="Unreconciliate Transactions"/>
<label string="If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disabled"/>
</footer>
</form>
</field>
</record>

16
addons/account/wizard/account_use_model_view.xml
View File

@ -8,16 +8,16 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Create Entries From Models" version="7.0">
<header>
<button string="Create Entries" name="create_entries" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<separator string="This wizard will create recurring accounting entries"/>
<label string="Create manual recurring entries in a chosen journal."/>
<group>
<field name="model"/>
</group>
<footer>
<button string="Create Entries" name="create_entries" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</footer>
</form>
</field>
</record>
@ -40,12 +40,12 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Use Model" version="7.0">
<header>
<label string = "Are you sure you want to create entries?"/>
<footer>
<button string="Ok" name="create_entries" type="object" default_focus='1' class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<label string = "Are you sure you want to create entries?"/>
</footer>
</form>
</field>
</record>

42
addons/account/wizard/account_validate_move_view.xml
View File

@ -8,19 +8,19 @@
<field name="model">validate.account.move</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Post Journal Entries" version="7.0">
<header>
<button string="Approve" name="validate_move" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<separator string="Post Journal Entries of a Journal"/>
<label string="All draft account entries in this journal and period will be validated. It means you won't be able to modify their accounting fields anymore."/>
<group>
<field name="journal_id"/>
<field name="period_id"/>
</group>
</form>
<form string="Post Journal Entries" version="7.0">
<separator string="Post Journal Entries of a Journal"/>
<label string="All draft account entries in this journal and period will be validated. It means you won't be able to modify their accounting fields anymore."/>
<group>
<field name="journal_id"/>
<field name="period_id"/>
</group>
<footer>
<button string="Approve" name="validate_move" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</footer>
</form>
</field>
</record>
@ -47,15 +47,15 @@
<field name="model">validate.account.move.lines</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Post Journal Entries" version="7.0">
<header>
<button string="Approve" name="validate_move_lines" type="object" default_focus="1" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<form string="Post Journal Entries" version="7.0">
<separator string="Post Journal Entries"/>
<label string="All selected journal entries will be validated and posted. It means you won't be able to modify their accounting fields anymore."/>
</form>
<label string="All selected journal entries will be validated and posted. It means you won't be able to modify their accounting fields anymore."/>
<footer>
<button string="Approve" name="validate_move_lines" type="object" default_focus="1" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</footer>
</form>
</field>
</record>

10
addons/account/wizard/account_vat_view.xml
View File

@ -8,11 +8,6 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Taxes Report" version="7.0">
<header>
<button name="create_vat" string="Print Tax Statement" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<label colspan="4" string="This menu prints a VAT declaration based on invoices or payments. Select one or several periods of the fiscal year. The information required for a tax declaration is automatically generated by OpenERP from invoices (or payments, in some countries). This data is updated in real time. That’s very useful because it enables you to preview at any time the tax that you owe at the start and end of the month or quarter."/>
<group string="Taxes Report" col="4">
<field name="chart_tax_id" widget='selection'/>
@ -25,6 +20,11 @@
<field name="period_from" domain="[('fiscalyear_id', '=', fiscalyear_id)]"/>
<field name="period_to" domain="[('fiscalyear_id', '=', fiscalyear_id)]"/>
</group>
<footer>
<button name="create_vat" string="Print Tax Statement" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</footer>
</form>
</field>
</record>

10
addons/account_analytic_plans/wizard/account_crossovered_analytic_view.xml
View File

@ -8,11 +8,6 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Crossovered Analytic" version="7.0">
<header>
<button name="print_report" string="Print" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<group col="4">
<field name="date1"/>
<field name="date2"/>
@ -21,6 +16,11 @@
</group><group string="Analytic Journal">
<field name="journal_ids" colspan="2" nolabel="1"/>
</group>
<footer>
<button name="print_report" string="Print" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</footer>
</form>
</field>
</record>

6
addons/account_analytic_plans/wizard/analytic_plan_create_model_view.xml
View File

@ -7,12 +7,12 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Distribution Model Saved" version="7.0">
<header>
<label string="Save This Distribution as a Model"/>
<footer>
<button string="Ok" type="object" name="activate" default_focus="1" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<label string="Save This Distribution as a Model"/>
</footer>
</form>
</field>
</record>

4
addons/account_asset/i18n/mn.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-07-10 05:34+0000\n"
"X-Generator: Launchpad (build 15558)\n"
"X-Launchpad-Export-Date: 2012-07-11 05:15+0000\n"
"X-Generator: Launchpad (build 15593)\n"
#. module: account_asset
#: view:account.asset.asset:0

10
addons/account_asset/wizard/account_asset_change_duration_view.xml
View File

@ -8,11 +8,6 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Modify Asset" version="7.0">
<header>
<button name="modify" string="Modify" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<group string="Asset Durations to Modify" col="4">
<field name="name" colspan="4"/>
<group colspan="2" col="2">
@ -23,6 +18,11 @@
</group>
<separator string="Notes"/>
<field name="note"/>
<footer>
<button name="modify" string="Modify" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</footer>
</form>
</field>
</record>

10
addons/account_asset/wizard/wizard_asset_compute_view.xml
View File

@ -7,16 +7,16 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Compute Asset" version="7.0">
<header>
<button string="Compute" name="asset_compute" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<separator string="Post Depreciation Lines"/>
<label string="This wizard will post the depreciation lines of running assets that belong to the selected period."/>
<group>
<field name="period_id"/>
</group>
<footer>
<button string="Compute" name="asset_compute" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</footer>
</form>
</field>
</record>

10
addons/account_budget/wizard/account_budget_analytic_view.xml
View File

@ -8,15 +8,15 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Select Dates Period" version="7.0">
<header>
<button name="check_report" string="Print" type="object" default_focus="1" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<group string="This wizard is used to print budget" col="4">
<field name="date_from"/>
<field name="date_to"/>
</group>
<footer>
<button name="check_report" string="Print" type="object" default_focus="1" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</footer>
</form>
</field>
</record>

10
addons/account_budget/wizard/account_budget_crossovered_report_view.xml
View File

@ -8,15 +8,15 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Select Dates Period" version="7.0">
<header>
<button name="check_report" string="Print" type="object" default_focus="1" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<group string="This wizard is used to print budget" col="4">
<field name="date_from"/>
<field name="date_to"/>
</group>
<footer>
<button name="check_report" string="Print" type="object" default_focus="1" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</footer>
</form>
</field>
</record>

10
addons/account_budget/wizard/account_budget_crossovered_summary_report_view.xml
View File

@ -8,15 +8,15 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Select Dates Period" version="7.0">
<header>
<button name="check_report" string="Print" type="object" default_focus="1" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<group string="This wizard is used to print summary of budgets">
<field name="date_from"/>
<field name="date_to"/>
</group>
<footer>
<button name="check_report" string="Print" type="object" default_focus="1" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</footer>
</form>
</field>
</record>

10
addons/account_budget/wizard/account_budget_report_view.xml
View File

@ -8,15 +8,15 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Select Dates Period" version="7.0">
<header>
<button name="check_report" string="Print" type="object" default_focus="1" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<group string="Print Budgets" col="4">
<field name="date_from"/>
<field name="date_to"/>
</group>
<footer>
<button name="check_report" string="Print" type="object" default_focus="1" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</footer>
</form>
</field>
</record>

10
addons/account_followup/wizard/account_followup_print_view.xml
View File

@ -8,17 +8,17 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Send follow-ups" version="7.0">
<header>
<button name="do_continue" string="Continue" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<separator string="Send Follow-ups"/>
<label string ="This feature allows you to send reminders to partners with pending invoices. You can send them the default message for unpaid invoices or manually enter a message should you need to remind them of a specific information."/>
<group col="4">
<field name="followup_id"/>
<field name="date"/>
</group>
<footer>
<button name="do_continue" string="Continue" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</footer>
</form>
</field>
</record>

20
addons/account_payment/wizard/account_payment_create_order_view.xml
View File

@ -8,14 +8,14 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Search Payment lines" version="7.0">
<header>
<button name="search_entries" string="Search" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<group>
<field name="duedate" />
</group>
<footer>
<button name="search_entries" string="Search" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</footer>
</form>
</field>
</record>
@ -26,14 +26,14 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Search Payment lines" version="7.0">
<header>
<button name="create_payment" string="_Add to payment order" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<group string="Entries">
<field name="entries"/>
</group>
<footer>
<button name="create_payment" string="_Add to payment order" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</footer>
</form>
</field>
</record>

6
addons/account_payment/wizard/account_payment_pay_view.xml
View File

@ -8,12 +8,12 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Make Payment" version="7.0">
<header>
<separator string="Are you sure you want to make payment?"/>
<footer>
<button name="launch_wizard" string="Yes" type="object" default_focus="1" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<separator string="Are you sure you want to make payment?"/>
</footer>
</form>
</field>
</record>

10
addons/account_payment/wizard/account_payment_populate_statement_view.xml
View File

@ -8,14 +8,14 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Populate Statement:" version="7.0">
<header>
<button name="populate_statement" string="ADD" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<group>
<field name="lines"/>
</group>
<footer>
<button name="populate_statement" string="ADD" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</footer>
</form>
</field>
</record>

18
addons/account_voucher/wizard/account_statement_from_invoice_view.xml
View File

@ -7,15 +7,15 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Import Invoices in Statement" version="7.0">
<header>
<button string="Go" name="search_invoices" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<group>
<field name="date"/>
<field name="journal_ids" domain="[('type','in',['sale','purchase','cash'])]"/>
</group>
<footer>
<button string="Go" name="search_invoices" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</footer>
</form>
</field>
</record>
@ -35,13 +35,13 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Import Entries" version="7.0">
<header>
<separator string="Payable and Receivables"/>
<field height="300" width="700" name="line_ids" domain="[('account_id.type','in',['receivable','payable']),('reconcile_id','=',False), ('reconcile_partial_id','=',False), ('state', '=', 'valid')]"/>
<footer>
<button string="Ok" name="populate_statement" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<separator string="Payable and Receivables"/>
<field height="300" width="700" name="line_ids" domain="[('account_id.type','in',['receivable','payable']),('reconcile_id','=',False), ('reconcile_partial_id','=',False), ('state', '=', 'valid')]"/>
</footer>
</form>
</field>
</record>

8
addons/account_voucher/wizard/account_voucher_unreconcile_view.xml
View File

@ -8,13 +8,13 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Unreconciliation" version="7.0">
<header>
<separator string="Unreconciliation Transactions" />
<label string="If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disable"/>
<footer>
<button name="trans_unrec" default_focus="1" string="Unreconcile" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<separator string="Unreconciliation Transactions" />
<label string="If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disable"/>
</footer>
</form>
</field>
</record>

10
addons/audittrail/wizard/audittrail_view_log_view.xml
View File

@ -10,15 +10,15 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Audit Logs" version="7.0">
<header>
<button string="Open Logs" name="log_open_window" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<group col="4">
<field name="from"/>
<field name="to"/>
</group>
<footer>
<button string="Open Logs" name="log_open_window" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</footer>
</form>
</field>
</record>

10
addons/base_calendar/wizard/base_calendar_invite_attendee_view.xml
View File

@ -10,11 +10,6 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Invite People" version="7.0">
<header>
<button name="do_invite" string="Invite" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<separator string="Invite People" colspan="4"/>
<field name="type"/>
<field name="send_mail"/>
@ -36,6 +31,11 @@
</group>
</page>
</notebook>
<footer>
<button name="do_invite" string="Invite" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</footer>
</form>
</field>
</record>

6
addons/base_module_doc_rst/wizard/generate_relation_graph_view.xml
View File

@ -8,12 +8,12 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Generate Relationship Graph" version="7.0">
<header>
<separator string="Relationship Graphs" colspan="6"/>
<footer>
<button name="get_graph" string="Create Graphs" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<separator string="Relationship Graphs" colspan="6"/>
</footer>
</form>
</field>
</record>

10
addons/base_module_record/wizard/base_module_record_data_view.xml
View File

@ -8,11 +8,6 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Data Recording" version="7.0">
<header>
<button name="record_objects" string="Record" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<group>
<field name="check_date"/>
<field name="filter_cond"/>
@ -20,6 +15,11 @@
<separator string="Choose objects to record"/>
<field name="objects"/>
<group><field name="info_yaml"/></group>
<footer>
<button name="record_objects" string="Record" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</footer>
</form>
</field>
</record>

20
addons/base_module_record/wizard/base_module_record_object_view.xml
View File

@ -8,11 +8,6 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Objects Recording" version="7.0">
<header>
<button name="record_objects" string="Record" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<group>
<field name="check_date"/>
<field name="filter_cond"/>
@ -20,6 +15,11 @@
<separator string="Choose objects to record"/>
<field name="objects"/>
<group><field name="info_yaml"/></group>
<footer>
<button name="record_objects" string="Record" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</footer>
</form>
</field>
</record>
@ -86,11 +86,6 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Module Recording" version="7.0">
<header>
<button string="Continue" name="inter_call" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<group string="Module Information">
<field name="name"/>
<field name="directory_name"/>
@ -102,6 +97,11 @@
</group>
<separator string="Description"/>
<field name="description"/>
<footer>
<button string="Continue" name="inter_call" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</footer>
</form>
</field>
</record>

10
addons/base_module_record/wizard/base_module_save_view.xml
View File

@ -8,16 +8,16 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Module Recording" version="7.0">
<header>
<button name="record_save" string="Continue" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<group string="Recording Information">
<field name="info_status"/>
<field name="info_text"/>
<field name="info_yaml"/>
</group>
<footer>
<button name="record_save" string="Continue" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</footer>
</form>
</field>
</record>

10
addons/base_report_designer/wizard/base_report_design_view.xml
View File

@ -7,15 +7,15 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Get a report" version="7.0">
<header>
<group string="Select your report">
<field name="report_id"/>
</group>
<footer>
<button name="get_report" string="Continue" type="object" class="oe_highlight"/>
<button name="upload_report" string="Upload the modified report" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<group string="Select your report">
<field name="report_id"/>
</group>
</footer>
</form>
</field>
</record>

24
addons/base_setup/i18n/ja.po
View File

@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-02-08 00:36+0000\n"
"PO-Revision-Date: 2012-06-25 05:03+0000\n"
"Last-Translator: Tomomi Mengelberg <tomomi.mengelberg@aquasys.co.jp>\n"
"PO-Revision-Date: 2012-07-12 01:34+0000\n"
"Last-Translator: Akira Hiyama <Unknown>\n"
"Language-Team: Japanese <ja@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-06-26 05:22+0000\n"
"X-Generator: Launchpad (build 15482)\n"
"X-Launchpad-Export-Date: 2012-07-12 04:40+0000\n"
"X-Generator: Launchpad (build 15593)\n"
#. module: base_setup
#: field:user.preferences.config,menu_tips:0
@ -200,17 +200,17 @@ msgstr "どのように顧客を呼びますか"
#. module: base_setup
#: field:migrade.application.installer.modules,quickbooks_ippids:0
msgid "Quickbooks Ippids"
msgstr "Quickbooks lppids"
msgstr "QuickBooksのIPP / IDS"
#. module: base_setup
#: selection:base.setup.terminology,partner:0
msgid "Client"
msgstr "取引先"
msgstr "顧客"
#. module: base_setup
#: field:migrade.application.installer.modules,import_saleforce:0
msgid "Import Saleforce"
msgstr "Saleforceを取り込む"
msgstr "Salesforceのインポート"
#. module: base_setup
#: field:user.preferences.config,context_tz:0
@ -249,22 +249,22 @@ msgstr "user.preferences.config"
#. module: base_setup
#: model:ir.actions.act_window,name:base_setup.action_config_access_other_user
msgid "Create Additional Users"
msgstr "追加ユーザを作成します。"
msgstr "追加ユーザの作成"
#. module: base_setup
#: model:ir.actions.act_window,name:base_setup.action_import_create_installer
msgid "Create or Import Customers"
msgstr "顧客を作成または取り込みます。"
msgstr "顧客の作成 / インポート"
#. module: base_setup
#: field:migrade.application.installer.modules,import_sugarcrm:0
msgid "Import Sugarcrm"
msgstr "SugarCRMを取り込みます。"
msgstr "SugarCRMのインポート"
#. module: base_setup
#: help:product.installer,customers:0
msgid "Import or create customers"
msgstr "顧客を取り込みまたは作成します。"
msgstr "顧客の作成 / インポート"
#. module: base_setup
#: selection:user.preferences.config,view:0
@ -279,7 +279,7 @@ msgstr "SugarCRMを取り込むために"
#. module: base_setup
#: selection:base.setup.terminology,partner:0
msgid "Partner"
msgstr "パートナー"
msgstr "パートナ"
#. module: base_setup
#: view:base.setup.terminology:0

10
addons/board/wizard/board_menu_create_view.xml
View File

@ -10,15 +10,15 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Create Menu For Dashboard" version="7.0">
<header>
<button string="Create Menu" name="board_menu_create" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<group colspan="4" string="Menu Information">
<field name="menu_name"/>
<field name="menu_parent_id"/>
</group>
<footer>
<button string="Create Menu" name="board_menu_create" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</footer>
</form>
</field>
</record>

6
addons/caldav/wizard/caldav_browse_view.xml
View File

@ -8,9 +8,6 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Browse Caldav" version="7.0">
<header>
<button special="cancel" string="_Close" icon="gtk-close"/>
</header>
<sheet>
<group>
<separator string="Browse Caldav" colspan="4"/>
@ -37,6 +34,9 @@
</group>
</sheet>
<footer>
<button special="cancel" string="_Close" icon="gtk-close"/>
</footer>
</form>
</field>
</record>

10
addons/caldav/wizard/calendar_event_import_view.xml
View File

@ -7,15 +7,15 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Import ICS" version="7.0">
<header>
<button name="process_imp_ics" string="_Import" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<group colspan="4" >
<separator string="Select ICS File"/>
<field name="file_path" colspan="4" width="500" nolabel="1"/>
</group>
<footer>
<button name="process_imp_ics" string="_Import" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</footer>
</form>
</field>
</record>

10
addons/caldav/wizard/calendar_event_subscribe_view.xml
View File

@ -7,15 +7,15 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Subscribe to Remote Calendar" version="7.0">
<header>
<button name="process_imp_ics" string="_Subscribe" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<group colspan="4" >
<separator string="Provide Path for Remote Calendar"/>
<field name="url_path" colspan="4" width="300" nolabel="1" widget="url"/>
</group>
<footer>
<button name="process_imp_ics" string="_Subscribe" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</footer>
</form>
</field>
</record>

10
addons/crm/wizard/crm_add_note_view.xml
View File

@ -10,15 +10,15 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Add Note" version="7.0">
<header>
<button name="action_add" type="object" string="_Add" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</header>
<group>
<separator string="Add Note"/>
<field name="body"/>
</group>
<footer>
<button name="action_add" type="object" string="_Add" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</footer>
</form>
</field>
</record>

20
addons/crm/wizard/crm_lead_to_opportunity_view.xml
View File

@ -6,11 +6,6 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Convert to Opportunity" version="7.0">
<header>
<button name="action_apply" string="Create Opportunity" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</header>
<field name="action"/>
<group attrs="{'invisible':[('action','!=','exist')]}">
<field name="partner_id" attrs="{'required': [('action', '=', 'exist')]}"/>
@ -27,6 +22,11 @@
<field name="section_id" />
</tree>
</field>
<footer>
<button name="action_apply" string="Create Opportunity" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</footer>
</form>
</field>
</record>
@ -37,11 +37,6 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Convert to Opportunity" version="7.0">
<header>
<button name="mass_convert" string="Convert into Opportunities" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</header>
<field name="action"/>
<field name="name" colspan="4"/>
<group string="Assigned Opportunities to">
@ -53,6 +48,11 @@
<field name="name" />
</tree>
</field>
<footer>
<button name="mass_convert" string="Convert into Opportunities" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</footer>
</form>
</field>
</record>

10
addons/crm/wizard/crm_lead_to_partner_view.xml
View File

@ -9,16 +9,16 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Create a Partner" version="7.0">
<header>
<button name="make_partner" string="Continue" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</header>
<group col="4">
<separator string="Create a Partner"/>
<field name="action"/>
<field name="partner_id" attrs="{'required': [('action', '=', 'exist')], 'invisible':[('action','!=','exist')]}"/>
</group>
<footer>
<button name="make_partner" string="Continue" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</footer>
</form>
</field>
</record>

10
addons/crm/wizard/crm_merge_opportunities_view.xml
View File

@ -10,11 +10,6 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Merge Opportunities" version="7.0">
<header>
<button name="action_merge" type="object" string="_Merge" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</header>
<separator string="Select Opportunities"/>
<field name="opportunity_ids">
<tree>
@ -24,6 +19,11 @@
<field name="section_id" />
</tree>
</field>
<footer>
<button name="action_merge" type="object" string="_Merge" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</footer>
</form>
</field>
</record>

12
addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
View File

@ -10,12 +10,6 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Schedule/Log a Call" version="7.0">
<header>
<button name="action_schedule" type="object" string="Log call" attrs="{'invisible' : [('action', '!=', 'log')]}" class="oe_highlight"/>
<button name="action_schedule" type="object" string="Schedule Call" attrs="{'invisible' : [('action', '!=', 'schedule')]}" class="oe_highlight" />
or
<button name="action_cancel" string="Cancel" class="oe_link" special="cancel" />
</header>
<group>
<group>
<field name="action"/>
@ -34,6 +28,12 @@
</group>
</group>
<field name="note" placeholder="Call Description" />
<footer>
<button name="action_schedule" type="object" string="Log call" attrs="{'invisible' : [('action', '!=', 'log')]}" class="oe_highlight"/>
<button name="action_schedule" type="object" string="Schedule Call" attrs="{'invisible' : [('action', '!=', 'schedule')]}" class="oe_highlight" />
or
<button name="action_cancel" string="Cancel" class="oe_link" special="cancel" />
</footer>
</form>
</field>
</record>

10
addons/crm/wizard/crm_partner_to_opportunity_view.xml
View File

@ -9,17 +9,17 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Create Opportunity" version="7.0">
<header>
<button name="make_opportunity" string="Create Opportunity" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</header>
<group col="4">
<field name="name"/>
<field name="partner_id"/>
<field name="planned_revenue"/>
<field name="probability"/>
</group>
<footer>
<button name="make_opportunity" string="Create Opportunity" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</footer>
</form>
</field>
</record>

6
addons/crm/wizard/crm_phonecall_to_meeting_view.xml
View File

@ -11,13 +11,13 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Convert To Meeting" version="7.0">
<header>
<label string="Are you sure to schedule a Meeting for this Phonecall?"/>
<footer>
<button name="action_make_meeting" type="object"
string="_Schedule" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</header>
<label string="Are you sure to schedule a Meeting for this Phonecall?"/>
</footer>
</form>
</field>
</record>

10
addons/crm/wizard/crm_phonecall_to_opportunity_view.xml
View File

@ -10,17 +10,17 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Convert To Opportunity " version="7.0">
<header>
<button name="make_opportunity" type="object" string="_Convert" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</header>
<group col="4">
<field name="name"/>
<field name="partner_id" />
<field name="planned_revenue"/>
<field name="probability"/>
</group>
<footer>
<button name="make_opportunity" type="object" string="_Convert" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</footer>
</form>
</field>
</record>

20
addons/crm/wizard/crm_phonecall_to_partner_view.xml
View File

@ -9,14 +9,14 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Create a Partner" version="7.0">
<header>
<button name="open_create_partner" string="Create Partner" type="object" groups="base.group_partner_manager" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</header>
<label string="Are you sure you want to create a partner based on this Phonecall ?"/>
<newline/>
<label string="You may have to verify that this partner does not exist already."/>
<footer>
<button name="open_create_partner" string="Create Partner" type="object" groups="base.group_partner_manager" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</footer>
</form>
</field>
</record>
@ -29,15 +29,15 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Create a Partner" version="7.0">
<header>
<button name="make_partner" string="Continue" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</header>
<group>
<field name="action"/>
<field name="partner_id" attrs="{'required':[('action','=','exist')],'invisible':[('action','!=','exist')]}" />
</group>
<footer>
<button name="make_partner" string="Continue" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</footer>
</form>
</field>
</record>

12
addons/crm/wizard/crm_phonecall_to_phonecall_view.xml
View File

@ -10,12 +10,6 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Schedule/Log a Call" version="7.0">
<header>
<button name="action_schedule" type="object" string="Log Call" attrs="{'invisible' : [('action', '!=', 'log')]}" class="oe_highlight"/>
<button name="action_schedule" type="object" string="Schedule Call" attrs="{'invisible' : [('action', '!=', 'schedule')]}" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</header>
<group col="4">
<field name="action"/>
<field name="name"/>
@ -24,6 +18,12 @@
<field name="user_id" />
<field name="section_id"/>
</group>
<footer>
<button name="action_schedule" type="object" string="Log Call" attrs="{'invisible' : [('action', '!=', 'log')]}" class="oe_highlight"/>
<button name="action_schedule" type="object" string="Schedule Call" attrs="{'invisible' : [('action', '!=', 'schedule')]}" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</footer>
</form>
</field>
</record>

10
addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml
View File

@ -9,11 +9,6 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Send Mail" version="7.0">
<header>
<button name="action_forward" string="Send" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</header>
<separator string="Forward to Partner" colspan="4" />
<group col="4" colspan="6">
<field name="history" colspan="2" on_change="on_change_history(history, context)"/>
@ -46,6 +41,11 @@
<field name="attachment_ids" colspan="4" nolabel="1"/>
</page>
</notebook>
<footer>
<button name="action_forward" string="Send" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</footer>
</form>
</field>
</record>

18
addons/crm_profiling/wizard/open_questionnaire_view.xml
View File

@ -8,14 +8,14 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Questionnaires" version="7.0">
<header>
<button name="build_form" string="Open Questionnaire" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</header>
<group>
<field name="questionnaire_id"/>
</group>
<footer>
<button name="build_form" string="Open Questionnaire" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</footer>
</form>
</field>
</record>
@ -35,13 +35,13 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form version="7.0">
<header>
<separator colspan="4" string="Questionnaire"/>
<field name="question_ans_ids" colspan="4" nolabel="1" mode="tree,form" width="550" height="200"/>
<footer>
<button name="questionnaire_compute" string="Save Data" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</header>
<separator colspan="4" string="Questionnaire"/>
<field name="question_ans_ids" colspan="4" nolabel="1" mode="tree,form" width="550" height="200"/>
</footer>
</form>
</field>
</record>

10
addons/document_ftp/wizard/ftp_browse_view.xml
View File

@ -7,14 +7,14 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Browse Document" version="7.0">
<header>
<button name="browse_ftp" string="_Browse" type="object" icon="gtk-ok" class="oe_highlight" />
or
<button string="Cancel" class="oe_link" special="cancel" />
</header>
<group>
<field name="url" widget="url"/>
</group>
<footer>
<button name="browse_ftp" string="_Browse" type="object" icon="gtk-ok" class="oe_highlight" />
or
<button string="Cancel" class="oe_link" special="cancel" />
</footer>
</form>
</field>
</record>

12
addons/email_template/wizard/email_compose_message_view.xml
View File

@ -9,12 +9,12 @@
<field name="inherit_id" ref="mail.email_compose_message_wizard_form"/>
<field name="arch" type="xml">
<data>
<xpath expr="//form/header/button" position="before">
<field name="use_template" invisible="1"/>
<button icon="gtk-paste" type="object" name="template_toggle"
string="" help="Use a message template" />
<button icon="gtk-save" type="object" name="save_as_template"
string="" help="Save as a new template"/>
<xpath expr="//form/footer/button" position="before">
<field name="use_template" invisible="1"/>
<button icon="gtk-paste" type="object" name="template_toggle"
string="" help="Use a message template" />
<button icon="gtk-save" type="object" name="save_as_template"
string="" help="Save as a new template"/>
</xpath>
<xpath expr="//form/notebook" position="after">
<group attrs="{'invisible':[('use_template','=',False)]}" colspan="4" col="4">

6
addons/event/wizard/event_confirm_view.xml
View File

@ -8,12 +8,12 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Event Confirmation" version="7.0">
<header>
<label string="Warning: This Event has not reached its Minimum Registration Limit. Are you sure you want to confirm it?"/>
<footer>
<button name="confirm" string="Confirm Anyway" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</header>
<label string="Warning: This Event has not reached its Minimum Registration Limit. Are you sure you want to confirm it?"/>
</footer>
</form>
</field>
</record>

10
addons/event_project/wizard/event_project_retro_view.xml
View File

@ -8,16 +8,16 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Retro-Planning" version="7.0">
<header>
<button name="create_duplicate" string="Ok" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</header>
<group col="4">
<field name="project_id" colspan="4"/>
<field name="date_start"/>
<field name="date"/>
</group>
<footer>
<button name="create_duplicate" string="Ok" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</footer>
</form>
</field>
</record>

10
addons/google_base_account/wizard/google_login_view.xml
View File

@ -7,15 +7,15 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Google login" version="7.0">
<header>
<button name="login" string="_Login" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</header>
<group>
<field name="user" placeholder="user@gmail.com"/>
<field name="password" password="True"/>
</group>
<footer>
<button name="login" string="_Login" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</footer>
</form>
</field>
</record>

4
addons/hr/hr.py
View File

@ -309,6 +309,10 @@ class res_users(osv.osv):
return user_id
_columns = {
'employee_ids': fields.one2many('hr.employee', 'user_id', 'Related employees'),
}
res_users()

10
addons/hr_attendance/wizard/hr_attendance_bymonth_view.xml
View File

@ -8,15 +8,15 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Print Attendance Report Monthly" version="7.0">
<header>
<button name="print_report" string="Print" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</header>
<group col="4">
<field name="month"/>
<field name="year"/>
</group>
<footer>
<button name="print_report" string="Print" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</footer>
</form>
</field>
</record>

10
addons/hr_attendance/wizard/hr_attendance_byweek_view.xml
View File

@ -7,15 +7,15 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Print Attendance Report Weekly" version="7.0">
<header>
<button name="print_report" string="Print" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</header>
<group>
<field name="init_date"/>
<field name="end_date"/>
</group>
<footer>
<button name="print_report" string="Print" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</footer>
</form>
</field>
</record>

10
addons/hr_attendance/wizard/hr_attendance_error_view.xml
View File

@ -8,17 +8,17 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Print Attendance Report Error" version="7.0">
<header>
<button name="print_report" string="Print" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</header>
<group string="Analysis Information" col="4">
<field name="init_date"/>
<field name="end_date"/>
<field name="max_delay"/>
</group>
<label string="Bellow this delay, the error is considered to be voluntary" colspan="2"/>
<footer>
<button name="print_report" string="Print" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</footer>
</form>
</field>
</record>

12
addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
View File

@ -7,12 +7,6 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Sign in / Sign out" version="7.0">
<header>
<button string="Sign in" name="si_check" type="object" class="oe_highlight"/>
<button string="Sign out" name="so_check" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</header>
<group>
<separator colspan="4" string="Sign in / Sign out"/>
<label colspan="4" nolabel="1" string="If you need your staff to sign in when they arrive at work and sign out again at the end of the day, OpenERP allows you to manage this with this tool. If each employee has been linked to a system user, then they can encode their time with this action button."/>
@ -22,6 +16,12 @@
<field name="name" />
<field name="state" />
</group>
<footer>
<button string="Sign in" name="si_check" type="object" class="oe_highlight"/>
<button string="Sign out" name="so_check" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</footer>
</form>
</field>
</record>

10
addons/hr_evaluation/wizard/hr_evaluation_mail_view.xml
View File

@ -8,14 +8,14 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Evaluation Reminders" version="7.0">
<header>
<button name="send_mail" string="Send Mail" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</header>
<group string="Send Evaluation Reminder">
<field name="evaluation_id"/>
</group>
<footer>
<button name="send_mail" string="Send Mail" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</footer>
</form>
</field>
</record>

8
addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml
View File

@ -8,15 +8,15 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Leaves by Department" version="7.0">
<header>
<button name="print_report" string="Print" type="object" class="oe_highlight"/> or
<button string="Cancel" special="cancel" class="oe_link"/>
</header>
<group>
<field name="date_from" />
<field name="holiday_type"/>
<field name="depts"/>
</group>
<footer>
<button name="print_report" string="Print" type="object" class="oe_highlight"/> or
<button string="Cancel" special="cancel" class="oe_link"/>
</footer>
</form>
</field>
</record>

10
addons/hr_holidays/wizard/hr_holidays_summary_employees_view.xml
View File

@ -8,11 +8,6 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Leaves Summary" version="7.0">
<header>
<button name="print_report" string="Print" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</header>
<group col="4" colspan="6">
<field name="date_from"/>
<newline/>
@ -20,6 +15,11 @@
<newline/>
<field name="emp" invisible="True"/>
</group>
<footer>
<button name="print_report" string="Print" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</footer>
</form>
</field>
</record>

6
addons/hr_recruitment/wizard/hr_recruitment_create_partner_job_view.xml
View File

@ -8,12 +8,12 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Convert To Partner" version="7.0">
<header>
<label string="Are you sure you want to create a contact based on this job request ?"/>
<footer>
<button name="make_order" string="Create Contact" type="object" groups="base.group_partner_manager" class="oe_highlight"/>
<label string="or" groups="base.group_partner_manager"/>
<button string="Cancel" class="oe_link" special="cancel" />
</header>
<label string="Are you sure you want to create a contact based on this job request ?"/>
</footer>
</form>
</field>
</record>

10
addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
View File

@ -9,16 +9,16 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Monthly Employee Timesheet" version="7.0">
<header>
<button string="Print" name="print_report" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</header>
<group colspan="4">
<field name="month"/>
<field name="year"/>
<field name="employee_id" colspan="3"/>
</group>
<footer>
<button string="Print" name="print_report" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</footer>
</form>
</field>
</record>

8
addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
View File

@ -9,10 +9,6 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Monthly Employees Timesheet" version="7.0">
<header>
<button string="Print" name="print_report" type="object" class="oe_highlight"/> or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<sheet>
<group>
<label for="month" string="Period"/>
@ -25,6 +21,10 @@
<field name="employee_ids" nolabel="1"/>
</group>
</sheet>
<footer>
<button string="Print" name="print_report" type="object" class="oe_highlight"/> or
<button string="Cancel" class="oe_link" special="cancel"/>
</footer>
</form>
</field>
</record>

32
addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml
View File

@ -7,15 +7,15 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Sign In/Out by Project" version="7.0">
<header>
<button string="Sign in / Sign out" name="check_state" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</header>
<group>
<separator colspan="4" string="Sign In/Out by Project"/>
<label colspan="4" nolabel="1" string="Employees can encode their time spent on the different projects they are assigned on. A project is an analytic account and the time spent on a project generates costs on the analytic account. This feature allows to record at the same time the attendance and the timesheet."/>
</group>
<footer>
<button string="Sign in / Sign out" name="check_state" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</footer>
</form>
</field>
</record>
@ -26,11 +26,6 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Sign In/Out by Project" version="7.0">
<header>
<button string="Start Working" name="sign_in_result" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</header>
<group colspan="4" >
<separator string="Sign in" colspan="4"/>
<field name="name" readonly="True" />
@ -40,6 +35,11 @@
<field name="date"/>
<label string="(Keep empty for current time)" colspan="2"/>
</group>
<footer>
<button string="Start Working" name="sign_in_result" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</footer>
</form>
</field>
</record>
@ -60,12 +60,6 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Sign In/Out by Project" version="7.0">
<header>
<button string="Change Work" name="sign_out_result" type="object" class="oe_highlight"/>
<button string="Stop Working" name="sign_out_result_end" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</header>
<group colspan="4" >
<separator string="General Information" colspan="4" />
<field name="name" readonly="True" />
@ -80,6 +74,12 @@
<field name="analytic_amount"/>
</group>
<footer>
<button string="Change Work" name="sign_out_result" type="object" class="oe_highlight"/>
<button string="Stop Working" name="sign_out_result_end" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</footer>
</form>
</field>
</record>

22
addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml
View File

@ -7,27 +7,27 @@
<field name="model">hr.timesheet.analytic.profit</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Timesheet Profit" version="7.0">
<header>
<button name="print_report" string="Print" colspan="1" type="object" class="oe_highlight"/> or
<button special="cancel" string="Cancel" class="oe_link"/>
</header>
<form string="Timesheet Profit" version="7.0">
<sheet>
<group>
<label for="date_from" string="Duration" />
<label for="date_from" string="Duration" />
<div>
<field name="date_from" nolabel="1" class="oe_inline" />
<field name="date_from" nolabel="1" class="oe_inline" />
- <field name="date_to" nolabel="1" class="oe_inline"/>
</div>
</group>
<group>
<separator string="Journals" colspan="4"/>
<field name="journal_ids" colspan="4" nolabel="1"/>
<field name="journal_ids" colspan="4" nolabel="1"/>
<separator string="Users" colspan="4"/>
<field name="employee_ids" colspan="4" nolabel="1"/>
</group>
<field name="employee_ids" colspan="4" nolabel="1"/>
</group>
</sheet>
</form>
<footer>
<button name="print_report" string="Print" colspan="1" type="object" class="oe_highlight"/> or
<button special="cancel" string="Cancel" class="oe_link"/>
</footer>
</form>
</field>
</record>

10
addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_final_view.xml
View File

@ -27,11 +27,6 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Invoice contract" version="7.0">
<header>
<button name="do_create" string="Create Invoice" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</header>
<separator string="Do you want to display work details on the invoice?" colspan="4"/>
<field name="date"/>
<field name="time"/>
@ -39,6 +34,11 @@
<field name="price"/>
<separator string="Force to use a special product" colspan="4"/>
<field name="product"/>
<footer>
<button name="do_create" string="Create Invoice" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</footer>
</form>
</field>
</record>

10
addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml
View File

@ -8,11 +8,6 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Create Invoice" version="7.0">
<header>
<button name="do_create" string="Create Invoices" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</header>
<notebook>
<page string="Billing Data">
<group>
@ -28,6 +23,11 @@
</group>
</page>
</notebook>
<footer>
<button name="do_create" string="Create Invoices" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</footer>
</form>
</field>
</record>

10
addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml
View File

@ -7,14 +7,14 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="My Current Timesheet" version="7.0">
<header>
<button name="open_timesheet" string="Open" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</header>
<group>
<separator string="It will open your current timesheet"/>
</group>
<footer>
<button name="open_timesheet" string="Open" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</footer>
</form>
</field>
</record>

20
addons/import_google/wizard/import_google_data_view.xml
View File

@ -7,11 +7,6 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Import contacts from a google account" version="7.0">
<header>
<button name="import_google" string="_Import Contacts" type="object" class="oe_highlight" />
or
<button string="Cancel" class="oe_link" special="cancel" />
</header>
<group colspan="4" col="4" width="430">
<field name="group_name" colspan="4"/>
<newline/>
@ -21,6 +16,11 @@
<field name="supplier" colspan="4"/>
</group>
</group>
<footer>
<button name="import_google" string="_Import Contacts" type="object" class="oe_highlight" />
or
<button string="Cancel" class="oe_link" special="cancel" />
</footer>
</form>
</field>
</record>
@ -33,14 +33,14 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Import Google Calendar Events" version="7.0">
<header>
<button name="import_google" string="_Import Events" type="object" class="oe_highlight" />
or
<button string="Cancel" class="oe_link" special="cancel" />
</header>
<group colspan="4" col="4" width="320">
<field name="calendar_name" />
</group>
<footer>
<button name="import_google" string="_Import Events" type="object" class="oe_highlight" />
or
<button string="Cancel" class="oe_link" special="cancel" />
</footer>
</form>
</field>
</record>

10
addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml
View File

@ -8,11 +8,6 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Periodical VAT Declaration" version="7.0">
<header>
<button name="create_xml" string="Create XML" type="object" default_focus="1" class="oe_highlight" />
or
<button string="Cancel" class="oe_link" special="cancel" />
</header>
<group>
<group string="Declare Periodical VAT">
<field name="period_id" widget="selection"/>
@ -26,6 +21,11 @@
</group>
<separator string="Comments"/>
<field name="comments"/>
<footer>
<button name="create_xml" string="Create XML" type="object" default_focus="1" class="oe_highlight" />
or
<button string="Cancel" class="oe_link" special="cancel" />
</footer>
</form>
</field>
</record>

12
addons/l10n_be/wizard/l10n_be_vat_intra_view.xml
View File

@ -8,12 +8,6 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Partner VAT intra" version="7.0">
<header>
<button name="create_xml" string="Create _XML" type="object" class="oe_highlight"/>
<button name="preview" string="_Preview" type="object" class="oe_highlight" />
or
<button string="Cancel" class="oe_link" special="cancel" />
</header>
<group>
<separator string="Intracom VAT Declaration"/>
</group>
@ -33,6 +27,12 @@
<field name="country_ids" colspan="4" nolabel="1"/>
</page>
</notebook>
<footer>
<button name="create_xml" string="Create _XML" type="object" class="oe_highlight"/>
<button name="preview" string="_Preview" type="object" class="oe_highlight" />
or
<button string="Cancel" class="oe_link" special="cancel" />
</footer>
</form>
</field>
</record>

10
addons/l10n_ch/wizard/bvr_import_view.xml
View File

@ -8,14 +8,14 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="BVR Import" version="7.0">
<header>
<button name="import_bvr" string="Import" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</header>
<group>
<field name="file"/>
</group>
<footer>
<button name="import_bvr" string="Import" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</footer>
</form>
</field>
</record>

10
addons/l10n_ch/wizard/create_dta_view.xml
View File

@ -8,14 +8,14 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="DTA file creation - Results" version="7.0">
<header>
<button name="create_dta" string="Create DTA" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</header>
<group>
<field name="dta_file"/>
</group>
<footer>
<button name="create_dta" string="Create DTA" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</footer>
</form>
</field>
</record>

3023
addons/l10n_fr/plan_comptable_general.xml
View File

File diff suppressed because it is too large Load Diff

Some files were not shown because too many files have changed in this diff Show More