Bugfixes and Improvements
bzr revid: fp@tinyerp.com-20080905150438-3g4m0thz2d9636k3
This commit is contained in:
parent
6fbedbf2e5
commit
9fb44bfedd
|
@ -233,12 +233,6 @@ class account_account(osv.osv):
|
|||
('payable','Payable'),
|
||||
('view','View'),
|
||||
('consolidation','Consolidation'),
|
||||
('income','Income'),
|
||||
('expense','Expense'),
|
||||
('tax','Tax'),
|
||||
('cash','Cash'),
|
||||
#('asset','Asset'),
|
||||
#('equity','Equity'),
|
||||
('closed','Closed'),
|
||||
], 'Internal Type', required=True,),
|
||||
|
||||
|
|
|
@ -682,7 +682,7 @@ class account_move_line(osv.osv):
|
|||
if ('account_id' in vals):
|
||||
account = account_obj.browse(cr, uid, vals['account_id'])
|
||||
if journal.type_control_ids:
|
||||
type = account.type
|
||||
type = account.user_type
|
||||
for t in journal.type_control_ids:
|
||||
if type==t.code:
|
||||
ok = True
|
||||
|
|
|
@ -120,7 +120,7 @@
|
|||
id="account_analytic_instance_model_open"/>
|
||||
|
||||
<menuitem
|
||||
name="Analytic Distribution's models" parent="account.next_id_32"
|
||||
name="Analytic Distribution's models" parent="account.account_def_analytic_journal"
|
||||
id="menu_account_analytic_plan_instance_action"
|
||||
action="account_analytic_plan_instance_action"/>
|
||||
|
||||
|
|
|
@ -407,10 +407,9 @@
|
|||
<page string="Consumed Products">
|
||||
<field name="location_src_id" select="2"/>
|
||||
<field name="location_dest_id"/>
|
||||
<field name="bom_id" select="2"/>
|
||||
<field name="bom_id" select="2" domain="[('product_id','=',product_id),('bom_id','=',False)]"/>
|
||||
<field name="origin" select="1"/>
|
||||
<newline/>
|
||||
|
||||
<field colspan="4" name="move_lines" nolabel="1" widget="one2many_list"/>
|
||||
<group col="9" colspan="4">
|
||||
<field name="state" select="2"/>
|
||||
|
|
|
@ -253,7 +253,7 @@ class product_template(osv.osv):
|
|||
'categ_id': fields.many2one('product.category','Category', required=True, change_default=True),
|
||||
'list_price': fields.float('Sale Price', digits=(16, int(config['price_accuracy']))),
|
||||
'standard_price': fields.float('Cost Price', required=True, digits=(16, int(config['price_accuracy']))),
|
||||
'volume': fields.float('Volume'),
|
||||
'volume': fields.float('Volume', help="The weight in Kg."),
|
||||
'weight': fields.float('Gross weight'),
|
||||
'weight_net': fields.float('Net weight'),
|
||||
'cost_method': fields.selection([('standard','Standard Price'), ('average','Average Price')], 'Costing Method', required=True),
|
||||
|
|
|
@ -31,14 +31,14 @@
|
|||
<field eval="7" name="priority"/>
|
||||
<field name="arch" type="xml">
|
||||
<form string="Product">
|
||||
<group colspan="3" col="4">
|
||||
<group colspan="2" col="4">
|
||||
<separator string="Product Description" colspan="4"/>
|
||||
<field name="name" select="1"/>
|
||||
<field name="default_code" select="1"/>
|
||||
<field groups="base.group_extended" name="variants" select="2"/>
|
||||
<field groups="base.group_extended" name="ean13" select="2"/>
|
||||
</group>
|
||||
<group colspan="1" col="2">
|
||||
<group colspan="2" col="2">
|
||||
<separator string="Product Type" colspan="2"/>
|
||||
<field name="sale_ok" select="2"/>
|
||||
<field name="purchase_ok" select="2"/>
|
||||
|
@ -166,13 +166,24 @@
|
|||
</form>
|
||||
</field>
|
||||
</record>
|
||||
<record id="product_category_list_view" model="ir.ui.view">
|
||||
<field name="name">product.category.list</field>
|
||||
<field name="model">product.category</field>
|
||||
<field name="type">tree</field>
|
||||
<field name="sequence">1</field>
|
||||
<field name="arch" type="xml">
|
||||
<tree string="Product Categories">
|
||||
<field name="complete_name"/>
|
||||
</tree>
|
||||
</field>
|
||||
</record>
|
||||
<record id="product_category_tree_view" model="ir.ui.view">
|
||||
<field name="name">product.category.tree</field>
|
||||
<field name="model">product.category</field>
|
||||
<field name="type">tree</field>
|
||||
<field name="field_parent">child_id</field>
|
||||
<field name="arch" type="xml">
|
||||
<tree string="Products Categories">
|
||||
<tree string="Product Categories">
|
||||
<field name="complete_name"/>
|
||||
</tree>
|
||||
</field>
|
||||
|
|
|
@ -572,6 +572,7 @@
|
|||
<field name="date" select="1"/>
|
||||
<newline/>
|
||||
<field name="address_id" select="2"/>
|
||||
<field name="origin" select="2"/>
|
||||
<notebook colspan="4">
|
||||
<page string="General Information">
|
||||
<field colspan="4" name="move_lines" nolabel="1" widget="one2many_list">
|
||||
|
@ -616,9 +617,8 @@
|
|||
<field colspan="4" name="note" nolabel="1"/>
|
||||
</page>
|
||||
<page string="Others info">
|
||||
<field name="origin" select="2"/>
|
||||
<field name="active" select="2"/>
|
||||
<field name="auto_picking"/>
|
||||
<field name="active" select="2"/>
|
||||
<newline/>
|
||||
<field name="move_type"/>
|
||||
</page>
|
||||
|
@ -727,6 +727,7 @@
|
|||
<field name="date" select="1"/>
|
||||
<newline/>
|
||||
<field name="address_id" select="2"/>
|
||||
<field name="origin" select="2"/>
|
||||
<notebook colspan="4">
|
||||
<page string="General Information">
|
||||
<field colspan="4" name="move_lines" nolabel="1" widget="one2many_list">
|
||||
|
@ -771,7 +772,6 @@
|
|||
<field colspan="4" name="note" nolabel="1"/>
|
||||
</page>
|
||||
<page string="Others info">
|
||||
<field name="origin" select="2"/>
|
||||
<field name="active" select="2"/>
|
||||
<field name="auto_picking"/>
|
||||
<newline/>
|
||||
|
|
|
@ -49,7 +49,7 @@ def _get_returns(self, cr, uid, data, context):
|
|||
pick=pick_obj.browse(cr, uid, [data['id']])[0]
|
||||
res={}
|
||||
fields.clear()
|
||||
arch_lst=['<?xml version="1.0"?>', '<form string="Return lines">', '<label string="Indicate here the quantity of the return line." colspan="4"/>']
|
||||
arch_lst=['<?xml version="1.0"?>', '<form string="Return lines">', '<label string="Provide the quantities of the returned products." colspan="4"/>']
|
||||
for m in [line for line in pick.move_lines]:
|
||||
quantity=m.product_qty
|
||||
arch_lst.append('<field name="return%s"/>\n<newline/>' % (m.id,))
|
||||
|
@ -60,7 +60,7 @@ def _get_returns(self, cr, uid, data, context):
|
|||
new_invoice_state='2binvoiced'
|
||||
else:
|
||||
new_invoice_state=pick.invoice_state
|
||||
fields['invoice_state']={'string':'Invoice state', 'type':'selection', 'default':make_default(new_invoice_state), 'selection':[('2binvoiced', 'to be invoiced'), ('none', 'None')]}
|
||||
fields['invoice_state']={'string':'Invoice state', 'type':'selection', 'default':make_default(new_invoice_state), 'required':True, 'selection':[('2binvoiced', 'to be invoiced'), ('none', 'None')]}
|
||||
arch_lst.append('</form>')
|
||||
arch.string='\n'.join(arch_lst)
|
||||
return res
|
||||
|
|
Loading…
Reference in New Issue