[FIX] stock_landed_cost: setting option appears at the right place in the right moment
bzr revid: qdp-launchpad@openerp.com-20140424085838-nzk6p11ncitvkbta
This commit is contained in:
parent
a9aa264355
commit
19dad8973c
|
@ -110,8 +110,6 @@ This installs the module product_expiry."""),
|
||||||
help='\nCreates the dropship route and add more complex tests'
|
help='\nCreates the dropship route and add more complex tests'
|
||||||
'-This installs the module stock_dropshipping.'),
|
'-This installs the module stock_dropshipping.'),
|
||||||
'module_stock_picking_wave': fields.boolean('Manage picking wave', help='Install the picking wave module which will help you grouping your pickings and processing them in batch'),
|
'module_stock_picking_wave': fields.boolean('Manage picking wave', help='Install the picking wave module which will help you grouping your pickings and processing them in batch'),
|
||||||
'module_stock_landed_costs': fields.boolean("Calculate landed costs on products",
|
|
||||||
help="""Install the module that allows to affect landed costs on pickings, and split them onto the different products."""),
|
|
||||||
}
|
}
|
||||||
|
|
||||||
def onchange_adv_location(self, cr, uid, ids, group_stock_adv_location, context=None):
|
def onchange_adv_location(self, cr, uid, ids, group_stock_adv_location, context=None):
|
||||||
|
|
|
@ -44,16 +44,6 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</group>
|
</group>
|
||||||
<separator string="Accounting"/>
|
|
||||||
<group>
|
|
||||||
<label for="id" string="Accounting"/>
|
|
||||||
<div>
|
|
||||||
<div>
|
|
||||||
<field name="module_stock_landed_costs" class="oe_inline"/>
|
|
||||||
<label for="module_stock_landed_costs"/>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</group>
|
|
||||||
<separator string="Location & Warehouse"/>
|
<separator string="Location & Warehouse"/>
|
||||||
<group>
|
<group>
|
||||||
<label for="id" string="Logistic"/>
|
<label for="id" string="Logistic"/>
|
||||||
|
|
|
@ -34,6 +34,8 @@ class stock_config_settings(osv.osv_memory):
|
||||||
help='This allows to automatically launch the invoicing wizard if the delivery is '
|
help='This allows to automatically launch the invoicing wizard if the delivery is '
|
||||||
'to be invoiced when you send or deliver goods.\n'
|
'to be invoiced when you send or deliver goods.\n'
|
||||||
'-This installs the module stock_invoice_directly.'),
|
'-This installs the module stock_invoice_directly.'),
|
||||||
|
'module_stock_landed_costs': fields.boolean("Calculate landed costs on products",
|
||||||
|
help="""Install the module that allows to affect landed costs on pickings, and split them onto the different products."""),
|
||||||
}
|
}
|
||||||
|
|
||||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||||
|
|
|
@ -18,6 +18,10 @@
|
||||||
<field name="module_stock_invoice_directly" class="oe_inline"/>
|
<field name="module_stock_invoice_directly" class="oe_inline"/>
|
||||||
<label for="module_stock_invoice_directly"/>
|
<label for="module_stock_invoice_directly"/>
|
||||||
</div>
|
</div>
|
||||||
|
<div>
|
||||||
|
<field name="module_stock_landed_costs" class="oe_inline"/>
|
||||||
|
<label for="module_stock_landed_costs"/>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</group>
|
</group>
|
||||||
</xpath>
|
</xpath>
|
||||||
|
|
|
@ -32,7 +32,7 @@
|
||||||
'website': 'http://www.openerp.com',
|
'website': 'http://www.openerp.com',
|
||||||
'images': [],
|
'images': [],
|
||||||
'depends': ['stock_account'],
|
'depends': ['stock_account'],
|
||||||
'category': 'Hidden',
|
'category': 'Warehouse Management',
|
||||||
'sequence': 16,
|
'sequence': 16,
|
||||||
'demo': [
|
'demo': [
|
||||||
],
|
],
|
||||||
|
|
Loading…
Reference in New Issue