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

[MERGE] purchase + [FIX] misc sale order without delivery orders 

bzr revid: fp@openerp.com-20120916150517-16vr5lp419b0kpid
This commit is contained in:
Fabien Pinckaers 2012-09-16 17:05:17 +02:00
parent fe5541d4d6 11703cf346
commit 31a4392e36
6 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
addons/account/security/account_security.xml
View File

@ -5,6 +5,7 @@
<field name="name">Invoicing &amp; Payments</field>
<field name="category_id" ref="base.module_category_accounting_and_finance"/>
<field name="users" eval="[(4, ref('base.user_root'))]"/>
<field name="implied_ids" eval="[(4, ref('base.group_user'))]"/>
</record>
<record id="group_account_user" model="res.groups">
<field name="name">Accountant</field>

4
addons/purchase/purchase_view.xml
View File

@ -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 &amp; Invoicing">
<page string="Reception &amp; Invoicing">
<group>
<group>
<field name="dest_address_id" string="Customer Address" on_change="onchange_dest_address_id(dest_address_id)"/>

1
addons/purchase/security/purchase_security.xml
View File

@ -4,6 +4,7 @@
<record id="group_purchase_user" model="res.groups">
<field name="name">User</field>
<field name="implied_ids" eval="[(4, ref('base.group_user'))]"/>
<field name="category_id" ref="base.module_category_purchase_management"/>
</record>

1
addons/sale/res_partner_view.xml
View File

@ -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>

2
addons/sale/sale.py
View File

@ -584,7 +584,7 @@ class sale_order(osv.osv):
def test_no_product(self, cr, uid, order, context):
for line in order.order_line:
if line.product_id:
if line.product_id and (line.product_id.type<>'service'):
return False
return True

1
addons/sale/security/sale_security.xml
View File

@ -6,6 +6,7 @@
<field name="name">See Own Leads</field>
<field name="category_id" ref="base.module_category_sales_management"/>
<field name="comment">the user will have access to his own data in the sales application.</field>
<field name="implied_ids" eval="[(4, ref('base.group_user'))]"/>
</record>
<record id="base.group_sale_salesman_all_leads" model="res.groups">