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

[IMP] change desciption and groups of procure_method 

bzr revid: jco@openerp.com-20140327105749-4u7mx6u85b4rys61
This commit is contained in:
Josse Colpaert 2014-03-27 11:57:49 +01:00
parent e3ed834d55
commit 6e7fb705ee
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/stock/procurement.py
View File

@ -66,7 +66,9 @@ class procurement_rule(osv.osv):
help="Source location is action=move"),
'route_id': fields.many2one('stock.location.route', 'Route',
help="If route_id is False, the rule is global"),
'procure_method': fields.selection([('make_to_stock', 'Make to Stock'), ('make_to_order', 'Make to Order')], 'Procure Method', required=True, help="'Make to Stock': When needed, take from the stock or wait until re-supplying. 'Make to Order': When needed, purchase or produce for the procurement request."),
'procure_method': fields.selection([('make_to_stock', 'Take from stock'), ('make_to_order', 'Apply procurement rules again')], 'Procurement Method', required=True,
help="""Determines the procurement method of the stock move that will be generated: whether it will need to 'take from the available stock' in its source location
or needs to apply the procurement rules again. """),
'route_sequence': fields.related('route_id', 'sequence', string='Route Sequence',
store={
'stock.location.route': (_get_rules, ['sequence'], 10),

5
addons/stock/stock.py
View File

@ -1596,7 +1596,10 @@ class stock_move(osv.osv):
'split_from': fields.many2one('stock.move', string="Move Split From", help="Technical field used to track the origin of a split move, which can be useful in case of debug"),
'backorder_id': fields.related('picking_id', 'backorder_id', type='many2one', relation="stock.picking", string="Back Order of", select=True),
'origin': fields.char("Source"),
'procure_method': fields.selection([('make_to_stock', 'Make to Stock'), ('make_to_order', 'Make to Order')], 'Procurement Method', required=True, help="Make to Stock: When needed, the product is taken from the stock or we wait for replenishment. \nMake to Order: When needed, the product is purchased or produced."),
'procure_method': fields.selection([('make_to_stock', 'Default: Take from stock'), ('make_to_order', 'Advanced: Apply procurement rules')], 'Procurement Method', required=True,
help="""By default, the system will take from the available stock in the source location.
If we want to have chained moves, it can not take from the available stock, but has to apply the procurement rules
and wait for the moves generated by them. """),
# used for colors in tree views:
'scrapped': fields.related('location_dest_id', 'scrap_location', type='boolean', relation='stock.location', string='Scrapped', readonly=True),

8
addons/stock/stock_view.xml
View File

@ -1109,12 +1109,12 @@
<field name="location_id" groups="stock.group_locations"/>
<field name="picking_id" domain="[('picking_type_id','=',picking_type_id)]"/>
<field name="create_date" groups="base.group_no_one"/>
<field name="procure_method" attrs="{'readonly': [('state', '!=', 'draft')]}" groups="base.group_no_one"/>
<field name="procure_method" attrs="{'readonly': [('state', '!=', 'draft')]}" groups="stock.group_adv_location"/>
<field name="group_id"/>
</group>
<group name="destination_grp" string="Destination" groups="stock.group_locations">
<field name="location_dest_id" />
<field name="partner_id" context="{'contact_display':'partner'}" />
<field name="partner_id" context="{'contact_display':'partner'}" />
</group>
<group name="quants_grp" string="Reserved Quants" colspan="4" groups="base.group_no_one">
<field name="reserved_quant_ids"/>
@ -1140,7 +1140,7 @@
<group>
<group>
<field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, parent.partner_id)"/>
<field name="procure_method"/>
<field name="procure_method" groups="stock.group_adv_location"/>
<field name="picking_type_id" invisible="1"/>
<label for="product_uom_qty"/>
<div>
@ -1716,7 +1716,7 @@
</xpath>
<xpath expr="//group[@name='propagation_group']" position="before">
<group attrs="{'invisible': [('action', '!=', 'move')]}" string="Moving Options">
<field name="procure_method"/>
<field name="procure_method" groups="stock.group_adv_location"/>
<field name="location_src_id" attrs="{'required': [('action', '=', 'move')]}"/>
<field name="partner_address_id" groups="stock.group_adv_location" context="{'show_address': 1}" options="{'always_reload': 1}"/>
<label for="delay" string="Delay" groups="stock.group_adv_location"/>