This commit is contained in:
manu
2012-01-03 16:28:42 +01:00
parent 1f8813f787
commit 3d954080a8
3 changed files with 13 additions and 2 deletions

View File

@@ -326,6 +326,15 @@
res_model="stock.picking"
src_model="crm.claim"/>
<!-- act_window
context="{'search_default_account_id':[active_id], 'search_default_unreconciled':1, 'default_account_id': active_id}"
src_model="account.account"/>
<act_window domain="[('reconcile_id', '=', active_id)]" id="act_account_acount_move_line_reconcile_open"
name="Reconciled entries" res_model="account.move.line" src_model="account.move.reconcile"/ -->
<!-- Menu -->
<!-- return lines action -->
<record model="ir.actions.act_window" id="act_crm_case_return_lines">

View File

@@ -25,7 +25,7 @@
<data>
<!-- SELECT INVOICE FORM VIEW -->
<record id="view_create_return_invoice_form" model="ir.ui.view">
<field name="name">returned_lines_from_invoice_wiew</field>
<field name="name">returned_lines_from_invoice_view</field>
<field name="model">returned_lines_from_invoice_invoice.wizard</field>
<field name="type">form</field>
<field name="arch" type="xml">

View File

@@ -54,7 +54,9 @@ class product_supplierinfo(osv.osv):
def _get_default_instructions(self, cr, uid,context):
instruction_ids = self.pool.get('return.instruction').search(cr, uid, [('is_default','=','FALSE')])
if instruction_ids:
return instruction_ids[0]
return instruction_ids[0]
# TO DO f(supplier) + other...
return False
_columns = {
"warranty_duration" : fields.float('Warranty', help="Warranty in month for this product/supplier relation. Only for company/supplier relation (purchase order) ; the customer/company relation (sale order) always use the product main warranty field"),