diff options
| author | aag (OpenERP) <aag@tinyerp.co.in> | 2011-01-13 14:55:51 +0530 |
|---|---|---|
| committer | aag (OpenERP) <aag@tinyerp.co.in> | 2011-01-13 14:55:51 +0530 |
| commit | 5a046d9510d6cd2ed182a2d52bd4197cd05848a7 (patch) | |
| tree | a309cd8d27ce8aa7462f14482d8ca8d1695f2a78 | |
| parent | 391efaccf382b740687f34e72f9aa0f29394bbaf (diff) | |
[FIX] STOCK:Create invoice button is visible in picking (ALL 3) is set to be invoiced
lp bug: https://launchpad.net/bugs/701389 fixed
bzr revid: aag@tinyerp.co.in-20110113092551-ds3n0gne3xouq7lq
| -rw-r--r-- | addons/purchase_requisition/security/ir.model.access.csv | 4 | ||||
| -rw-r--r-- | addons/stock/stock_view.xml | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/addons/purchase_requisition/security/ir.model.access.csv b/addons/purchase_requisition/security/ir.model.access.csv index d990afcb536..ec8c031f88b 100644 --- a/addons/purchase_requisition/security/ir.model.access.csv +++ b/addons/purchase_requisition/security/ir.model.access.csv @@ -1,7 +1,7 @@ "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_line_purchase_user","purchase.requisition.line","model_purchase_requisition_line","purchase.group_purchase_user",1,1,1,1 "access_purchase_requisition_manager","purchase.requisition manager","model_purchase_requisition","purchase.group_purchase_manager",1,0,0,0 "access_purchase_requisition_line_manager","purchase.requisition.line manager","model_purchase_requisition_line","purchase.group_purchase_manager",1,0,0,0 "access_purchase_requisition_stock_manager","purchase.requisition","model_purchase_requisition","stock.group_stock_manager",1,0,1,0 -"access_purchase_requisition_line","purchase.requisition.line","model_purchase_requisition_line","stock.group_stock_manager",1,0,1,0 +"access_purchase_requisition_line_stock_manager","purchase.requisition.line","model_purchase_requisition_line","stock.group_stock_manager",1,0,1,0 diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index 550aab9b1c7..2bde13b6771 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -773,7 +773,7 @@ <button name="action_assign" states="confirmed" string="Check Availability" type="object" icon="gtk-find"/> <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/> <button name="action_process" states="assigned" string="Process" groups="stock.group_stock_user" type="object" icon="gtk-go-forward"/> - <button states="done" name="%(action_stock_invoice_onshipping)d" string="Create Invoice" type="action" icon="terp-gtk-go-back-rtl" /> + <button states="done" name="%(action_stock_invoice_onshipping)d" string="Create Invoice" attrs="{'invisible': ['|',('invoice_state','=','invoiced'),('invoice_state','=','none')]}" type="action" icon="terp-gtk-go-back-rtl" /> </group> </page> <page string="Additional info" groups="base.group_extended,base.group_multi_company"> @@ -967,7 +967,7 @@ <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/> <button name="action_process" states="assigned" string="Process" type="object" icon="gtk-go-forward"/> <button name="%(act_stock_return_picking)d" string="Return Products" states="done" type="action" icon="gtk-execute"/> - <button name="%(action_stock_invoice_onshipping)d" string="Create Invoice" states="done" type="action" icon="terp-gtk-go-back-rtl"/> + <button name="%(action_stock_invoice_onshipping)d" string="Create Invoice" states="done" attrs="{'invisible': ['|',('invoice_state','=','invoiced'),('invoice_state','=','none')]}" type="action" icon="terp-gtk-go-back-rtl"/> </group> </page> <page string="Additional info" groups="base.group_extended,base.group_multi_company"> |