pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] branch merged with trunk-menus-improvements-purchase-mtr

Browse Source 
bzr revid: mtr@tinyerp.com-20120305092931-ytzcc8a67dq737o5
This commit is contained in:
Meera Trambadia (OpenERP)
2012-03-05 14:59:31 +05:30
parent 89a9e35a76 66974d570d
commit 362c3a1318
3 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/purchase/purchase_view.xml
+7 -6
View File
@@ -82,11 +82,12 @@
</record>
<!--supplier menu-->
<menuitem id="base.menu_procurement_management_supplier" name="Address Book"
parent="base.menu_purchase_root" sequence="3"/>
<menuitem id="base.menu_procurement_management_supplier_name" name="Suppliers"
parent="base.menu_procurement_management_supplier"
action="base.action_partner_supplier_form" sequence="1"/>
<menuitem id="base.menu_procurement_management_supplier_name" name="Suppliers"
parent="menu_procurement_management"
action="base.action_partner_supplier_form" sequence="15"/>
<menuitem id="base.menu_procurement_management_supplier_contacts_name" name="Contacts"
parent="menu_procurement_management"
action="action_supplier_address_form" sequence="20"/>
<!--Inventory control-->
<menuitem id="menu_procurement_management_inventory" name="Receive Products"
@@ -304,7 +305,7 @@
</search>
</field>
</record>
<record id="purchase_order_tree" model="ir.ui.view">
<field name="name">purchase.order.tree</field>
<field name="model">purchase.order</field>
addons/purchase_requisition/purchase_requisition_view.xml
+1 -1
View File
@@ -166,7 +166,7 @@
<field name="res_model">purchase.requisition</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="context">{"search_default_create_uid":uid,'search_default_draft': 1}</field>
<field name="context">{"search_default_create_uid":uid}</field>
<field name="search_view_id" ref="view_purchase_requisition_filter"/>
<field name="help">A purchase requisition is the step before a request for quotation. In a purchase requisition (or purchase tender), you can record the products you need to buy and trigger the creation of RfQs to suppliers. After the negotiation, once you have reviewed all the supplier's offers, you can validate some and cancel others.</field>
</record>
addons/stock/stock_view.xml
+2 -2
View File
@@ -1274,7 +1274,7 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar</field>
<field name="domain">[('type','=','in')]</field>
<field name="context">{'contact_display': 'partner_address',"search_default_available":1}</field>
<field name="context">{'contact_display': 'partner_address'}</field>
<field name="search_view_id" ref="view_picking_in_search"/>
<field name="help">The Incoming Shipments is the list of all orders you will receive from your suppliers. An incoming shipment contains a list of products to be received according to the original purchase order. You can validate the shipment totally or partially.</field>
</record>
@@ -1735,7 +1735,7 @@
<field name="view_mode">tree,form</field>
<field name="domain">['|','&amp;',('picking_id','=',False),('location_id.usage', 'in', ['customer','supplier']),'&amp;',('picking_id','!=',False),('picking_id.type','=','in')]</field>
<field name="view_id" ref="view_move_tree_reception_picking"/>
<field name="context" eval="'{\'search_default_receive\':1, \'search_default_available\':1, \'product_receive\' : True, \'default_location_id\':%d, \'default_location_dest_id\':%d}' % (ref('stock_location_suppliers'),ref('stock_location_stock') )"/>
<field name="context" eval="'{\'product_receive\' : True, \'default_location_id\':%d, \'default_location_dest_id\':%d}' % (ref('stock_location_suppliers'),ref('stock_location_stock') )"/>
<field name="search_view_id" ref="view_move_search_reception_incoming_picking"/>
<field name="help">Here you can receive individual products, no matter what purchase order or picking order they come from. You will find the list of all products you are waiting for. Once you receive an order, you can filter based on the name of the supplier or the purchase order reference. Then you can confirm all products received using the buttons on the right of each line.</field>
</record>