+
-
+
-
+
-
- All Feeds
-All Feeds |
+ + |
-
+
@@ -45,7 +46,7 @@
-
-
+
+ + + diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py index 88908884b26..02272040311 100644 --- a/addons/mrp/mrp.py +++ b/addons/mrp/mrp.py @@ -206,8 +206,8 @@ class mrp_bom(osv.osv): 'product_id': fields.many2one('product.product', 'Product', required=True), 'product_uos_qty': fields.float('Product UOS Qty'), 'product_uos': fields.many2one('product.uom', 'Product UOS', help="Product UOS (Unit of Sale) is the unit of measurement for the invoicing and promotion of stock."), - 'product_qty': fields.float('Product Qty', required=True, digits_compute=dp.get_precision('Product UoM')), - 'product_uom': fields.many2one('product.uom', 'Product UOM', required=True, help="UoM (Unit of Measure) is the unit of measurement for the inventory control"), + 'product_qty': fields.float('Product Qty', required=True, digits_compute=dp.get_precision('Product Unit of Measure')), + 'product_uom': fields.many2one('product.uom', 'Product Unit of Measure', required=True, help="Unit of Measure (Unit of Measure) is the unit of measurement for the inventory control"), 'product_rounding': fields.float('Product Rounding', help="Rounding applied on the product quantity."), 'product_efficiency': fields.float('Manufacturing Efficiency', required=True, help="A factor of 0.9 means a loss of 10% within the production process."), 'bom_lines': fields.one2many('mrp.bom', 'bom_id', 'BoM Lines'), @@ -454,8 +454,8 @@ class mrp_production(osv.osv): 'priority': fields.selection([('0','Not urgent'),('1','Normal'),('2','Urgent'),('3','Very Urgent')], 'Priority', select=True), 'product_id': fields.many2one('product.product', 'Product', required=True, readonly=True, states={'draft':[('readonly',False)]}), - 'product_qty': fields.float('Product Qty', digits_compute=dp.get_precision('Product UoM'), required=True, states={'draft':[('readonly',False)]}, readonly=True), - 'product_uom': fields.many2one('product.uom', 'Product UOM', required=True, states={'draft':[('readonly',False)]}, readonly=True), + 'product_qty': fields.float('Product Qty', digits_compute=dp.get_precision('Product Unit of Measure'), required=True, states={'draft':[('readonly',False)]}, readonly=True), + 'product_uom': fields.many2one('product.uom', 'Product Unit of Measure', required=True, states={'draft':[('readonly',False)]}, readonly=True), 'product_uos_qty': fields.float('Product UoS Qty', states={'draft':[('readonly',False)]}, readonly=True), 'product_uos': fields.many2one('product.uom', 'Product UoS', states={'draft':[('readonly',False)]}, readonly=True), @@ -1112,12 +1112,18 @@ class mrp_production_product_line(osv.osv): _columns = { 'name': fields.char('Name', size=64, required=True), 'product_id': fields.many2one('product.product', 'Product', required=True), - 'product_qty': fields.float('Product Qty', digits_compute=dp.get_precision('Product UoM'), required=True), - 'product_uom': fields.many2one('product.uom', 'Product UOM', required=True), + 'product_qty': fields.float('Product Qty', digits_compute=dp.get_precision('Product Unit of Measure'), required=True), + 'product_uom': fields.many2one('product.uom', 'Product Unit of Measure', required=True), 'product_uos_qty': fields.float('Product UOS Qty'), 'product_uos': fields.many2one('product.uom', 'Product UOS'), 'production_id': fields.many2one('mrp.production', 'Production Order', select=True), } mrp_production_product_line() +class product_product(osv.osv): + _inherit = "product.product" + _columns = { + 'bom_ids': fields.one2many('mrp.bom', 'product_id', 'Bill of Materials'), + } + # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml index 121567b3e56..e8b809b2ec4 100644 --- a/addons/mrp/mrp_view.xml +++ b/addons/mrp/mrp_view.xml @@ -413,7 +413,6 @@+ + +Configure Marketing +marketing.config.settings +form ++ + ++ + + + + +Configure Marketing +marketing.config.settings +form +inline +- @@ -433,7 +432,7 @@ - + @@ -450,7 +449,7 @@ tree child_complete_ids - ++ @@ -664,7 +663,7 @@ - + + +product.normal.form.mrp.inherit +product.product +form ++ + ++ ++ + - - diff --git a/addons/mrp/report/price.py b/addons/mrp/report/price.py index fc32eeeed9e..9b3b724306f 100644 --- a/addons/mrp/report/price.py +++ b/addons/mrp/report/price.py @@ -136,7 +136,7 @@ class report_custom(report_rml): + sequence="8" action="action_mrp_configuration"/> diff --git a/addons/mrp/wizard/change_production_qty.py b/addons/mrp/wizard/change_production_qty.py index 59370e0ff2f..e85ceda7dd5 100644 --- a/addons/mrp/wizard/change_production_qty.py +++ b/addons/mrp/wizard/change_production_qty.py @@ -28,7 +28,7 @@ class change_production_qty(osv.osv_memory): _description = 'Change Quantity of Products' _columns = { - 'product_qty': fields.float('Product Qty', digits_compute=dp.get_precision('Product UoM'), required=True), + 'product_qty': fields.float('Product Qty', digits_compute=dp.get_precision('Product Unit of Measure'), required=True), } def default_get(self, cr, uid, fields, context=None): diff --git a/addons/mrp/wizard/mrp_product_produce.py b/addons/mrp/wizard/mrp_product_produce.py index db4d6e77691..a6bd61ac0ff 100644 --- a/addons/mrp/wizard/mrp_product_produce.py +++ b/addons/mrp/wizard/mrp_product_produce.py @@ -27,7 +27,7 @@ class mrp_product_produce(osv.osv_memory): _description = "Product Produce" _columns = { - 'product_qty': fields.float('Select Quantity', digits_compute=dp.get_precision('Product UoM'), required=True), + 'product_qty': fields.float('Select Quantity', digits_compute=dp.get_precision('Product Unit of Measure'), required=True), 'mode': fields.selection([('consume_produce', 'Consume & Produce'), ('consume', 'Consume Only')], 'Mode', required=True, help="'Consume only' mode will only consume the products with the quantity selected.\n" diff --git a/addons/mrp_operations/mrp_operations.py b/addons/mrp_operations/mrp_operations.py index 78deb68e5e7..74f1adcc431 100644 --- a/addons/mrp_operations/mrp_operations.py +++ b/addons/mrp_operations/mrp_operations.py @@ -105,7 +105,7 @@ class mrp_production_workcenter_line(osv.osv): 'product':fields.related('production_id','product_id',type='many2one',relation='product.product',string='Product', readonly=True), 'qty':fields.related('production_id','product_qty',type='float',string='Qty',readonly=True, store=True), - 'uom':fields.related('production_id','product_uom',type='many2one',relation='product.uom',string='UOM',readonly=True), + 'uom':fields.related('production_id','product_uom',type='many2one',relation='product.uom',string='Unit of Measure',readonly=True), } _defaults = { diff --git a/addons/mrp_operations/report/mrp_workorder_analysis.py b/addons/mrp_operations/report/mrp_workorder_analysis.py index 545ce73656d..6debde0daec 100644 --- a/addons/mrp_operations/report/mrp_workorder_analysis.py +++ b/addons/mrp_operations/report/mrp_workorder_analysis.py @@ -35,7 +35,7 @@ class mrp_workorder(osv.osv): 'nbr': fields.integer('# of Lines', readonly=True), 'date': fields.date('Date', readonly=True), 'product_id': fields.many2one('product.product', 'Product', readonly=True), - 'product_qty': fields.float('Product Qty', digits_compute=dp.get_precision('Product UoM'), readonly=True), + 'product_qty': fields.float('Product Qty', digits_compute=dp.get_precision('Product Unit of Measure'), readonly=True), 'state': fields.selection([('draft','Draft'),('startworking', 'In Progress'),('pause','Pause'),('cancel','Cancelled'),('done','Finished')],'State', readonly=True), 'total_hours': fields.float('Total Hours', readonly=True), 'total_cycles': fields.float('Total Cycles', readonly=True), diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py index 4a0085e3db9..4de816f3363 100644 --- a/addons/mrp_repair/mrp_repair.py +++ b/addons/mrp_repair/mrp_repair.py @@ -268,9 +268,9 @@ class mrp_repair(osv.osv): } def onchange_lot_id(self, cr, uid, ids, lot, product_id): - """ On change of production lot sets the values of source location, + """ On change of Serial Number sets the values of source location, destination location, move and guarantee limit. - @param lot: Changed id of production lot. + @param lot: Changed id of Serial Number. @param product_id: Product id from current record. @return: Dictionary of values. """ @@ -334,7 +334,7 @@ class mrp_repair(osv.osv): raise osv.except_osv(_('Error !'),_('You cannot confirm a repair order which has no line.')) for line in o.operations: if line.product_id.track_production and not line.prodlot_id: - raise osv.except_osv(_('Warning'), _("Production lot is required for opration line with product '%s'") % (line.product_id.name)) + raise osv.except_osv(_('Warning'), _("Serial number is required for operation line with product '%s'") % (line.product_id.name)) mrp_line_obj.write(cr, uid, [l.id for l in o.operations], {'state': 'confirmed'}) return True @@ -644,8 +644,8 @@ class mrp_repair_line(osv.osv, ProductChangeMixin): 'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Sale Price')), 'price_subtotal': fields.function(_amount_line, string='Subtotal',digits_compute= dp.get_precision('Sale Price')), 'tax_id': fields.many2many('account.tax', 'repair_operation_line_tax', 'repair_operation_line_id', 'tax_id', 'Taxes'), - 'product_uom_qty': fields.float('Quantity (UoM)', digits=(16,2), required=True), - 'product_uom': fields.many2one('product.uom', 'Product UoM', required=True), + 'product_uom_qty': fields.float('Quantity (Unit of Measure)', digits=(16,2), required=True), + 'product_uom': fields.many2one('product.uom', 'Product Unit of Measure', required=True), 'prodlot_id': fields.many2one('stock.production.lot', 'Lot Number',domain="[('product_id','=',product_id)]"), 'invoice_line_id': fields.many2one('account.invoice.line', 'Invoice Line', readonly=True), 'location_id': fields.many2one('stock.location', 'Source Location', required=True, select=True), @@ -735,7 +735,7 @@ class mrp_repair_fee(osv.osv, ProductChangeMixin): 'product_id': fields.many2one('product.product', 'Product'), 'product_uom_qty': fields.float('Quantity', digits=(16,2), required=True), 'price_unit': fields.float('Unit Price', required=True), - 'product_uom': fields.many2one('product.uom', 'Product UoM', required=True), + 'product_uom': fields.many2one('product.uom', 'Product Unit of Measure', required=True), 'price_subtotal': fields.function(_amount_line, string='Subtotal',digits_compute= dp.get_precision('Sale Price')), 'tax_id': fields.many2many('account.tax', 'repair_fee_line_tax', 'repair_fee_line_id', 'tax_id', 'Taxes'), 'invoice_line_id': fields.many2one('account.invoice.line', 'Invoice Line', readonly=True), diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml index 6af1dc702fa..b8c5bfe7a24 100644 --- a/addons/mrp_repair/mrp_repair_view.xml +++ b/addons/mrp_repair/mrp_repair_view.xml @@ -53,7 +53,7 @@%s %s - """ % (_('Components'), _('Components suppliers'), _('Quantity'),_('Cost Price per Uom'), _('Supplier Price per Uom')) + """ % (_('Components'), _('Components suppliers'), _('Quantity'),_('Cost Price per Unit of Measure'), _('Supplier Price per Unit of Measure')) purchase_price_digits = rml_obj.get_digits(dp='Purchase Price') diff --git a/addons/mrp/res_config.py b/addons/mrp/res_config.py index eb06de642ed..1b2aa1c2732 100644 --- a/addons/mrp/res_config.py +++ b/addons/mrp/res_config.py @@ -28,7 +28,7 @@ class mrp_config_settings(osv.osv_memory): _inherit = 'res.config.settings' _columns = { - 'module_stock_planning': fields.boolean('Master Production Schedule', + 'module_stock_planning': fields.boolean('Master Manufacturing Order Schedule', help ="""This allows to create a manual procurement plan apart of the normal MRP scheduling, which works automatically based on minimum stock rules. This installs the module stock_planning."""), @@ -41,27 +41,33 @@ class mrp_config_settings(osv.osv_memory): * Repair quotation report * Notes for the technician and for the final customer. This installs the module mrp_repair."""), - 'module_mrp_operations': fields.boolean("Track Dates in Work Order Operations", + 'module_mrp_operations': fields.boolean("Detailed Planning of Work Orders", help="""This allows to add state, date_start,date_stop in production order operation lines (in the "Work Centers" tab). This installs the module mrp_operations."""), - 'module_mrp_subproduct': fields.boolean("Produce Different Products from one Production", + 'module_mrp_subproduct': fields.boolean("Produce Several Products from One Manufacturing Order", help="""You can configure sub-products in the bill of material. Without this module: A + B + C -> D. With this module: A + B + C -> D + E. This installs the module mrp_subproduct."""), - 'module_mrp_jit': fields.boolean("Just in Time Scheduling", + 'module_mrp_jit': fields.boolean("Real-Time Scheduling", help="""This allows Just In Time computation of procurement orders. All procurement orders will be processed immediately, which could in some cases entail a small performance impact. This installs the module mrp_jit."""), + 'module_stock_no_autopicking': fields.boolean("Manual Picking to Fulfill Manufacturing Orders", + help="""This module allows an intermediate picking process to provide raw materials to production orders. + For example to manage production made by your suppliers (sub-contracting). + To achieve this, set the assembled product which is sub-contracted to "No Auto-Picking" + and put the location of the supplier in the routing of the assembly operation. + This installs the module stock_no_autopicking."""), 'group_mrp_routings': fields.boolean("Manage Routings and Work Orders", implied_group='mrp.group_mrp_routings', help="""Routings allow you to create and manage the manufacturing operations that should be followed within your work centers in order to produce a product. They are attached to bills of materials that will define the required raw materials."""), - 'group_mrp_properties': fields.boolean("Manage Properties", + 'group_mrp_properties': fields.boolean("Allow Several BoMs per Product", implied_group='product.group_mrp_properties', - help="""Allows to define specific property that can be assigned to your bill of materials."""), + help="""The selection of the right Bill of Material to use will depend on the properties specified on the sale order and the Bill of Material."""), } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/mrp/res_config_view.xml b/addons/mrp/res_config_view.xml index 66b8e735ed6..8e5934b170a 100644 --- a/addons/mrp/res_config_view.xml +++ b/addons/mrp/res_config_view.xml @@ -20,7 +20,7 @@ - + @@ -38,7 +38,7 @@ - + @@ -85,7 +85,7 @@ - + @@ -129,7 +129,7 @@ - + @@ -150,7 +150,7 @@ - + @@ -219,7 +219,7 @@ form tree,form - Repair orders allow you to organize your product repairs. In a repair order, you can detail the components you remove, add or replace and record the time you spent on the different operations. The repair order uses the warranty date on the production lot in order to know if whether the repair should be invoiced to the customer or not. +Repair orders allow you to organize your product repairs. In a repair order, you can detail the components you remove, add or replace and record the time you spent on the different operations. The repair order uses the warranty date on the Serial Number in order to know if whether the repair should be invoiced to the customer or not. diff --git a/addons/mrp_subproduct/mrp_subproduct.py b/addons/mrp_subproduct/mrp_subproduct.py index ce8ebf42cb0..9d76a254c36 100644 --- a/addons/mrp_subproduct/mrp_subproduct.py +++ b/addons/mrp_subproduct/mrp_subproduct.py @@ -28,8 +28,8 @@ class mrp_subproduct(osv.osv): _description = 'Sub Product' _columns={ 'product_id': fields.many2one('product.product', 'Product', required=True), - 'product_qty': fields.float('Product Qty', digits_compute=dp.get_precision('Product UoM'), required=True), - 'product_uom': fields.many2one('product.uom', 'Product UOM', required=True), + 'product_qty': fields.float('Product Qty', digits_compute=dp.get_precision('Product Unit of Measure'), required=True), + 'product_uom': fields.many2one('product.uom', 'Product Unit of Measure', required=True), 'subproduct_type': fields.selection([('fixed','Fixed'),('variable','Variable')], 'Quantity Type', required=True, help="Define how the quantity of subproducts will be set on the production orders using this BoM.\ 'Fixed' depicts a situation where the quantity of created subproduct is always equal to the quantity set on the BoM, regardless of how many are created in the production order.\ By opposition, 'Variable' means that the quantity will be computed as\ diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py index 164314c4573..aeab35be39b 100644 --- a/addons/procurement/procurement.py +++ b/addons/procurement/procurement.py @@ -91,8 +91,8 @@ class procurement_order(osv.osv): 'date_planned': fields.datetime('Scheduled date', required=True, select=True), 'date_close': fields.datetime('Date Closed'), 'product_id': fields.many2one('product.product', 'Product', required=True, states={'draft':[('readonly',False)]}, readonly=True), - 'product_qty': fields.float('Quantity', digits_compute=dp.get_precision('Product UoM'), required=True, states={'draft':[('readonly',False)]}, readonly=True), - 'product_uom': fields.many2one('product.uom', 'Product UoM', required=True, states={'draft':[('readonly',False)]}, readonly=True), + 'product_qty': fields.float('Quantity', digits_compute=dp.get_precision('Product Unit of Measure'), required=True, states={'draft':[('readonly',False)]}, readonly=True), + 'product_uom': fields.many2one('product.uom', 'Product Unit of Measure', required=True, states={'draft':[('readonly',False)]}, readonly=True), 'product_uos_qty': fields.float('UoS Quantity', states={'draft':[('readonly',False)]}, readonly=True), 'product_uos': fields.many2one('product.uom', 'Product UoS', states={'draft':[('readonly',False)]}, readonly=True), 'move_id': fields.many2one('stock.move', 'Reservation', ondelete='set null'), @@ -510,7 +510,7 @@ class stock_warehouse_orderpoint(osv.osv): 'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse', required=True, ondelete="cascade"), 'location_id': fields.many2one('stock.location', 'Location', required=True, ondelete="cascade"), 'product_id': fields.many2one('product.product', 'Product', required=True, ondelete='cascade', domain=[('type','=','product')]), - 'product_uom': fields.many2one('product.uom', 'Product UOM', required=True), + 'product_uom': fields.many2one('product.uom', 'Product Unit of Measure', required=True), 'product_min_qty': fields.float('Min Quantity', required=True, help="When the virtual stock goes below the Min Quantity specified for this field, OpenERP generates "\ "a procurement to bring the virtual stock to the Max Quantity."), @@ -536,6 +536,17 @@ class stock_warehouse_orderpoint(osv.osv): ('qty_multiple_check', 'CHECK( qty_multiple > 0 )', 'Qty Multiple must be greater than zero.'), ] + def default_get(self, cr, uid, fields, context=None): + res = super(stock_warehouse_orderpoint, self).default_get(cr, uid, fields, context) + # default 'warehouse_id' and 'location_id' + if 'warehouse_id' not in res: + warehouse = self.pool.get('ir.model.data').get_object(cr, uid, 'stock', 'warehouse0', context) + res['warehouse_id'] = warehouse.id + if 'location_id' not in res: + warehouse = self.pool.get('stock.warehouse').browse(cr, uid, res['warehouse_id'], context) + res['location_id'] = warehouse.lot_stock_id.id + return res + def onchange_warehouse_id(self, cr, uid, ids, warehouse_id, context=None): """ Finds location id for changed warehouse. @param warehouse_id: Changed id of warehouse. @@ -571,8 +582,9 @@ stock_warehouse_orderpoint() class product_product(osv.osv): _inherit="product.product" _columns = { - 'orderpoint_ids': fields.one2many('stock.warehouse.orderpoint', 'product_id', 'Minimum Stock Rule') + 'orderpoint_ids': fields.one2many('stock.warehouse.orderpoint', 'product_id', 'Minimum Stock Rules'), } + product_product() # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml index b3e90ab4e6e..c82032f2ee4 100644 --- a/addons/procurement/procurement_view.xml +++ b/addons/procurement/procurement_view.xml @@ -16,7 +16,7 @@- + @@ -35,7 +35,7 @@ - + @@ -165,7 +165,7 @@ - + @@ -183,7 +183,7 @@ - + - + @@ -251,15 +251,6 @@ src_model="stock.warehouse" groups="stock.group_stock_user"/> - - - - product.normal.form.orderpoint.inherit product.product form - - +- -- - -- -- - - - - + + ++ + product.price.type.form diff --git a/addons/product/product.py b/addons/product/product.py index fe17fe99ea9..c7bc52eabde 100644 --- a/addons/product/product.py +++ b/addons/product/product.py @@ -96,23 +96,23 @@ class product_uom(osv.osv): _order = "name" _columns = { 'name': fields.char('Name', size=64, required=True, translate=True), - 'category_id': fields.many2one('product.uom.categ', 'UoM Category', required=True, ondelete='cascade', + 'category_id': fields.many2one('product.uom.categ', 'Unit of Measure Category', required=True, ondelete='cascade', help="Quantity conversions may happen automatically between Units of Measure in the same category, according to their respective ratios."), 'factor': fields.float('Ratio', required=True,digits=(12, 12), - help='How many times this UoM is smaller than the reference UoM in this category:\n'\ + help='How many times this Unit of Measure is smaller than the reference Unit of Measure in this category:\n'\ '1 * (reference unit) = ratio * (this unit)'), 'factor_inv': fields.function(_factor_inv, digits=(12,12), fnct_inv=_factor_inv_write, string='Ratio', - help='How many times this UoM is bigger than the reference UoM in this category:\n'\ + help='How many times this Unit of Measure is bigger than the reference Unit of Measure in this category:\n'\ '1 * (this unit) = ratio * (reference unit)', required=True), - 'rounding': fields.float('Rounding Precision', digits_compute=dp.get_precision('Product UoM'), required=True, + 'rounding': fields.float('Rounding Precision', digits_compute=dp.get_precision('Product Unit of Measure'), required=True, help="The computed quantity will be a multiple of this value. "\ - "Use 1.0 for a UoM that cannot be further split, such as a piece."), + "Use 1.0 for a Unit of Measure that cannot be further split, such as a piece."), 'active': fields.boolean('Active', help="By unchecking the active field you can disable a unit of measure without deleting it."), - 'uom_type': fields.selection([('bigger','Bigger than the reference UoM'), - ('reference','Reference UoM for this category'), - ('smaller','Smaller than the reference UoM')],'UoM Type', required=1), + 'uom_type': fields.selection([('bigger','Bigger than the reference Unit of Measure'), + ('reference','Reference Unit of Measure for this category'), + ('smaller','Smaller than the reference Unit of Measure')],'Unit of Measure Type', required=1), } _defaults = { @@ -172,7 +172,7 @@ class product_uom(osv.osv): if 'category_id' in vals: for uom in self.browse(cr, uid, ids, context=context): if uom.category_id.id != vals['category_id']: - raise osv.except_osv(_('Warning'),_("Cannot change the category of existing UoM '%s'.") % (uom.name,)) + raise osv.except_osv(_('Warning'),_("Cannot change the category of existing Unit of Measure '%s'.") % (uom.name,)) return super(product_uom, self).write(cr, uid, ids, vals, context=context) product_uom() @@ -315,9 +315,9 @@ class product_template(osv.osv): 'uom_id': fields.many2one('product.uom', 'Default Unit of Measure', required=True, help="Default Unit of Measure used for all stock operation."), 'uom_po_id': fields.many2one('product.uom', 'Purchase Unit of Measure', required=True, help="Default Unit of Measure used for purchase orders. It must be in the same category than the default unit of measure."), 'uos_id' : fields.many2one('product.uom', 'Unit of Sale', - help='Used by companies that manage two units of measure: invoicing and inventory management. For example, in food industries, you will manage a stock of ham but invoice in Kg. Keep empty to use the default UOM.'), - 'uos_coeff': fields.float('UOM -> UOS Coeff', digits_compute= dp.get_precision('Product UoS'), - help='Coefficient to convert UOM to UOS\n' + help='Used by companies that manage two units of measure: invoicing and inventory management. For example, in food industries, you will manage a stock of ham but invoice in Kg. Keep empty to use the default Unit of Measure.'), + 'uos_coeff': fields.float('Unit of Measure -> UOS Coeff', digits_compute= dp.get_precision('Product UoS'), + help='Coefficient to convert Unit of Measure to UOS\n' ' uos = uom * coeff'), 'mes_type': fields.selection((('fixed', 'Fixed'), ('variable', 'Variable')), 'Measure Type', required=True), 'seller_info_id': fields.function(_calc_seller, type='many2one', relation="product.supplierinfo", multi="seller_info"), @@ -360,7 +360,7 @@ class product_template(osv.osv): for product in self.browse(cr, uid, ids, context=context): old_uom = product.uom_po_id if old_uom.category_id.id != new_uom.category_id.id: - raise osv.except_osv(_('UoM categories Mismatch!'), _("New UoM '%s' must belong to same UoM category '%s' as of old UoM '%s'. If you need to change the unit of measure, you may desactivate this product from the 'Procurement & Locations' tab and create a new one.") % (new_uom.name, old_uom.category_id.name, old_uom.name,)) + raise osv.except_osv(_('Unit of Measure categories Mismatch!'), _("New Unit of Measure '%s' must belong to same Unit of Measure category '%s' as of old Unit of Measure '%s'. If you need to change the unit of measure, you may desactivate this product from the 'Procurement & Locations' tab and create a new one.") % (new_uom.name, old_uom.category_id.name, old_uom.name,)) return super(product_template, self).write(cr, uid, ids, vals, context=context) _defaults = { @@ -397,7 +397,7 @@ class product_template(osv.osv): return True _constraints = [ - (_check_uom, 'Error: The default UOM and the purchase UOM must be in the same category.', ['uom_id']), + (_check_uom, 'Error: The default Unit of Measure and the purchase Unit of Measure must be in the same category.', ['uom_id']), ] def name_get(self, cr, user, ids, context=None): @@ -783,9 +783,9 @@ class product_supplierinfo(osv.osv): 'product_name': fields.char('Supplier Product Name', size=128, help="This supplier's product name will be used when printing a request for quotation. Keep empty to use the internal one."), 'product_code': fields.char('Supplier Product Code', size=64, help="This supplier's product code will be used when printing a request for quotation. Keep empty to use the internal one."), 'sequence' : fields.integer('Sequence', help="Assigns the priority to the list of product supplier."), - 'product_uom': fields.related('product_id', 'uom_po_id', type='many2one', relation='product.uom', string="Supplier UoM", readonly="1", help="This comes from the product form."), - 'min_qty': fields.float('Minimal Quantity', required=True, help="The minimal quantity to purchase to this supplier, expressed in the supplier Product UoM if not empty, in the default unit of measure of the product otherwise."), - 'qty': fields.function(_calc_qty, store=True, type='float', string='Quantity', multi="qty", help="This is a quantity which is converted into Default Uom."), + 'product_uom': fields.related('product_id', 'uom_po_id', type='many2one', relation='product.uom', string="Supplier Unit of Measure", readonly="1", help="This comes from the product form."), + 'min_qty': fields.float('Minimal Quantity', required=True, help="The minimal quantity to purchase to this supplier, expressed in the supplier Product Unit of Measure if not empty, in the default unit of measure of the product otherwise."), + 'qty': fields.function(_calc_qty, store=True, type='float', string='Quantity', multi="qty", help="This is a quantity which is converted into Default Unit of Measure."), 'product_id' : fields.many2one('product.template', 'Product', required=True, ondelete='cascade', select=True), 'delay' : fields.integer('Delivery Lead Time', required=True, help="Lead time in days between the confirmation of the purchase order and the reception of the products in your warehouse. Used by the scheduler for automatic computation of the purchase order planning."), 'pricelist_ids': fields.one2many('pricelist.partnerinfo', 'suppinfo_id', 'Supplier Pricelist'), @@ -844,8 +844,8 @@ class pricelist_partnerinfo(osv.osv): _columns = { 'name': fields.char('Description', size=64), 'suppinfo_id': fields.many2one('product.supplierinfo', 'Partner Information', required=True, ondelete='cascade'), - 'min_quantity': fields.float('Quantity', required=True, help="The minimal quantity to trigger this rule, expressed in the supplier UoM if any or in the default UoM of the product otherrwise."), - 'price': fields.float('Unit Price', required=True, digits_compute=dp.get_precision('Purchase Price'), help="This price will be considered as a price for the supplier UoM if any or the default Unit of Measure of the product otherwise"), + 'min_quantity': fields.float('Quantity', required=True, help="The minimal quantity to trigger this rule, expressed in the supplier Unit of Measure if any or in the default Unit of Measure of the product otherrwise."), + 'price': fields.float('Unit Price', required=True, digits_compute=dp.get_precision('Purchase Price'), help="This price will be considered as a price for the supplier Unit of Measure if any or the default Unit of Measure of the product otherwise"), } _order = 'min_quantity asc' pricelist_partnerinfo() diff --git a/addons/product/product_data.xml b/addons/product/product_data.xml index 3e2d114dc74..223b6bc368e 100644 --- a/addons/product/product_data.xml +++ b/addons/product/product_data.xml @@ -161,7 +161,7 @@ parameter) will see those record just disappear.2 - Product UoM +Product Unit of Measure diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml index 00d33b0f52f..3c353e031f2 100644 --- a/addons/product/product_view.xml +++ b/addons/product/product_view.xml @@ -28,7 +28,7 @@ - + @@ -50,7 +50,7 @@ - + @@ -107,7 +107,7 @@ + @@ -128,7 +128,7 @@ - + @@ -139,7 +139,7 @@ - + @@ -216,6 +216,7 @@ + Code:
No StockStock:@@ -275,7 +276,7 @@on hand, available - + @@ -439,7 +440,7 @@ - +Create and manage the units of measure you want to be used in your system. You can define a conversion rate between several Units of Measure within the same category. product.uom.categ.form @@ -452,14 +453,14 @@- - +UoM Categories +Unit of Measure Categories ir.actions.act_window product.uom.categ form tree,form Create and manage the units of measure categories you want to be used in your system. If several units of measure are in the same category, they can be converted to each other. For example, in the unit of measure category "Time", you will have the following UoM: Hours, Days. product.ul.form.view @@ -670,13 +671,13 @@- + - + diff --git a/addons/product/security/product_security.xml b/addons/product/security/product_security.xml index d0f1cd81d5e..1d2c795083a 100644 --- a/addons/product/security/product_security.xml +++ b/addons/product/security/product_security.xml @@ -11,7 +11,7 @@ Product Variant -+ @@ -30,7 +30,7 @@ - diff --git a/addons/product_expiry/product_expiry.py b/addons/product_expiry/product_expiry.py index 4497ca71957..c16ccc2b1ee 100644 --- a/addons/product_expiry/product_expiry.py +++ b/addons/product_expiry/product_expiry.py @@ -50,7 +50,7 @@ class stock_production_lot(osv.osv): help='The date on which the lot starts deteriorating without becoming dangerous.'), 'removal_date': fields.datetime('Removal Date', help='The date on which the lot should be removed.'), - 'alert_date': fields.datetime('Alert Date', help="The date on which an alert should be notified about the production lot."), + 'alert_date': fields.datetime('Alert Date', help="The date on which an alert should be notified about the serial number."), } # Assign dates according to products data def create(self, cr, uid, vals, context=None): @@ -78,12 +78,12 @@ class product_product(osv.osv): _inherit = 'product.product' _columns = { 'life_time': fields.integer('Product Life Time', - help='The number of days before a production lot may become dangerous and should not be consumed.'), + help='The number of days before a serial number may become dangerous and should not be consumed.'), 'use_time': fields.integer('Product Use Time', - help='The number of days before a production lot starts deteriorating without becoming dangerous.'), + help='The number of days before a serial number starts deteriorating without becoming dangerous.'), 'removal_time': fields.integer('Product Removal Time', - help='The number of days before a production lot should be removed.'), - 'alert_time': fields.integer('Product Alert Time', help="The number of days after which an alert should be notified about the production lot."), + help='The number of days before a serial number should be removed.'), + 'alert_time': fields.integer('Product Alert Time', help="The number of days after which an alert should be notified about the serial number."), } product_product() # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/project/project.py b/addons/project/project.py index a25e55d12e5..10ab7987774 100644 --- a/addons/project/project.py +++ b/addons/project/project.py @@ -172,7 +172,7 @@ class project(osv.osv): 'members': fields.many2many('res.users', 'project_user_rel', 'project_id', 'uid', 'Project Members', help="Project's members are users who can have an access to the tasks related to this project.", states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}), - 'tasks': fields.one2many('project.task', 'project_id', "Project tasks"), + 'tasks': fields.one2many('project.task', 'project_id', "Task Activities"), 'planned_hours': fields.function(_progress_rate, multi="progress", string='Planned Time', help="Sum of planned hours of all tasks related to this project and its child projects.", store = { 'project.project': (_get_project_and_parents, ['tasks', 'parent_id', 'child_ids'], 10), diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index 30b8354519e..d1e58193aa8 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -268,7 +268,10 @@Manage Secondary UoM +Manage Secondary Unit of Measure {} -A project contains a set of tasks or issues that will be performed by your resources assigned to it. A project can be hierarchically structured, as a child of a Parent Project. This allows you to design large project structures with different phases spread over the project duration cycle. Each user can set his default project in his own preferences to automatically filter the tasks or issues he usually works on. If you choose to invoice the time spent on a project task, you can find project tasks to be invoiced in the billing section. +You have no projects.
+Projects are used to organize your activities; plan tasks, track issues, invoice timesheets. You can define internal projects (R&D, Improve Sales Process), private projects (My Todos) or customer ones.
+Click 'create' to start a new project.
+@@ -332,10 +335,10 @@ + sequence="10" action="action_config_settings"/> diff --git a/addons/project/security/project_security.xml b/addons/project/security/project_security.xml index a1ead6aa72c..2bfe967e675 100644 --- a/addons/project/security/project_security.xml +++ b/addons/project/security/project_security.xml @@ -18,6 +18,17 @@- + - + @@ -344,18 +347,19 @@ name="planned_hours" widget="float_time" attrs="{'readonly':[('state','!=','draft')]}" + groups="project.group_time_work_estimation_tasks" on_change="onchange_planned(planned_hours, effective_hours)"/> + widget="float_time" invisible="1" groups="project.group_tasks_work_on_tasks"/> - + - + @@ -424,7 +428,7 @@ - + @@ -514,9 +518,9 @@ - + - + + + @@ -39,7 +41,7 @@ + + + +Task's Work on Tasks ++ + +Time Estimation on Tasks ++ + Project multi-company diff --git a/addons/project_issue/res_config.py b/addons/project_issue/res_config.py index c8fe9eee92d..21e50b21e8d 100644 --- a/addons/project_issue/res_config.py +++ b/addons/project_issue/res_config.py @@ -26,21 +26,7 @@ class project_issue_settings(osv.osv_memory): _inherit = ['project.config.settings', 'fetchmail.config.settings'] _columns = { - 'fetchmail_issue': fields.boolean("Create Issues from an E-mail Account", - fetchmail_model='project.issue', fetchmail_name='Incoming issues', + 'fetchmail_issue': fields.boolean("Create Issues from Incoming Mails", readonly=True, + fetchmail_model='project.issue', fetchmail_name='Incoming Issues', help="""Allows you to configure your incoming mail server, and create issues from incoming emails."""), - 'issue_server' : fields.char('Server', size=256), - 'issue_port' : fields.integer('Port'), - 'issue_type': fields.selection([ - ('pop', 'POP Server'), - ('imap', 'IMAP Server'), - ('local', 'Local Server'), - ], 'Type'), - 'issue_is_ssl': fields.boolean('SSL/TLS', help="Connections are encrypted with SSL/TLS through a dedicated port (default: IMAPS=993, POP=995)"), - 'issue_user' : fields.char('Username', size=256), - 'issue_password' : fields.char('Password', size=1024), - } - - _defaults = { - 'issue_type': 'pop', } diff --git a/addons/project_issue/res_config_view.xml b/addons/project_issue/res_config_view.xml index d2cc501bc96..0a470205c24 100644 --- a/addons/project_issue/res_config_view.xml +++ b/addons/project_issue/res_config_view.xml @@ -10,14 +10,7 @@ - - +- - - - - - \n" -"Language-Team: Catalan \n" -"Language-Team: Croatian \n" -"Language-Team: Latvian \n" -"Language-Team: Mongolian \n" -"Language-Team: Dutch \n" -"Language-Team: Polish \n" -"Language-Team: Portuguese \n" -"Language-Team: Brazilian Portuguese
- ![User img]()
+ ![User img]()
@@ -58,7 +59,7 @@