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

[IMP] stock: fix English in usage of 'serial numbers' 

bzr revid: rco@openerp.com-20120509132401-fzbtrvorg7sd7vuc
This commit is contained in:
Raphael Collet 2012-05-09 15:24:01 +02:00
parent 429e48a5fd
commit e64d8c2d89
10 changed files with 39 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/stock/report/report_stock.py
View File

@ -26,7 +26,7 @@ from tools.sql import drop_view_if_exists
class stock_report_prodlots(osv.osv):
_name = "stock.report.prodlots"
_description = "Stock report by Serial Number"
_description = "Stock report by serial number"
_auto = False
_columns = {
'qty': fields.float('Quantity', readonly=True),
@ -82,7 +82,7 @@ stock_report_prodlots()
class stock_report_tracklots(osv.osv):
_name = "stock.report.tracklots"
_description = "Stock report by Logistic Serial Number"
_description = "Stock report by logistic serial number"
_auto = False
_columns = {
'name': fields.float('Quantity', readonly=True),

9
addons/stock/res_config.py
View File

@ -26,8 +26,7 @@ class stock_config_settings(osv.osv_memory):
_inherit = 'res.config.settings'
_columns = {
'module_claim_from_delivery': fields.boolean("Allows Claims on Delivery Orders",
'module_claim_from_delivery': fields.boolean("Allow Claims on Delivery Orders",
help="""Adds a Claim link to the delivery order.
This installs the module claim_from_delivery."""),
'module_stock_invoice_directly': fields.boolean("Invoice Directly from the Picking",
@ -35,7 +34,7 @@ class stock_config_settings(osv.osv_memory):
to be invoiced when you send or deliver goods.
This installs the module stock_invoice_directly."""),
'module_product_expiry': fields.boolean("Expiry Date on Lots",
help="""Track different dates on products and Serial Number.
help="""Track different dates on products and serial numbers.
The following dates can be tracked:
- end of life
- best before date
@ -47,7 +46,7 @@ class stock_config_settings(osv.osv_memory):
manage product manufacturing chains, manage default locations per product,
define routes within your warehouse according to business needs, etc.
This installs the module stock_location."""),
'group_uom': fields.boolean("Manage Different Unit of Measure for Products",
'group_uom': fields.boolean("Manage Different Units of Measure for Products",
implied_group='product.group_uom',
help="""Allows you to select and maintain different units of measure for products."""),
'group_uos': fields.boolean("Manage Secondary Unit of Measure (for Sale)",
@ -66,7 +65,7 @@ class stock_config_settings(osv.osv_memory):
help="""Allows you to get the upstream or downstream traceability of the products contained in lot."""),
'group_stock_inventory_valuation': fields.boolean("Generate Accounting Entries per Stock Movement",
implied_group='stock.group_inventory_valuation',
help="""This allows to split stock inventory lines according to Serial Number."""),
help="""This allows to split stock inventory lines according to serial numbers."""),
'group_stock_multiple_locations': fields.boolean("Manage Multiple Locations and Warehouses",
implied_group='stock.group_locations',
help="""This allows to configure and use multiple stock locations and warehouses,

4
addons/stock/security/stock_security.xml
View File

@ -14,12 +14,12 @@
</record>
<record id="group_production_lot" model="res.groups">
<field name="name">Manage Serial Number</field>
<field name="name">Manage Serial Numbers</field>
<field name="category_id" ref="base.module_category_hidden"/>
</record>
<record id="group_tracking_lot" model="res.groups">
<field name="name">Manage Logistic Serial Number</field>
<field name="name">Manage Logistic Serial Numbers</field>
<field name="category_id" ref="base.module_category_hidden"/>
</record>

10
addons/stock/stock.py
View File

@ -1487,7 +1487,7 @@ class stock_production_lot(osv.osv):
digits_compute=dp.get_precision('Product Unit of Measure')),
'revisions': fields.one2many('stock.production.lot.revision', 'lot_id', 'Revisions'),
'company_id': fields.many2one('res.company', 'Company', select=True),
'move_ids': fields.one2many('stock.move', 'prodlot_id', 'Moves for this Serial Number', readonly=True),
'move_ids': fields.one2many('stock.move', 'prodlot_id', 'Moves for this serial number', readonly=True),
}
_defaults = {
'date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
@ -1512,7 +1512,7 @@ stock_production_lot()
class stock_production_lot_revision(osv.osv):
_name = 'stock.production.lot.revision'
_description = 'Serial Number revisions'
_description = 'Serial Number Revision'
_columns = {
'name': fields.char('Revision Name', size=64, required=True),
@ -1578,7 +1578,7 @@ class stock_move(osv.osv):
return res
def _check_tracking(self, cr, uid, ids, context=None):
""" Checks if Serial Number is assigned to stock move or not.
""" Checks if serial number is assigned to stock move or not.
@return: True or False
"""
for move in self.browse(cr, uid, ids, context=context):
@ -1620,7 +1620,7 @@ class stock_move(osv.osv):
'location_dest_id': fields.many2one('stock.location', 'Destination Location', required=True,states={'done': [('readonly', True)]}, select=True, help="Location where the system will stock the finished products."),
'partner_id': fields.many2one('res.partner', 'Destination Address ', states={'done': [('readonly', True)]}, help="Optional address where goods are to be delivered, specifically used for allotment"),
'prodlot_id': fields.many2one('stock.production.lot', 'Serial Number', states={'done': [('readonly', True)]}, help="Serial Number is used to put a serial number on the production", select=True),
'prodlot_id': fields.many2one('stock.production.lot', 'Serial Number', states={'done': [('readonly', True)]}, help="Serial number is used to put a serial number on the production", select=True),
'tracking_id': fields.many2one('stock.tracking', 'Pack', select=True, states={'done': [('readonly', True)]}, help="Logistical shipping unit: pallet, box, pack ..."),
'auto_validate': fields.boolean('Auto Validate'),
@ -1650,7 +1650,7 @@ class stock_move(osv.osv):
_constraints = [
(_check_tracking,
'You must assign a Serial Number for this product',
'You must assign a serial number for this product',
['prodlot_id']),
(_check_location, 'You can not move products from or to a location of the type view.',
['location_id','location_dest_id']),

4
addons/stock/stock_sequence.xml
View File

@ -52,11 +52,11 @@
Sequences from tracking numbers
-->
<record id="sequence_type_serial" model="ir.sequence.type">
<field name="name">Serial Number</field>
<field name="name">Serial Numbers</field>
<field name="code">stock.lot.serial</field>
</record>
<record id="sequence_production_lots" model="ir.sequence">
<field name="name">Serial Number</field>
<field name="name">Serial Numbers</field>
<field name="code">stock.lot.serial</field>
<field name="prefix"></field>
<field name="padding">7</field>

26
addons/stock/stock_view.xml
View File

@ -116,7 +116,7 @@
<page string="General Informations">
<field colspan="4" name="inventory_line_id" nolabel="1" widget="one2many_list">
<tree string="Products" editable="bottom">
<field domain="[('usage','=','internal')]" name="location_id" />
<field domain="[('usage','=','internal')]" name="location_id"/>
<field context="{'location':location_id, 'uom':product_uom, 'to_date':parent.date}" name="product_id" on_change="on_change_product_id(location_id,product_id,product_uom,parent.date)" domain="[('type','&lt;&gt;','service')]"/>
<field name="product_qty"/>
<field name="product_uom" groups="product.group_uom"/>
@ -147,7 +147,7 @@
<field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
<field name="product_uom" string="Unit of Measure" groups="product.group_uom"/>
<field name="prodlot_id" groups="stock.group_production_lot"/>
<button name="%(track_line)d" string="Split in Serial Number" type="action"
<button name="%(track_line)d" string="Split in serial numbers" type="action"
icon="terp-stock_effects-object-colorize"
attrs="{'invisible': [('prodlot_id','&lt;&gt;',False)]}"
states="draft,done,cancel"
@ -755,20 +755,20 @@
<field groups="product.group_uos" name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" colspan="4"/>
<field name="product_packaging" groups="product.group_stock_packaging" domain="[('product_id','=',product_id)]" colspan="4"/>
</group>
<group colspan="2" col="2">
<separator string="Locations" colspan="2" />
<field name="location_id" domain="[('usage','&lt;&gt;','view')]"/>
<field name="location_dest_id" domain="[('usage','=','internal')]"/>
</group>
<group colspan="2" col="2">
<separator string="Dates" colspan="2" />
<field name="create_date" invisible="1"/>
<field name="date"/>
<field name="date_expected" on_change="onchange_date(date,date_expected)"/>
</group>
<group colspan="2" col="4" groups="stock.group_tracking_lot">
<separator string="Traceability" colspan="4" groups="stock.group_tracking_lot"/>
<field name="tracking_id" groups="stock.group_tracking_lot" colspan="3"/>
@ -910,7 +910,7 @@
states="draft,waiting,confirmed,assigned" />
<field name="scrapped" invisible="1"/>
<field name="prodlot_id" groups="stock.group_production_lot"/>
<button name="%(track_line)d" string="Split in Serial Number" type="action"
<button name="%(track_line)d" string="Split in Serial Numbers" type="action"
icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('prodlot_id','&lt;&gt;',False)]}"
states="draft,assigned,confirmed"
groups="stock.group_production_lot"/>
@ -950,14 +950,14 @@
<field name="location_id" domain="[('usage','=','internal')]"/>
<field name="location_dest_id" domain="[('usage','&lt;&gt;','view')]"/>
</group>
<group colspan="2" col="2">
<separator string="Dates" colspan="2" />
<field name="create_date" invisible="1"/>
<field name="date"/>
<field name="date_expected" on_change="onchange_date(date,date_expected)"/>
</group>
<group colspan="2" col="4">
<separator string="Traceability" colspan="4" groups="stock.group_tracking_lot"/>
<field name="tracking_id" groups="stock.group_tracking_lot" colspan="3" />
@ -1130,7 +1130,7 @@
<field name="prodlot_id" groups="stock.group_production_lot"/>
<button
name="%(stock.track_line)d"
string="Split in Serial Number"
string="Split in Serial Numbers"
groups="stock.group_production_lot"
type="action" icon="terp-stock_effects-object-colorize"
states="draft,waiting,confirmed,assigned" />
@ -1167,14 +1167,14 @@
<field name="location_id" domain="[('usage','&lt;&gt;','view')]"/>
<field name="location_dest_id" domain="[('usage','=','internal')]"/>
</group>
<group colspan="2" col="2">
<separator string="Dates" colspan="2" />
<field name="create_date" invisible="1"/>
<field name="date"/>
<field name="date_expected" on_change="onchange_date(date,date_expected)"/>
</group>
<group colspan="2" col="4">
<separator string="Traceability" colspan="4" groups="stock.group_tracking_lot"/>
<field name="tracking_id" groups="stock.group_tracking_lot" colspan="3" />
@ -1370,7 +1370,7 @@
states="draft,waiting,confirmed,assigned"
/>
<field name="prodlot_id" groups="stock.group_production_lot"/>
<button name="%(track_line)d" string="Split in Serial Number" type="action"
<button name="%(track_line)d" string="Split in Serial Numbers" type="action"
icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('prodlot_id','&lt;&gt;',False)]}"
states="draft,waiting,confirmed,assigned,done"
groups="stock.group_tracking_lot"/>
@ -1541,7 +1541,7 @@
icon="gtk-convert" context="{'scrap': True}"
states="draft,waiting,confirmed,assigned"/>
<field name="prodlot_id" groups="stock.group_production_lot"/>
<button name="%(track_line)d" string="Split in Serial Number" type="action"
<button name="%(track_line)d" string="Split in Serial Numbers" type="action"
icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('prodlot_id','&lt;&gt;',False)]}"
states="draft,waiting,confirmed,assigned,done"
groups="stock.group_tracking_lot"/>

6
addons/stock/wizard/stock_inventory_line_split.py
View File

@ -27,8 +27,8 @@ class stock_inventory_line_split(osv.osv_memory):
_description = "Split inventory lines"
_columns = {
'line_ids': fields.one2many('stock.inventory.line.split.lines', 'wizard_id', 'Serial Number'),
'line_exist_ids': fields.one2many('stock.inventory.line.split.lines', 'wizard_exist_id', 'Serial Number'),
'line_ids': fields.one2many('stock.inventory.line.split.lines', 'wizard_id', 'Serial Numbers'),
'line_exist_ids': fields.one2many('stock.inventory.line.split.lines', 'wizard_exist_id', 'Serial Numbers'),
}
def default_get(self, cr, uid, fields, context=None):
@ -46,7 +46,7 @@ class stock_inventory_line_split(osv.osv_memory):
return res
def split(self, cr, uid, ids, line_ids, context=None):
""" To split stock inventory lines according to Serial Number.
""" To split stock inventory lines according to serial numbers.
:param line_ids: the ID or list of IDs of inventory lines we want to split
"""

10
addons/stock/wizard/stock_move.py
View File

@ -144,7 +144,7 @@ stock_move_scrap()
class split_in_production_lot(osv.osv_memory):
_name = "stock.move.split"
_description = "Split in Serial Number"
_description = "Split in Serial Numbers"
def default_get(self, cr, uid, fields, context=None):
if context is None:
@ -168,8 +168,8 @@ class split_in_production_lot(osv.osv_memory):
'qty': fields.float('Quantity', digits_compute=dp.get_precision('Product Unit of Measure')),
'product_id': fields.many2one('product.product', 'Product', required=True, select=True),
'product_uom': fields.many2one('product.uom', 'Unit of Measure'),
'line_ids': fields.one2many('stock.move.split.lines', 'wizard_id', 'Serial Number'),
'line_exist_ids': fields.one2many('stock.move.split.lines', 'wizard_exist_id', 'Serial Number'),
'line_ids': fields.one2many('stock.move.split.lines', 'wizard_id', 'Serial Numbers'),
'line_exist_ids': fields.one2many('stock.move.split.lines', 'wizard_exist_id', 'Serial Numbers'),
'use_exist' : fields.boolean('Existing Lots', help="Check this option to select existing lots in the list below, otherwise you should enter new ones line by line."),
'location_id': fields.many2one('stock.location', 'Source Location')
}
@ -182,7 +182,7 @@ class split_in_production_lot(osv.osv_memory):
return {'type': 'ir.actions.act_window_close'}
def split(self, cr, uid, ids, move_ids, context=None):
""" To split stock moves into Serial Number
""" To split stock moves into serial numbers
:param move_ids: the ID or list of IDs of stock move we want to split
"""
@ -210,7 +210,7 @@ class split_in_production_lot(osv.osv_memory):
quantity = line.quantity
total_move_qty += quantity
if total_move_qty > move_qty:
raise osv.except_osv(_('Processing Error'), _('Serial Number quantity %d of %s is larger than available quantity (%d) !') \
raise osv.except_osv(_('Processing Error'), _('Serial number quantity %d of %s is larger than available quantity (%d) !') \
% (total_move_qty, move.product_id.name, move_qty))
if quantity <= 0 or move_qty == 0:
continue

4
addons/stock/wizard/stock_move_view.xml
View File

@ -93,7 +93,7 @@
<group colspan="4" attrs="{'invisible':[('use_exist','=',True)]}">
<field name="line_ids" colspan="4" nolabel="1">
<tree string="Serial Number" editable="bottom">
<tree string="Serial Numbers" editable="bottom">
<field name="name" string="Lots"/>
<field name="quantity" />
</tree>
@ -105,7 +105,7 @@
</group>
<group colspan="4" attrs="{'invisible':[('use_exist','!=',True)]}">
<field name="line_exist_ids" colspan="4" nolabel="1">
<tree string="Serial Number" editable="bottom">
<tree string="Serial Numbers" editable="bottom">
<field name="prodlot_id" string="Lot number" domain="[('product_id','=',parent.product_id)]" on_change="onchange_lot_id(prodlot_id, quantity, parent.location_id, parent.product_id, parent.product_uom)"/>
<field name="quantity" on_change="onchange_lot_id(prodlot_id, quantity, parent.location_id, parent.product_id, parent.product_uom)" />
</tree>

2
addons/stock/wizard/stock_partial_picking.py
View File

@ -145,7 +145,7 @@ class stock_partial_picking(osv.osv_memory):
if line_uom.factor and line_uom.factor <> 0:
if qty_in_line_uom <> wizard_line.quantity:
raise osv.except_osv(_('Warning'), _('The Unit of Measure rounding does not allow you to ship "%s %s", only roundings of "%s %s" is accepted by the Unit of Measure.') % (wizard_line.quantity, line_uom.name, line_uom.rounding, line_uom.name))
raise osv.except_osv(_('Warning'), _('The unit of measure rounding does not allow you to ship "%s %s", only roundings of "%s %s" is accepted by the Unit of Measure.') % (wizard_line.quantity, line_uom.name, line_uom.rounding, line_uom.name))
if move_id:
#Check rounding Quantity.ex.
#picking: 1kg, uom kg rounding = 0.01 (rounding to 10g),