[MERGE] correct fp-style merge
bzr revid: al@openerp.com-20111001192423-01nj3181gw0qbg2j
This commit is contained in:
commit
ac534c9f84
|
@ -2720,7 +2720,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
|
|||
_columns = {
|
||||
'company_id':fields.many2one('res.company', 'Company', required=True),
|
||||
'chart_template_id': fields.many2one('account.chart.template', 'Chart Template', required=True),
|
||||
'bank_accounts_id': fields.one2many('account.bank.accounts.wizard', 'bank_account_id', 'Bank Accounts', required=True),
|
||||
'bank_accounts_id': fields.one2many('account.bank.accounts.wizard', 'bank_account_id', 'Cash and Banks', required=True),
|
||||
'code_digits':fields.integer('# of Digits', required=True, help="No. of Digits to use for account code"),
|
||||
'seq_journal':fields.boolean('Separated Journal Sequences', help="Check this box if you want to use a different sequence for each created journal. Otherwise, all will use the same sequence."),
|
||||
"sale_tax": fields.many2one("account.tax.template", "Default Sale Tax"),
|
||||
|
@ -2768,7 +2768,6 @@ class wizard_multi_charts_accounts(osv.osv_memory):
|
|||
|
||||
def _get_default_accounts(self, cr, uid, context=None):
|
||||
return [
|
||||
{'acc_name': _('Bank Account'),'account_type':'bank'},
|
||||
{'acc_name': _('Cash'),'account_type':'cash'}
|
||||
]
|
||||
|
||||
|
|
|
@ -26,7 +26,7 @@
|
|||
<group colspan="8" position="inside">
|
||||
<group colspan="4" width="600">
|
||||
<field name="charts"/>
|
||||
<group colspan="4" groups="base.group_extended">
|
||||
<group colspan="4" groups="account.group_account_user">
|
||||
<separator col="4" colspan="4" string="Configure Fiscal Year"/>
|
||||
<field name="company_id" colspan="4" widget="selection"/><!-- we assume that this wizard will be run only by administrators and as this field may cause problem if hidden (because of the default company of the user removed from the selection because already configured), we simply choosed to remove the group "multi company" of it -->
|
||||
<field name="date_start" on_change="on_change_start_date(date_start)"/>
|
||||
|
|
|
@ -2388,13 +2388,13 @@
|
|||
</xpath>
|
||||
<group string="res_config_contents" position="replace">
|
||||
<field name="company_id" widget="selection"/> <!-- we assume that this wizard will be run only by administrators and as this field may cause problem if hidden (because of the default company of the user removed from the selection because already configured), we simply choosed to remove the group "multi company" of it -->
|
||||
<field name ="code_digits" groups="base.group_extended"/>
|
||||
<field name ="code_digits" groups="account.group_account_user"/>
|
||||
<field name="chart_template_id" widget="selection" on_change="onchange_chart_template_id(chart_template_id)"/>
|
||||
<field name ="seq_journal" groups="base.group_extended"/>
|
||||
<field name ="seq_journal" groups="account.group_account_user"/>
|
||||
<field name="sale_tax" domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False),('type_tax_use','in',('sale','all'))]"/>
|
||||
<field name="purchase_tax" domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False),('type_tax_use','in',('purchase', 'all'))]"/>
|
||||
<newline/> <!-- extended view because the web UI is not good for one2many -->
|
||||
<field colspan="4" mode="tree" name="bank_accounts_id" nolabel="1" widget="one2many_list" groups="base.group_extended">
|
||||
<field colspan="4" mode="tree" name="bank_accounts_id" nolabel="1" widget="one2many_list" groups="account.group_account_user">
|
||||
<form string="Bank Information">
|
||||
<field name="acc_name"/>
|
||||
<field name="account_type"/>
|
||||
|
|
|
@ -22,8 +22,8 @@
|
|||
<button colspan="1" icon="gtk-close" special="cancel" string="_Close" invisible="not context.get('menu',False)"/>
|
||||
<button name="action_next" icon="gtk-go-forward" type="object" string="Configure" colspan="1" invisible="context.get('menu',False)"/>
|
||||
</xpath>
|
||||
<xpath expr="//button[@string='Skip']" position="replace">
|
||||
<button name="action_skip" icon="gtk-jump-to" special="cancel" type="object" string="Skip" colspan="1" invisible="context.get('menu',False)"/>
|
||||
<xpath expr="//button[@string='Cancel']" position="replace">
|
||||
<button name="action_skip" icon="gtk-jump-to" special="cancel" type="object" string="Cancel" colspan="1" invisible="context.get('menu',False)"/>
|
||||
</xpath>
|
||||
<xpath expr="//separator[@string="vsep"]" position="attributes">
|
||||
<attribute name="string"/>
|
||||
|
|
|
@ -774,7 +774,8 @@ class res_company(osv.osv):
|
|||
_inherit = 'res.company'
|
||||
_columns = {
|
||||
'timesheet_range': fields.selection(
|
||||
[('day','Day'),('week','Week'),('month','Month'),('year','Year')], 'Timesheet range'),
|
||||
[('day','Day'),('week','Week'),('month','Month')], 'Timesheet range',
|
||||
help="Periodicity on which you validate your timesheets."),
|
||||
'timesheet_max_difference': fields.float('Timesheet allowed difference(Hours)',
|
||||
help="Allowed difference in hours between the sign in/out and the timesheet " \
|
||||
"computation for one sheet. Set this to 0 if you do not want any control."),
|
||||
|
|
|
@ -17,18 +17,18 @@
|
|||
<xpath expr="//label[@string='description']" position="attributes">
|
||||
<attribute name="string">This plug-in allows you to link your e-mail to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one.</attribute>
|
||||
</xpath>
|
||||
<xpath expr="//button[@string='Install Modules']" position="replace">
|
||||
<xpath expr="//button[@string='Install Modules']" position="replace">
|
||||
<button colspan="1" icon="gtk-close" special="cancel" string="_Close" invisible="not context.get('menu',False)"/>
|
||||
<button name="action_next" icon="gtk-go-forward" type="object" string="Configure" colspan="1" invisible="context.get('menu',False)"/>
|
||||
</xpath>
|
||||
<xpath expr="//button[@string='Skip']" position="replace">
|
||||
<button name="action_skip" icon="gtk-jump-to" special="cancel" type="object" string="Skip" colspan="1" invisible="context.get('menu',False)"/>
|
||||
<xpath expr="//button[@string='Cancel']" position="replace">
|
||||
<button name="action_skip" icon="gtk-jump-to" special="cancel" type="object" string="Cancel" colspan="1" invisible="context.get('menu',False)"/>
|
||||
</xpath>
|
||||
<xpath expr="//separator[@string="vsep"]" position="attributes">
|
||||
<attribute name="string"/>
|
||||
<attribute name="rowspan">15</attribute>
|
||||
</xpath>
|
||||
<group colspan="8" position="replace">
|
||||
<attribute name="string"/>
|
||||
<attribute name="rowspan">15</attribute>
|
||||
</xpath>
|
||||
<group colspan="8" position="replace">
|
||||
<group colspan="8" height="450" width="750">
|
||||
<field name="thunderbird" invisible="1"/>
|
||||
<field name="name" invisible="1"/>
|
||||
|
|
Loading…
Reference in New Issue