odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] purchase: Improve the form view of order_line 

bzr revid: sbh@tinyerp.com-20100916093825-1jju5nlti7gld94k
This commit is contained in:
sbh (Open ERP) 2010-09-16 15:08:25 +05:30
parent 21c7ee711d
commit 0cc3c5ce1f
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
addons/purchase/purchase_view.xml
View File

@ -264,19 +264,19 @@
domain="[('parent_id','=',False),('type_tax_use','!=','sale')]"/>
</group>
</page>
<page string="Notes">
<field colspan="4" name="notes" nolabel="1"/>
</page>
<page string="History" groups="base.group_extended">
<separator colspan="4" string="Stock Moves"/>
<field colspan="4" name="move_ids" nolabel="1" widget="many2many"/>
</page>
<page string="Invoicing" groups="base.group_extended">
<separator colspan="4" string="Manual Invoices"/>
<field name="invoiced"/>
<newline/>
<field colspan="4" name="invoice_lines" nolabel="1" widget="many2many"/>
</page>
<page string="Notes">
<field colspan="4" name="notes" nolabel="1"/>
</page>
<page string="History" groups="base.group_extended">
<separator colspan="4" string="Stock Moves"/>
<field colspan="4" name="move_ids" nolabel="1" widget="many2many"/>
</page>
</notebook>
</form>
</field>

1
addons/purchase/wizard/purchase_order_group.py
View File

@ -46,6 +46,7 @@ class purchase_order_group(osv.osv_memory):
if context.get('active_model','') == 'purchase.order' and len(context['active_ids']) < 2:
raise osv.except_osv(_('Warning'),
_('Please select multiple order inventories to merge in the list view.'))
return res
def merge_orders(self, cr, uid, ids, context):
"""
To merge similar type of purchase orders.