[FIX]: Fix some view regarding space problem.
bzr revid: atp@tinyerp.com-20120716132910-8fsw4ncbw0jov4rc
This commit is contained in:
Atul Patel (OpenERP)
parent
0de4e01155
commit
cb13892b69
|
|
@ -1086,8 +1086,7 @@
|
|||
<field name="analytic_account_id" domain="[('parent_id','!=',False)]"/>
|
||||
</group>
|
||||
</group>
|
||||
<separator string="Internal Note" colspan="4"/>
|
||||
<field name="narration" colspan="4" nolabel="1"/>
|
||||
<field name="narration" colspan="4" nolabel="1" placeholder="Add an internal note."/>
|
||||
</page>
|
||||
<page string="Analytic Lines" groups="analytic.group_analytic_accounting">
|
||||
<field name="analytic_lines" context="{'default_general_account_id':account_id, 'default_name': name, 'default_date':date, 'amount': (debit or 0.0)-(credit or 0.0)}"/>
|
||||
|
|
@ -2631,7 +2630,6 @@ action = pool.get('res.config').next(cr, uid, [], context)
|
|||
</form>
|
||||
</field>
|
||||
</group>
|
||||
<newline/>
|
||||
<group class="oe_subtotal_footer oe_right">
|
||||
<field name="balance_start" readonly="1" string="Total"/>
|
||||
<field name="total_entry_encoding"/>
|
||||
|
|
@ -2652,7 +2650,6 @@ action = pool.get('res.config').next(cr, uid, [], context)
|
|||
</form>
|
||||
</field>
|
||||
</group>
|
||||
<newline/>
|
||||
<group class="oe_subtotal_footer oe_right">
|
||||
<field name="balance_end" />
|
||||
<field name="balance_end_cash"/>
|
||||
|
|
|
|||
|
|
@ -107,10 +107,9 @@ class account_move_journal(osv.osv_memory):
|
|||
<form string="Standard entries" version="7.0">
|
||||
<group>
|
||||
<field name="target_move"/>
|
||||
<label string="%s"/>
|
||||
<label string="%s"/>
|
||||
</group>
|
||||
<label width="300" string="%s"/>
|
||||
<newline/>
|
||||
<label width="300" string="%s"/>
|
||||
<footer>
|
||||
<button string="%s" name="action_open_window" default_focus="1" type="object" class="oe_highlight"/>
|
||||
or
|
||||
|
|
|
|||
|
|
@ -17,16 +17,16 @@
|
|||
</group>
|
||||
<notebook tabpos="up" colspan="4">
|
||||
<page string="Filters" name="filters">
|
||||
<group col="4">
|
||||
<group>
|
||||
<field name="filter" on_change="onchange_filter(filter, fiscalyear_id)"/>
|
||||
</group>
|
||||
<group string="Dates" attrs="{'invisible':[('filter', '!=', 'filter_date')], 'required':[('filter', '=', 'filter_date')]}" col="4" >
|
||||
<field name="date_from" colspan="4"/>
|
||||
<field name="date_to" colspan="4"/>
|
||||
<group string="Dates" attrs="{'invisible':[('filter', '!=', 'filter_date')], 'required':[('filter', '=', 'filter_date')]}">
|
||||
<field name="date_from" />
|
||||
<field name="date_to" />
|
||||
</group>
|
||||
<group string="Periods" attrs="{'invisible':[('filter','!=','filter_period')], 'required':[('filter', '=', 'filter_period')]}" col="4">
|
||||
<field name="period_from" domain="[('fiscalyear_id', '=', fiscalyear_id)]" colspan="4"/>
|
||||
<field name="period_to" domain="[('fiscalyear_id', '=', fiscalyear_id)]" colspan="4"/>
|
||||
<group string="Periods" attrs="{'invisible':[('filter','!=','filter_period')], 'required':[('filter', '=', 'filter_period')]}">
|
||||
<field name="period_from" domain="[('fiscalyear_id', '=', fiscalyear_id)]"/>
|
||||
<field name="period_to" domain="[('fiscalyear_id', '=', fiscalyear_id)]" />
|
||||
</group>
|
||||
</page>
|
||||
<page string="Journals" name="journal_ids">
|
||||
|
|
|
|||
|
|
@ -117,7 +117,7 @@
|
|||
<field name="state" widget="statusbar" statusbar_visible="draft,confirm"/>
|
||||
</header>
|
||||
<sheet string="Budget">
|
||||
<group col="4">
|
||||
<group>
|
||||
<group>
|
||||
<field name="name" colspan="1" attrs="{'readonly':[('state','!=','draft')]}"/>
|
||||
<field name="creating_user_id" attrs="{'readonly':[('state','!=','draft')]}"/>
|
||||
|
|
|
|||
|
|
@ -82,35 +82,33 @@
|
|||
<field name="amount" sum="Total Allocation" on_change="onchange_amount(amount, amount_unreconciled, context)"/>
|
||||
</tree>
|
||||
</field>
|
||||
<group>
|
||||
<group string="Internal Notes">
|
||||
<field name="narration" colspan="2" nolabel="1"/>
|
||||
</group>
|
||||
<group col="3">
|
||||
<group>
|
||||
<group col="4" attrs="{'invisible':[('currency_id','=',False),('is_multi_currency','=',False)]}">
|
||||
<separator string="Currency Options" colspan="4"/>
|
||||
<field name="is_multi_currency" invisible="1"/>
|
||||
<field name="payment_rate" required="1" on_change="onchange_rate(payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context)" colspan="3"/>
|
||||
<field name="payment_rate_currency_id" colspan="1" nolabel="1" on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)"/>
|
||||
<field name="paid_amount_in_company_currency" colspan="4" invisible="1"/>
|
||||
</group>
|
||||
<group col="2">
|
||||
<separator string="Payment Options" colspan="2"/>
|
||||
<field name="writeoff_amount"/>
|
||||
<field name="payment_option" required="1"/>
|
||||
<field name="writeoff_acc_id"
|
||||
attrs="{'invisible':[('payment_option','!=','with_writeoff')], 'required':[('payment_option','=','with_writeoff')]}"
|
||||
domain="[('type','=','other')]"/>
|
||||
<field name="comment"
|
||||
attrs="{'invisible':[('payment_option','!=','with_writeoff')]}"/>
|
||||
<field name="analytic_id"
|
||||
groups="analytic.group_analytic_accounting"/>
|
||||
</group>
|
||||
<field name="narration" placeholder="Add an internal note." nolabel="1"/>
|
||||
</group>
|
||||
<group string="Currency Options" col="5" attrs="{'invisible':[('currency_id','=',False),('is_multi_currency','=',False)]}">
|
||||
<field name="is_multi_currency" invisible="1"/>
|
||||
<field name="payment_rate" required="1"
|
||||
on_change="onchange_rate(payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context)"/>
|
||||
<field name="payment_rate_currency_id" nolabel="1"
|
||||
on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)"/>
|
||||
<field name="paid_amount_in_company_currency" invisible="1"/>
|
||||
</group>
|
||||
<group string="Payment Options">
|
||||
<field name="writeoff_amount"/>
|
||||
<field name="payment_option" required="1"/>
|
||||
<field name="writeoff_acc_id"
|
||||
attrs="{'invisible':[('payment_option','!=','with_writeoff')], 'required':[('payment_option','=','with_writeoff')]}"
|
||||
domain="[('type','=','other')]"/>
|
||||
<field name="comment"
|
||||
attrs="{'invisible':[('payment_option','!=','with_writeoff')]}"/>
|
||||
<field name="analytic_id"
|
||||
groups="analytic.group_analytic_accounting"/>
|
||||
</group>
|
||||
</group>
|
||||
</page>
|
||||
<page string="Journal Items" attrs="{'invisible': [('state','!=','posted')]}">
|
||||
<group col="4">
|
||||
<group>
|
||||
<field name="period_id"/>
|
||||
<field name="audit"/>
|
||||
<field name="number" attrs="{'readonly':[('allow_check','!=',1)]}" />
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
<group col="4" colspan="2">
|
||||
<!-- "algorithm" not a field in any account related module.so pass it as False argument in generate_bbacomm() function. -->
|
||||
<field name="reference_type" nolabel="1" size="0" attrs="{'readonly':[('state','!=','draft')]}"
|
||||
on_change="generate_bbacomm(type,reference_type,partner_id,reference)" colspan="1"/>
|
||||
on_change="generate_bbacomm(type,reference_type, False, partner_id,reference)" colspan="1"/>
|
||||
<field name="reference" nolabel="1" colspan="3" attrs="{'readonly':[('state','!=','draft')]}"/>
|
||||
</group>
|
||||
</field>
|
||||
|
|
|
|||
|
|
@ -78,7 +78,7 @@ class account_invoice(osv.osv):
|
|||
algorithm = self.pool.get('res.partner').browse(cr, uid, partner_id).out_inv_comm_algorithm
|
||||
if not algorithm:
|
||||
algorithm = 'random'
|
||||
reference = self.generate_bbacomm(cr, uid, ids, type, reference_type, partner_id, '', algorithm)['value']['reference']
|
||||
reference = self.generate_bbacomm(cr, uid, ids, type, reference_type, algorithm, partner_id, '')['value']['reference']
|
||||
res_update = {
|
||||
'reference_type': reference_type or 'none',
|
||||
'reference': reference,
|
||||
|
|
@ -86,7 +86,7 @@ class account_invoice(osv.osv):
|
|||
result['value'].update(res_update)
|
||||
return result
|
||||
#algorithm is not defined as field in any account related modules.so pass it as false argument.
|
||||
def generate_bbacomm(self, cr, uid, ids, type, reference_type, partner_id, reference, algorithm=False):
|
||||
def generate_bbacomm(self, cr, uid, ids, type, reference_type, algorithm, partner_id, reference):
|
||||
partner_obj = self.pool.get('res.partner')
|
||||
reference = reference or ''
|
||||
if (type == 'out_invoice'):
|
||||
|
|
|
|||
Loading…
Reference in New Issue