Better Security Rules
bzr revid: fp@tinyerp.com-ba2a150e0e8f998db7c548a6e5301d77ae522807
This commit is contained in:
parent
742526d3a8
commit
b3151b4c9d
|
@ -471,7 +471,11 @@
|
|||
<field name="view_type">form</field>
|
||||
<field name="view_mode">tree,form</field>
|
||||
</record>
|
||||
<menuitem name="Financial Management/Configuration/General Accounts/" id="menu_action_account_type_form" action="action_account_type_form"/>
|
||||
<menuitem
|
||||
name="Financial Management/Configuration/General Accounts/"
|
||||
id="menu_action_account_type_form"
|
||||
groups="base.group_extended"
|
||||
action="action_account_type_form"/>
|
||||
<!--
|
||||
Entries
|
||||
-->
|
||||
|
@ -593,17 +597,17 @@
|
|||
<field name="type"/>
|
||||
<field name="applicable_type"/>
|
||||
<field name="amount" select="2"/>
|
||||
<field name="include_base_amount"/>
|
||||
<field name="domain"/>
|
||||
<field name="include_base_amount" groups="base.group_extended"/>
|
||||
<field name="domain" groups="base.group_extended"/>
|
||||
<newline/>
|
||||
<field name="account_collected_id"/>
|
||||
<label string="Keep empty to use the income account" nolabel="1" colspan="2"/>
|
||||
<field name="account_paid_id"/>
|
||||
<label string="Keep empty to use the expense account" nolabel="1" colspan="2"/>
|
||||
<field name="child_depend"/>
|
||||
<field name="sequence" />
|
||||
<field name="child_depend" groups="base.group_extended"/>
|
||||
<field name="sequence" groups="base.group_extended"/>
|
||||
<newline/>
|
||||
<field name="child_ids" colspan="4"/>
|
||||
<field name="child_ids" colspan="4" groups="base.group_extended"/>
|
||||
</page><page string="Tax Declaration">
|
||||
<separator colspan="4" string="Invoices"/>
|
||||
<field name="base_code_id"/>
|
||||
|
@ -616,7 +620,7 @@
|
|||
<field name="ref_base_sign"/>
|
||||
<field name="ref_tax_code_id"/>
|
||||
<field name="ref_tax_sign"/>
|
||||
</page><page string="Special Computation">
|
||||
</page><page string="Special Computation" groups="base.group_extended">
|
||||
<separator string="Compute Code (if type=code)" colspan="4"/>
|
||||
<field name="python_compute" colspan="4" nolabel="1"/>
|
||||
<separator string="Applicable Code (if type=code)" colspan="4"/>
|
||||
|
|
|
@ -282,9 +282,9 @@
|
|||
<field name="model_id" model="ir.model" search="[('model', '=', 'stock.warehouse.orderpoint')]"/>
|
||||
<field name="group_id" ref="group_production_worker"/>
|
||||
<field name="perm_read" eval="True"/>
|
||||
<field name="perm_write" eval="False"/>
|
||||
<field name="perm_create" eval="False"/>
|
||||
<field name="perm_unlink" eval="False"/>
|
||||
<field name="perm_write" eval="True"/>
|
||||
<field name="perm_create" eval="True"/>
|
||||
<field name="perm_unlink" eval="True"/>
|
||||
</record>
|
||||
</data>
|
||||
</terp>
|
||||
|
|
|
@ -490,15 +490,6 @@ class product_product(osv.osv):
|
|||
res[product.id] = product_uom_obj._compute_price(cr, uid,
|
||||
uom.id, res[product.id], context['uom'])
|
||||
return res
|
||||
# result = self.read(cr, uid, ids, [ptype, 'price_extra','price_margin'])
|
||||
# result2 = {}
|
||||
# for res in result:
|
||||
# result2[res['id']] = res[ptype] or 0.0
|
||||
# if ptype=='list_price':
|
||||
# result2[res['id']] = result2[res['id']] * res['price_margin'] + res['price_extra']
|
||||
# if 'uom' in context:
|
||||
# result2[res['id']] = self.pool.get('product.uom')._compute_price(cr, uid, context['uom'], result2[res['id']])
|
||||
# return result2
|
||||
|
||||
def copy(self, cr, uid, id, default=None, context=None):
|
||||
if not context:
|
||||
|
|
|
@ -36,20 +36,20 @@
|
|||
<page string="Information">
|
||||
<field name="name" select="1"/>
|
||||
<field name="default_code" select="1"/>
|
||||
<field name="variants" select="2"/>
|
||||
<field name="ean13" select="2"/>
|
||||
<field name="variants" select="2" groups="base.group_extended"/>
|
||||
<field name="ean13" select="2" groups="base.group_extended"/>
|
||||
<newline/>
|
||||
<field name="categ_id" select="1"/>
|
||||
<field name="type" select="2"/>
|
||||
<field name="volume" digits="(14, 3)"/>
|
||||
<field name="volume" digits="(14, 3)" groups="base.group_extended"/>
|
||||
<newline/>
|
||||
<field name="weight" digits="(14, 3)"/>
|
||||
<field name="weight_net" digits="(14, 3)"/>
|
||||
<field name="weight" digits="(14, 3)" groups="base.group_extended"/>
|
||||
<field name="weight_net" digits="(14, 3)" groups="base.group_extended"/>
|
||||
<field name="procure_method"/>
|
||||
<field name="state" select="2"/>
|
||||
<field name="uom_id"/>
|
||||
<field name="uom_po_id"/>
|
||||
<field name="product_manager" select="2"/>
|
||||
<field name="product_manager" select="2" groups="base.group_extended"/>
|
||||
</page>
|
||||
<page string="Procurement">
|
||||
<field name="supply_method"/>
|
||||
|
@ -61,10 +61,11 @@
|
|||
<field name="purchase_ok" select="2"/>
|
||||
<field name="warranty"/>
|
||||
<field name="rental" select="2" groups="base.group_extended"/>
|
||||
<field name="list_price"/>
|
||||
<newline/>
|
||||
<field name="list_price"/>
|
||||
<field name="standard_price"/>
|
||||
<field name="cost_method" groups="base.group_extended"/>
|
||||
<newline/>
|
||||
<field name="uos_id" groups="base.group_uos"/>
|
||||
<field name="uos_coeff" groups="base.group_uos"/>
|
||||
<newline />
|
||||
|
@ -126,7 +127,9 @@
|
|||
<field name="name" select="1"/>
|
||||
<field name="parent_id" />
|
||||
<field name="sequence"/>
|
||||
<group colspan="4" groups="base.group_extended">
|
||||
<properties/>
|
||||
</group>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
@ -240,7 +243,7 @@
|
|||
<field name="model">product.ul</field>
|
||||
<field name="type">form</field>
|
||||
<field name="arch" type="xml">
|
||||
<form string="Logisitcal Unit">
|
||||
<form string="Logistical Unit">
|
||||
<field name="name" />
|
||||
<field name="type" />
|
||||
</form>
|
||||
|
@ -251,7 +254,7 @@
|
|||
<field name="model">product.ul</field>
|
||||
<field name="type">tree</field>
|
||||
<field name="arch" type="xml">
|
||||
<tree string="Logisitcal Unit">
|
||||
<tree string="Logistical Unit">
|
||||
<field name="name" select="1"/>
|
||||
<field name="type" select="1"/>
|
||||
</tree>
|
||||
|
@ -263,7 +266,8 @@
|
|||
<field name="view_type">form</field>
|
||||
<field name="view_mode">tree,form</field>
|
||||
</record>
|
||||
<menuitem name="Products/Configuration/Logisitcal Unit" id="menu_product_ul_form_action" action="product_ul_form_action"/>
|
||||
<menuitem name="Products/Configuration/Logisitcal Unit" id="menu_product_ul_form_action" action="product_ul_form_action"
|
||||
groups="base.group_extended"/>
|
||||
|
||||
<record model="ir.ui.view" id="product_packaging_tree_view">
|
||||
<field name="name">product.packaging.tree.view</field>
|
||||
|
|
|
@ -33,7 +33,7 @@
|
|||
<separator string="Project's members" colspan="4" />
|
||||
<field name="members" colspan="4" nolabel="1"/>
|
||||
</page>
|
||||
<page string="Partner Info">
|
||||
<page string="Partner Info" groups="base.group_extended">
|
||||
<field name="partner_id" select="1" colspan="4" on_change="onchange_partner_id(partner_id)"/>
|
||||
<field name="contact_id" select="2" domain="[('partner_id','=',partner_id)]"/>
|
||||
<field name="category_id" select="2"/>
|
||||
|
@ -83,7 +83,7 @@
|
|||
<button name="do_reopen" string="Re-open" states="done,cancelled" type="object"/>
|
||||
<button name="do_pending" states="open" string="Set pending" type="object"/>
|
||||
<button name="%(wizard_close_task)d" states="pending,open" string="Done" type="action"/>
|
||||
<button name="%(wizard_delegate_task)d" states="pending,open" string="Delegate" type="action"/>
|
||||
<button name="%(wizard_delegate_task)d" states="pending,open" string="Delegate" type="action" groups="base.group_extended"/>
|
||||
<button name="do_cancel" states="draft,open,pending" string="Cancel" type="object"/>
|
||||
</group>
|
||||
</page>
|
||||
|
@ -313,13 +313,13 @@
|
|||
<button name="do_open" string="Open" states="pending,draft" type="object"/>
|
||||
<button name="do_reopen" string="Re-open" states="done,cancelled" type="object"/>
|
||||
<button name="do_pending" states="open" string="Set Pending" type="object"/>
|
||||
<button name="%(wizard_delegate_task)d" states="pending,open" string="Delegate" type="action"/>
|
||||
<button name="%(wizard_delegate_task)d" states="pending,open" string="Delegate" type="action" groups="base.group_extended"/>
|
||||
<button name="%(wizard_close_task)d" states="pending,open" string="Done" type="action"/>
|
||||
<button name="do_cancel" states="draft,open,pending" string="Cancel" type="object"/>
|
||||
|
||||
</group>
|
||||
</page>
|
||||
<page string="Delegations">
|
||||
<page string="Delegations" groups="base.group_extended">
|
||||
<field name="history" colspan="4" nolabel="1"/>
|
||||
<field name="child_ids" colspan="4" nolabel="1" height="150">
|
||||
<tree string="Delegated tasks">
|
||||
|
@ -333,7 +333,7 @@
|
|||
</field>
|
||||
<field name="parent_id" colspan="4"/>
|
||||
</page>
|
||||
<page string="Extra Info">
|
||||
<page string="Extra Info" groups="base.group_extended">
|
||||
<field name="date_start" select="2"/>
|
||||
<field name="date_close" select="2"/>
|
||||
<field name="type"/>
|
||||
|
@ -400,6 +400,11 @@
|
|||
<field name="view_mode">tree,form</field>
|
||||
<field name="domain">[('state','=','done'), ('billable','=',True), ('invoice_id','=',False)]</field>
|
||||
</record>
|
||||
<menuitem
|
||||
name="Project Management/All Tasks/Billable Tasks"
|
||||
groups="base.group_extended"
|
||||
id="menu_action_billable"/>
|
||||
|
||||
<menuitem name="Project Management/All Tasks/Billable Tasks/Unbilled Closed Tasks" id="menu_action_view_task2" action="action_view_task2" />
|
||||
|
||||
<record model="ir.actions.act_window" id="action_view_task3">
|
||||
|
|
|
@ -181,7 +181,7 @@
|
|||
<separator string="Notes" colspan="4"/>
|
||||
<field name="note" colspan="4" nolabel="1"/>
|
||||
</page>
|
||||
<page string="History">
|
||||
<page string="History" groups="base.group_extended">
|
||||
<separator string="Related invoices" colspan="4"/>
|
||||
<field name="invoice_ids" colspan="4" nolabel="1"/>
|
||||
<separator string="Related packings" colspan="4"/>
|
||||
|
|
|
@ -94,6 +94,7 @@
|
|||
</record>
|
||||
<menuitem parent="menu_action_inventory_form"
|
||||
id="menu_action_inventory_line_form"
|
||||
groups="base.group_extended"
|
||||
action="action_inventory_line_form"/>
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue