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

[IMP] after having the portal module tested on the runbot with a db_all, adjust some of the rights and add several 'groups' attributes 

bzr revid: abo@openerp.com-20120606152526-zkfskd3xa2cdb22c
This commit is contained in:
Antonin Bourguignon 2012-06-06 17:25:26 +02:00
parent 703c00aab0
commit 3511620380
7 changed files with 46 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
addons/account/account_invoice_view.xml
View File

@ -143,11 +143,13 @@
<field name="arch" type="xml">
<form layout="manual">
<header>
<button name="invoice_open" states="draft,proforma2" string="Validate"/>
<button name="%(action_account_invoice_refund)d" type='action' string='Ask Refund' states='open,paid'/>
<button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" groups="base.group_no_one"/>
<button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object"/>
<button name='%(action_account_state_open)d' type='action' string='Re-Open' groups="account.group_account_invoice" attrs="{'invisible':['|', ('state','&lt;&gt;','paid'), ('reconciled', '=', True)]}" help="This button only appears when the state of the invoice is 'paid' (showing that it has been fully reconciled) and auto-computed boolean 'reconciled' is False (depicting that it's not the case anymore). In other words, the invoice has been dereconciled and it does not fit anymore the 'paid' state. You should press this button to re-open it and let it continue its normal process after having resolved the eventual exceptions it may have created."/>
<span groups="base.group_user">
<button name="invoice_open" states="draft,proforma2" string="Validate"/>
<button name="%(action_account_invoice_refund)d" type='action' string='Ask Refund' states='open,paid'/>
<button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" groups="base.group_no_one"/>
<button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object"/>
<button name='%(action_account_state_open)d' type='action' string='Re-Open' groups="account.group_account_invoice" attrs="{'invisible':['|', ('state','&lt;&gt;','paid'), ('reconciled', '=', True)]}" help="This button only appears when the state of the invoice is 'paid' (showing that it has been fully reconciled) and auto-computed boolean 'reconciled' is False (depicting that it's not the case anymore). In other words, the invoice has been dereconciled and it does not fit anymore the 'paid' state. You should press this button to re-open it and let it continue its normal process after having resolved the eventual exceptions it may have created."/>
</span>
<field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,paid" statusbar_colors='{"proforma":"blue","proforma2":"blue"}'/>
</header>
<sheet string="Supplier Invoice" layout="auto">
@ -256,15 +258,17 @@
<field name="arch" type="xml">
<form layout="manual">
<header>
<button name="action_invoice_sent" type="object" string="Send by Email" states="open" attrs="{'invisible':['|',('sent','=',True), ('state', '=', 'draft')]}"/>
<button name="invoice_print" string="Print Invoice" type="object" states="open" attrs="{'invisible':['|',('sent','=',True), ('state', '=', 'draft')]}"/>
<button name="invoice_open" states="draft,proforma2" string="Validate"/>
<button name="invoice_proforma2" states="draft" string="PRO-FORMA" groups="account.group_proforma_invoices"/>
<button name="%(action_account_invoice_refund)d" type='action' string='Refund Invoice' states='paid'/>
<button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" groups="base.group_no_one"/>
<button name="action_cancel_draft" states="cancel" string="Reset to Draft" type="object"/>
<button name='%(action_account_state_open)d' type='action' string='Re-Open' groups="account.group_account_invoice" attrs="{'invisible':['|', ('state','&lt;&gt;','paid'), ('reconciled', '=', True)]}" help="This button only appears when the state of the invoice is 'paid' (showing that it has been fully reconciled) and auto-computed boolean 'reconciled' is False (depicting that it's not the case anymore). In other words, the invoice has been dereconciled and it does not fit anymore the 'paid' state. You should press this button to re-open it and let it continue its normal process after having resolved the eventual exceptions it may have created."/>
<!--button name="%(account_invoices)d" string="Print Invoice" type="action" states="open,paid,proforma,sale,proforma2"/-->
<span groups="base.group_user">
<button name="action_invoice_sent" type="object" string="Send by Email" states="open" attrs="{'invisible':['|',('sent','=',True), ('state', '=', 'draft')]}"/>
<button name="invoice_print" string="Print Invoice" type="object" states="open" attrs="{'invisible':['|',('sent','=',True), ('state', '=', 'draft')]}"/>
<button name="invoice_open" states="draft,proforma2" string="Validate"/>
<button name="invoice_proforma2" states="draft" string="PRO-FORMA" groups="account.group_proforma_invoices"/>
<button name="%(action_account_invoice_refund)d" type='action' string='Refund Invoice' states='paid'/>
<button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" groups="base.group_no_one"/>
<button name="action_cancel_draft" states="cancel" string="Reset to Draft" type="object"/>
<button name='%(action_account_state_open)d' type='action' string='Re-Open' groups="account.group_account_invoice" attrs="{'invisible':['|', ('state','&lt;&gt;','paid'), ('reconciled', '=', True)]}" help="This button only appears when the state of the invoice is 'paid' (showing that it has been fully reconciled) and auto-computed boolean 'reconciled' is False (depicting that it's not the case anymore). In other words, the invoice has been dereconciled and it does not fit anymore the 'paid' state. You should press this button to re-open it and let it continue its normal process after having resolved the eventual exceptions it may have created."/>
<!--button name="%(account_invoices)d" string="Print Invoice" type="action" states="open,paid,proforma,sale,proforma2"/-->
</span>
<field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,paid" statusbar_colors='{"proforma":"blue","proforma2":"blue"}'/>
</header>
<sheet string="Invoice" layout="auto">

6
addons/portal_sale/portal_sale_view.xml
View File

@ -34,8 +34,10 @@
<menuitem name="Products" id="portal_products" parent="portal.portal_orders"
action="product_normal_action" sequence="40"/>
<menuitem name="Invoice" id="portal_invoices" parent="portal.portal_invoices_payements" action="account.action_invoice_tree1" sequence="10"/>
<menuitem name="Refund/Payments" id="portal_payments" parent="portal.portal_invoices_payements" action="account_voucher.action_vendor_receipt" sequence="20"/>
<menuitem name="Invoice" id="portal_invoices" parent="portal.portal_invoices_payements"
action="account.action_invoice_tree1" sequence="10"/>
<menuitem name="Refund/Payments" id="portal_payments" parent="portal.portal_invoices_payements"
action="account_voucher.action_vendor_receipt" sequence="20"/>
</data>
</openerp>

1
addons/portal_sale/security/ir.model.access.csv
View File

@ -20,6 +20,7 @@ access_product,product.product,product.model_product_product,portal.group_portal
access_res_partner,res.partner,base.model_res_partner,portal.group_portal_member,1,0,0,0
access_product_uom,product.uom,product.model_product_uom,portal.group_portal_member,1,0,0,0
access_account_tax,account.tax,account.model_account_tax,portal.group_portal_member,1,0,0,0
access_mrp_bom,mrp.bom,mrp.model_mrp_bom,portal.group_portal_member,1,0,0,0
access_mrp_property,mrp.property,procurement.model_mrp_property,portal.group_portal_member,1,0,0,0
access_product_template,product.template,product.model_product_template,portal.group_portal_member,1,0,0,0
access_stock_warehouse,stock.warehouse,stock.model_stock_warehouse,portal.group_portal_member,1,0,0,0

1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
20 access_res_partner res.partner base.model_res_partner portal.group_portal_member 1 0 0 0
21 access_product_uom product.uom product.model_product_uom portal.group_portal_member 1 0 0 0
22 access_account_tax account.tax account.model_account_tax portal.group_portal_member 1 0 0 0
23 access_mrp_bom mrp.bom mrp.model_mrp_bom portal.group_portal_member 1 0 0 0
24 access_mrp_property mrp.property procurement.model_mrp_property portal.group_portal_member 1 0 0 0
25 access_product_template product.template product.model_product_template portal.group_portal_member 1 0 0 0
26 access_stock_warehouse stock.warehouse stock.model_stock_warehouse portal.group_portal_member 1 0 0 0

13
addons/product/product_view.xml
View File

@ -62,6 +62,7 @@
</tree>
</field>
</record>
<record id="product_normal_form_view" model="ir.ui.view">
<field name="name">product.normal.form</field>
<field name="model">product.product</field>
@ -133,9 +134,8 @@
<field name="uos_coeff"/>
<field name="mes_type"/>
</group>
</page>
<page string="Procurement &amp; Locations">
<page string="Procurement &amp; Locations" groups="base.group_user">
<group colspan="2" col="2" name="delay">
<separator string="Delays" colspan="2"/>
<field name="sale_delay" attrs="{'readonly':[('sale_ok','=',0)]}"/>
@ -154,12 +154,11 @@
<field name="active"/>
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
</group>
</page>
<page string="Suppliers" groups="base.group_user">
<field colspan="4" name="seller_ids" nolabel="1" context="{'uom_id': uom_id}"/>
</page>
<page string="Descriptions">
<page string="Descriptions" groups="base.group_user">
<separator string="Description" groups="base.group_user"/>
<field colspan="4" name="description" nolabel="1" groups="base.group_user"/>
<separator string="Sale Description"/>
@ -193,9 +192,9 @@
</field>
</page>
</notebook>
<div class="oe_form_sheet_width">
<field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
</div>
<div class="oe_form_sheet_width">
<field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
</div>
</form>
</field>
</record>

2
addons/project/project_view.xml
View File

@ -348,7 +348,7 @@
</group>
<group col="3" colspan="2">
<field name="remaining_hours" widget="float_time" attrs="{'readonly':[('state','!=','draft')]}" colspan="2" groups="project.group_time_work_estimation_tasks"/>
<button name="%(action_project_task_reevaluate)d" string="Reevaluate" type="action" colspan="1" target="new" states="open,pending" icon="gtk-edit"/>
<button name="%(action_project_task_reevaluate)d" string="Reevaluate" type="action" colspan="1" target="new" states="open,pending" icon="gtk-edit" groups="project.group_time_work_estimation_tasks"/>
</group>
<field colspan="4" name="description" nolabel="1" attrs="{'readonly':[('state','=','done')]}"/>

30
addons/sale_margin/sale_margin_view.xml
View File

@ -6,61 +6,61 @@
<field name="name">sale.order.margin.view.form</field>
<field name="type">form</field>
<field name="model">sale.order</field>
<field name="inherit_id" ref="sale.view_order_form" />
<field name="inherit_id" ref="sale.view_order_form"/>
<field name="arch" type="xml">
<field name="amount_total" position="after">
<field name="margin"/>
<field name="margin" groups="base.group_user"/>
</field>
</field>
</record>
<record model="ir.ui.view" id="sale_margin_sale_order_line">
<field name="name">sale.order.line.margin.view.form</field>
<field name="type">form</field>
<field name="model">sale.order</field>
<field name="inherit_id" ref="sale.view_order_form" />
<field name="inherit_id" ref="sale.view_order_form"/>
<field name="arch" type="xml">
<xpath expr="//field[@name='order_line']/form//field[@name='price_unit']" position="after">
<field name="purchase_price"/>
<field name="purchase_price" groups="base.group_user"/>
</xpath>
</field>
</record>
<record model="ir.ui.view" id="sale_margin_sale_order_line_form">
<field name="name">sale.order.line.tree.margin.view.form</field>
<field name="type">form</field>
<field name="model">sale.order</field>
<field name="inherit_id" ref="sale.view_order_form" />
<field name="inherit_id" ref="sale.view_order_form"/>
<field name="arch" type="xml">
<xpath expr="//field[@name='order_line']/tree//field[@name='price_unit']" position="after">
<field name="purchase_price"/>
<field name="purchase_price" groups="base.group_user"/>
</xpath>
</field>
</record>
<record model="ir.ui.view" id="sale_margin_sale_order_tree">
<field name="name">sale.order.margin.view.tree</field>
<field name="type">tree</field>
<field name="model">sale.order</field>
<field name="inherit_id" ref="sale.view_order_tree" />
<field name="inherit_id" ref="sale.view_order_tree"/>
<field name="arch" type="xml">
<field name="state" position="after">
<field name="margin"/>
<field name="margin" groups="base.group_user"/>
</field>
</field>
</record>
<record model="ir.ui.view" id="sale_margin_sale_order_line_tree">
<field name="name">sale.order.margin.line.view.tree</field>
<field name="type">tree</field>
<field name="model">sale.order.line</field>
<field name="inherit_id" ref="sale.view_order_line_tree" />
<field name="inherit_id" ref="sale.view_order_line_tree"/>
<field name="arch" type="xml">
<field name="price_subtotal" position="after">
<field name="margin"/>
<field name="margin" groups="base.group_user"/>
</field>
</field>
</record>
</record>
</data>
</openerp>

2
addons/stock/product_view.xml
View File

@ -111,7 +111,7 @@
<newline/>
<field name="virtual_available"/>
</group>
<group colspan="2" col="2" name="stock_variations">
<group colspan="2" col="2" name="stock_variations" groups="base.group_user">
<separator string="Expected Stock Variations" colspan="2"/>
<field name="incoming_qty"/>
<field name="outgoing_qty"/>