[IMP] stock and various: labelling

- delivery: rename cost price to shipper price to ease the understanding.
- product_email_template: fixed space issues in help of email_template_id.
- stock: labelling reordering wizard
- stock_account: labelling (inventory at date) + shorter and cleaner help
messages. The main menu for this wizard has been put in technical group.
- stock_landed_costs: fields labels update
This commit is contained in:
Thibault Delavallée
2015-08-24 15:34:19 +02:00
parent 98ee61fd73
commit 38b1485d52
5 changed files with 12 additions and 15 deletions
+1 -1
View File
@@ -229,7 +229,7 @@ class delivery_grid_line(osv.osv):
'variable_factor': fields.selection([('weight','Weight'),('volume','Volume'),('wv','Weight * Volume'), ('price','Price'), ('quantity','Quantity')], 'Variable Factor', required=True),
'list_base_price': fields.float('Sale Base Price', digits_compute=dp.get_precision('Product Price'), required=True),
'list_price': fields.float('Sale Price', digits_compute= dp.get_precision('Product Price'), required=True),
'standard_price': fields.float('Cost Price', digits_compute= dp.get_precision('Product Price'), required=True),
'standard_price': fields.float('Shipper Price', digits_compute= dp.get_precision('Product Price'), required=True),
}
_defaults = {
@@ -13,7 +13,7 @@ class product_template(osv.Model):
_columns = {
'email_template_id': fields.many2one(
'mail.template', 'Product Email Template',
help='When validating an invoice, an email will be sent to the customer'
'based on this template. The customer will receive an email for each'
help='When validating an invoice, an email will be sent to the customer '
'based on this template. The customer will receive an email for each '
'product linked to an email template.'),
}
@@ -5,7 +5,7 @@
<!-- Compute Stock Minimum Rules Only -->
<record id="view_procurement_compute_wizard" model="ir.ui.view">
<field name="name">Run Stock Minimum Rules Only</field>
<field name="name">Run Reordering Rules</field>
<field name="model">procurement.orderpoint.compute</field>
<field name="arch" type="xml">
<form string="Parameters">
@@ -20,7 +20,7 @@
</field>
</record>
<act_window name="Run Stock Minimum Rules Only"
<act_window name="Run Reordering Rules"
res_model="procurement.orderpoint.compute"
src_model="procurement.order"
view_mode="form"
@@ -3,18 +3,15 @@
<data>
<record id="view_wizard_valuation_history" model="ir.ui.view">
<field name="name">Stock Valuation</field>
<field name="name">Inventory at Date</field>
<field name="model">wizard.valuation.history</field>
<field name="arch" type="xml">
<form string="Choose your date">
<p class="oe_gray" attrs="{'invisible': [('choose_date', '=', False)]}">
Choose the date for which you want to get the stock valuation of your products.
This will filter the stock operation that weren't done at the selected date, to retrieve the quantity
you had, and gives you the inventory value according to the standard price used at that time.
Choose a date in the past to get the inventory at that date.
</p>
<p class="oe_gray" attrs="{'invisible': [('choose_date', '=', True)]}">
Retrieve the stock valuation of your products at current day
Retrieve the curent stock valuation.
</p>
<group>
<field name="choose_date"/>
@@ -28,14 +25,14 @@
</field>
</record>
<record id="action_wizard_stock_valuation_history" model="ir.actions.act_window">
<field name="name">Stock Valuation</field>
<field name="name">Inventory at Date</field>
<field name="res_model">wizard.valuation.history</field>
<field name="view_type">form</field>
<field name="view_mode">form</field>
<field name="view_id" ref="view_wizard_valuation_history"/>
<field name="target">new</field>
</record>
<menuitem id="menu_action_wizard_valuation_history" action="action_wizard_stock_valuation_history" parent="stock.menu_warehouse_report" sequence="1"/>
<menuitem id="menu_action_wizard_valuation_history" action="action_wizard_stock_valuation_history" parent="stock.menu_warehouse_report" sequence="1" groups="base.group_no_one"/>
<record id="view_stock_history_report_tree" model="ir.ui.view">
<field name="name">Stock Value At Date</field>
+2 -2
View File
@@ -6,7 +6,7 @@ from openerp.osv import fields, osv
SPLIT_METHOD = [
('equal', 'Equal'),
('by_quantity', 'By Quantity'),
('by_current_cost_price', 'By Current Cost Price'),
('by_current_cost_price', 'By Current Cost'),
('by_weight', 'By Weight'),
('by_volume', 'By Volume'),
]
@@ -15,7 +15,7 @@ class product_template(osv.osv):
_inherit = "product.template"
_columns = {
'landed_cost_ok': fields.boolean('Can constitute a landed cost'),
'landed_cost_ok': fields.boolean('Landed Costs'),
'split_method': fields.selection(SPLIT_METHOD, 'Split Method'),
}