[IMP] purchase,purchase_requisition:partial changes committed as branch is required to be merged

bzr revid: mtr@mtr-20100618084556-os74vf7zebxrzo0w
This commit is contained in:
mtr 2010-06-18 14:15:56 +05:30
parent ed74d897dd
commit 0de4309cda
3 changed files with 13 additions and 8 deletions

View File

@ -169,17 +169,17 @@
<field name="arch" type="xml">
<search string="Search Purchase Order">
<group col='10' colspan='4'>
<filter icon="terp-document-new" name="draft" string="Quotations" domain="[('state','=','draft')]" separator="1"/>
<filter icon="terp-camera_test" name="confirmed" string="To Approve" domain="[('state','in',('wait','confirmed'))]" separator="1"/>
<filter icon="terp-check" name="approved" string="Approved" domain="[('state','in',('approved','done'))]" separator="1"/>
<filter icon="terp-emblem-important" name="exception" string="Exception" domain="[('state','in',('except_invoice','except_picking'))]" separator="1"/>
<filter icon="terp-document-new" name="draft" string="Quotations" domain="[('state','=','draft')]" separator="1" help="Quotations for purchase"/>
<filter icon="terp-camera_test" name="confirmed" string="To Approve" domain="[('state','in',('wait','confirmed'))]" separator="1" help="Purchase order to be approved"/>
<filter icon="terp-check" name="approved" string="Approved" domain="[('state','in',('approved','done'))]" separator="1" help="Approved purchase order"/>
<filter icon="terp-emblem-important" name="exception" string="Exception" domain="[('state','in',('except_invoice','except_picking'))]" separator="1" help="Purchase order which are in the exception state"/>
<separator orientation="vertical"/>
<filter icon="terp-gtk-go-back-rtl" string="To Invoice" domain="[('invoiced','=',1)]" separator="1"/>
<filter icon="terp-gtk-go-back-rtl" string="To Invoice" domain="[('invoiced','=',1)]" separator="1" help="Purchase order to be invoiced"/>
<separator orientation="vertical"/>
<field name="name" select="1" string="Reference"/>
<field name="partner_id" select="1"/>
<field name="product_id" select="1"/>
<field name="create_uid" select="1"/>
<field name="create_uid" select="1" default="1"/>
</group>
<newline/>
<group expand="0" string="Group By..." colspan="4" col="10" groups="base.group_extended">

View File

@ -26,3 +26,7 @@
"access_res_partner_address_purchase_user","res.partner.address purchase","base.model_res_partner_address","group_purchase_user",1,0,0,0
"access_account_journal","account.journal","account.model_account_journal","purchase.group_purchase_user",1,1,1,0
"access_account_journal_manager","account.journal","account.model_account_journal","purchase.group_purchase_manager",1,1,1,1
"access_purchase_order_line_invoice_user","purchase.order.line_invoice","model_purchase_order_line_invoice","group_purchase_user",1,0,0,0
"access_purchase_order_line_invoice_manager","purchase.order.line_invoice","model_purchase_order_line_invoice","group_purchase_manager",1,1,1,1
"access_purchase_installer_user","purchase.installer","model_purchase_installer","group_purchase_user",1,0,0,0
"access_purchase_installer_manager","purchase.installer","model_purchase_installer","group_purchase_manager",1,1,1,1

1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
26 access_res_partner_address_purchase_user res.partner.address purchase base.model_res_partner_address group_purchase_user 1 0 0 0
27 access_account_journal account.journal account.model_account_journal purchase.group_purchase_user 1 1 1 0
28 access_account_journal_manager account.journal account.model_account_journal purchase.group_purchase_manager 1 1 1 1
29 access_purchase_order_line_invoice_user purchase.order.line_invoice model_purchase_order_line_invoice group_purchase_user 1 0 0 0
30 access_purchase_order_line_invoice_manager purchase.order.line_invoice model_purchase_order_line_invoice group_purchase_manager 1 1 1 1
31 access_purchase_installer_user purchase.installer model_purchase_installer group_purchase_user 1 0 0 0
32 access_purchase_installer_manager purchase.installer model_purchase_installer group_purchase_manager 1 1 1 1

View File

@ -1,3 +1,4 @@
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
"access_purchase_requisition","purchase.requisition","model_purchase_requisition","purchase.group_purchase_user",1,1,1,1
"access_purchase_requisition_line","purchase.requisition.line","model_purchase_requisition_line","purchase.group_purchase_user",1,1,1,1
"access_purchase_requisition","purchase.requisition","model_purchase_requisition","purchase.group_purchase_user",1,0,0,0
"access_purchase_requisition_line","purchase.requisition.line","model_purchase_requisition_line","purchase.group_purchase_user",1,0,0,0
"access_purchase_requisition_partner","purchase.requisition.partner","model_purchase_requisition_partner","purchase.group_purchase_user",1,0,0,0

1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
2 access_purchase_requisition purchase.requisition model_purchase_requisition purchase.group_purchase_user 1 1 0 1 0 1 0
3 access_purchase_requisition_line purchase.requisition.line model_purchase_requisition_line purchase.group_purchase_user 1 1 0 1 0 1 0
4 access_purchase_requisition_partner purchase.requisition.partner model_purchase_requisition_partner purchase.group_purchase_user 1 0 0 0