[MERGE] forward port of branch 7.0 up to 1cfe191
This commit is contained in:
commit
7ea9691e2a
|
@ -61,7 +61,7 @@
|
||||||
<group>
|
<group>
|
||||||
<field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '<>', 'view')]" name="account_id" on_change="onchange_account_id(product_id, parent.partner_id, parent.type, parent.fiscal_position,account_id)" groups="account.group_account_user"/>
|
<field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '<>', 'view')]" name="account_id" on_change="onchange_account_id(product_id, parent.partner_id, parent.type, parent.fiscal_position,account_id)" groups="account.group_account_user"/>
|
||||||
<field name="invoice_line_tax_id" context="{'type':parent.get('type')}" domain="[('parent_id','=',False),('company_id', '=', parent.company_id)]" widget="many2many_tags"/>
|
<field name="invoice_line_tax_id" context="{'type':parent.get('type')}" domain="[('parent_id','=',False),('company_id', '=', parent.company_id)]" widget="many2many_tags"/>
|
||||||
<field domain="[('type','<>','view'), ('company_id', '=', parent.company_id)], ('state','not in',('close','cancelled'))]" name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
|
<field domain="[('type','<>','view'), ('company_id', '=', parent.company_id), ('state','not in',('close','cancelled'))]" name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
|
||||||
<field name="company_id" groups="base.group_multi_company" readonly="1"/>
|
<field name="company_id" groups="base.group_multi_company" readonly="1"/>
|
||||||
</group>
|
</group>
|
||||||
</group>
|
</group>
|
||||||
|
|
|
@ -38,8 +38,7 @@ class account_bank_statement(osv.osv):
|
||||||
res = super(account_bank_statement, self).write(cr, uid, ids, vals, context=context)
|
res = super(account_bank_statement, self).write(cr, uid, ids, vals, context=context)
|
||||||
return res
|
return res
|
||||||
|
|
||||||
def button_confirm_bank(self, cr, uid, ids, context=None):
|
def confirm_statement_lines(self, cr, uid, ids, context=None):
|
||||||
super(account_bank_statement, self).button_confirm_bank(cr, uid, ids, context=context)
|
|
||||||
for st in self.browse(cr, uid, ids, context=context):
|
for st in self.browse(cr, uid, ids, context=context):
|
||||||
if st.line_ids:
|
if st.line_ids:
|
||||||
cr.execute("UPDATE account_bank_statement_line \
|
cr.execute("UPDATE account_bank_statement_line \
|
||||||
|
@ -47,6 +46,16 @@ class account_bank_statement(osv.osv):
|
||||||
(tuple([x.id for x in st.line_ids]),))
|
(tuple([x.id for x in st.line_ids]),))
|
||||||
return True
|
return True
|
||||||
|
|
||||||
|
def button_confirm_bank(self, cr, uid, ids, context=None):
|
||||||
|
res = super(account_bank_statement, self).button_confirm_bank(cr, uid, ids, context=context)
|
||||||
|
self.confirm_statement_lines(cr, uid, ids, context=context)
|
||||||
|
return res
|
||||||
|
|
||||||
|
def button_confirm_cash(self, cr, uid, ids, context=None):
|
||||||
|
res = super(account_bank_statement, self).button_confirm_cash(cr, uid, ids, context=context)
|
||||||
|
self.confirm_statement_lines(cr, uid, ids, context=context)
|
||||||
|
return res
|
||||||
|
|
||||||
def button_cancel(self, cr, uid, ids, context=None):
|
def button_cancel(self, cr, uid, ids, context=None):
|
||||||
super(account_bank_statement, self).button_cancel(cr, uid, ids, context=context)
|
super(account_bank_statement, self).button_cancel(cr, uid, ids, context=context)
|
||||||
for st in self.browse(cr, uid, ids, context=context):
|
for st in self.browse(cr, uid, ids, context=context):
|
||||||
|
|
|
@ -44,7 +44,8 @@
|
||||||
<field name="type">ir.actions.act_window</field>
|
<field name="type">ir.actions.act_window</field>
|
||||||
<field name="res_model">sale.order</field>
|
<field name="res_model">sale.order</field>
|
||||||
<field name="view_mode">tree,form</field>
|
<field name="view_mode">tree,form</field>
|
||||||
<field name="context">{"search_default_draft":1}</field>
|
<field name="domain">[('state','in',('draft','sent','cancel'))]</field>
|
||||||
|
<field name="context">{}</field>
|
||||||
<field name="search_view_id" ref="sale.view_sales_order_filter"/>
|
<field name="search_view_id" ref="sale.view_sales_order_filter"/>
|
||||||
<field name="help">We haven't sent you any quotation.</field>
|
<field name="help">We haven't sent you any quotation.</field>
|
||||||
</record>
|
</record>
|
||||||
|
@ -55,7 +56,8 @@
|
||||||
<field name="res_model">sale.order</field>
|
<field name="res_model">sale.order</field>
|
||||||
<field name="view_mode">tree,form</field>
|
<field name="view_mode">tree,form</field>
|
||||||
<field name="search_view_id" ref="sale.view_sales_order_filter"/>
|
<field name="search_view_id" ref="sale.view_sales_order_filter"/>
|
||||||
<field name="context">{"search_default_sales":1}</field>
|
<field name="domain">[('state', 'not in', ('draft', 'sent', 'cancel'))]</field>
|
||||||
|
<field name="context">{}</field>
|
||||||
<field name="help">We haven't sent you any sales order.</field>
|
<field name="help">We haven't sent you any sales order.</field>
|
||||||
</record>
|
</record>
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue