Harry (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-addons-issues5-purchase-pso into
lp:openobject-addons.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-addons-issues5-purchase-pso/+merge/124119
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-addons-issues5-purchase-pso/+merge/124119
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-addons-issues5-purchase-pso.
=== modified file 'purchase/purchase_view.xml'
--- purchase/purchase_view.xml 2012-09-11 13:07:01 +0000
+++ purchase/purchase_view.xml 2012-09-13 08:11:21 +0000
@@ -183,7 +183,7 @@
<button name="action_cancel" states="except_picking,except_invoice" string="Cancel" type="object" />
<button name="picking_ok" states="except_picking" string="Manually Corrected"/>
<button name="invoice_ok" states="except_invoice" string="Manually Corrected"/>
- <button name="purchase_approve" states="confirmed" string="Approve Order" class="oe_highlight"/>
+ <button name="purchase_approve" states="confirmed" string="Approve Order" class="oe_highlight" groups="purchase.group_purchase_manager"/>
<button name="view_invoice" string="Receive Invoice" type="object" attrs="{'invisible': ['|', ('invoice_method','=','picking'), '|', ('state','!=', 'approved'), ('invoiced','=',True) ]}" class="oe_highlight"/>
<button name="view_picking" string="Receive Products" type="object" attrs="{'invisible': ['|', ('shipped','=',True), ('state','!=', 'approved')]}" class="oe_highlight"/>
<button name="action_cancel_draft" states="cancel,sent,confirmed" string="Set to Draft" type="object" />
@@ -241,7 +241,7 @@
<label for="notes"/>
<field name="notes"/>
</page>
- <page string="Delivery & Invoicing">
+ <page string="Reception & Invoicing">
<group>
<group>
<field name="dest_address_id" string="Customer Address" on_change="onchange_dest_address_id(dest_address_id)"/>
=== modified file 'purchase/security/ir.model.access.csv'
--- purchase/security/ir.model.access.csv 2012-08-22 13:37:29 +0000
+++ purchase/security/ir.model.access.csv 2012-09-13 08:11:21 +0000
@@ -65,3 +65,4 @@
access_stock_location_purchase_manager,stock.location purchase manager,stock.model_stock_location,purchase.group_purchase_manager,1,0,0,0
access_stock_warehouse_orderpoint_manager,stock.warehouse.orderpoint,procurement.model_stock_warehouse_orderpoint,purchase.group_purchase_manager,1,0,0,0
access_stock_warehouse_orderpoint_manager,stock.warehouse.orderpoint,procurement.model_stock_warehouse_orderpoint,group_purchase_user,1,0,0,0
+access_purchase_order_partner_manager,purchase.order,model_purchase_order,base.group_partner_manager,1,0,0,0
=== modified file 'sale/res_partner_view.xml'
--- sale/res_partner_view.xml 2012-08-14 12:11:17 +0000
+++ sale/res_partner_view.xml 2012-09-13 08:11:21 +0000
@@ -50,6 +50,7 @@
<xpath expr="//div[@name='buttons']" position="inside">
<button name="%(sale.act_res_partner_2_sale_order)d" type="action"
string="Quotations and Sales"
+ attrs="{'invisible': [('customer', '=', False)]}"
groups="base.group_sale_salesman"/>
</xpath>
</field>
=== modified file 'sale/security/ir.model.access.csv'
--- sale/security/ir.model.access.csv 2012-07-06 15:08:17 +0000
+++ sale/security/ir.model.access.csv 2012-09-13 08:11:21 +0000
@@ -60,3 +60,4 @@
access_account_invoice_report_salesman,account.invoice.report salesman,account.model_account_invoice_report,base.group_sale_salesman,1,0,0,0
access_stock_warehouse_orderpoint_sale_salesman,stock.warehouse.orderpoint,procurement.model_stock_warehouse_orderpoint,base.group_sale_salesman,1,0,0,0
access_account_move_line_salesman,account.move.line invoice,account.model_account_move_line,base.group_sale_salesman,1,0,0,0
+access_sale_order_partner_manager,sale.order,model_sale_order,base.group_partner_manager,1,0,0,0
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
