Divyesh Makwana(OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-manufacturing_terminology-mdi into
lp:openobject-addons.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-manufacturing_terminology-mdi/+merge/128476
Hello Sir,
I have improved the terminologies:
1. Renamed 'Compute schedulers' into 'Run schedulers'.
2. Renamed module 'mrp_subproduct' into 'mrp_byproduct' and its related changes.
3. There is no consistency throughout OpenERP with 'Source Document',
'Source', 'Origin'.
It should always be 'Source Document'.
Thanks,
Divyesh
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-manufacturing_terminology-mdi/+merge/128476
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-manufacturing_terminology-mdi.
=== modified file 'account/account_invoice.py'
--- account/account_invoice.py 2012-10-02 20:40:23 +0000
+++ account/account_invoice.py 2012-10-08 12:13:41 +0000
@@ -1359,7 +1359,7 @@
_description = "Invoice Line"
_columns = {
'name': fields.text('Description', required=True),
- 'origin': fields.char('Source', size=256, help="Reference of the document that produced this invoice."),
+ 'origin': fields.char('Source Document', size=256, help="Reference of the document that produced this invoice."),
'invoice_id': fields.many2one('account.invoice', 'Invoice Reference', ondelete='cascade', select=True),
'uos_id': fields.many2one('product.uom', 'Unit of Measure', ondelete='set null'),
'product_id': fields.many2one('product.product', 'Product', ondelete='set null'),
=== modified file 'event/event.py'
--- event/event.py 2012-10-04 15:01:50 +0000
+++ event/event.py 2012-10-08 12:13:41 +0000
@@ -327,7 +327,7 @@
_inherit = ['ir.needaction_mixin','mail.thread']
_columns = {
'id': fields.integer('ID'),
- 'origin': fields.char('Source', size=124,readonly=True,help="Name of the sale order which create the registration"),
+ 'origin': fields.char('Source Document', size=124,readonly=True,help="Name of the sale order which create the registration"),
'nb_register': fields.integer('Number of Participants', required=True, readonly=True, states={'draft': [('readonly', False)]}),
'event_id': fields.many2one('event.event', 'Event', required=True, readonly=True, states={'draft': [('readonly', False)]}),
'partner_id': fields.many2one('res.partner', 'Partner', states={'done': [('readonly', True)]}),
=== modified file 'mrp/mrp_view.xml'
--- mrp/mrp_view.xml 2012-09-30 14:16:53 +0000
+++ mrp/mrp_view.xml 2012-10-08 12:13:41 +0000
@@ -692,7 +692,7 @@
</tree>
</field>
</group>
- <group string="Consumed Product">
+ <group string="Consumed Products">
<field name="move_lines2" nolabel="1">
<tree colors="red:scrapped==True;blue:state == 'draft';black:state in('picking_except','confirmed','ready','in_production');gray:state == 'cancel' " string="Consumed Products" editable="bottom">
<field name="product_id" readonly="1"/>
=== renamed directory 'mrp_subproduct' => 'mrp_byproduct'
=== modified file 'mrp_byproduct/__init__.py'
--- mrp_subproduct/__init__.py 2011-01-14 00:11:01 +0000
+++ mrp_byproduct/__init__.py 2012-10-08 12:13:41 +0000
@@ -18,5 +18,5 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
-import mrp_subproduct
+import mrp_byproduct
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'mrp_byproduct/__openerp__.py'
--- mrp_subproduct/__openerp__.py 2012-09-26 12:16:27 +0000
+++ mrp_byproduct/__openerp__.py 2012-10-08 12:13:41 +0000
@@ -21,14 +21,14 @@
{
- 'name': 'MRP Subproducts',
+ 'name': 'MRP Byproducts',
'version': '1.0',
'category': 'Manufacturing',
'description': """
This module allows you to produce several products from one production order.
=============================================================================
-You can configure sub-products in the bill of material.
+You can configure by-products in the bill of material.
Without this module:
--------------------
@@ -40,14 +40,14 @@
""",
'author': 'OpenERP SA',
'website': 'http://www.openerp.com',
- 'images': ['images/bom_subproduct.jpeg'],
+ 'images': ['images/bom_byproduct.jpeg'],
'depends': ['base', 'mrp'],
'data': [
'security/ir.model.access.csv',
- 'mrp_subproduct_view.xml'
+ 'mrp_byproduct_view.xml'
],
'demo': [],
- 'test': ['test/mrp_subproduct.yml'],
+ 'test': ['test/mrp_byproduct.yml'],
'installable': True,
'auto_install': False,
}
=== renamed file 'mrp_subproduct/images/bom_subproduct.jpeg' => 'mrp_byproduct/images/bom_byproduct.jpeg'
=== renamed file 'mrp_subproduct/mrp_subproduct.py' => 'mrp_byproduct/mrp_byproduct.py'
--- mrp_subproduct/mrp_subproduct.py 2012-05-22 16:10:55 +0000
+++ mrp_byproduct/mrp_byproduct.py 2012-10-08 12:13:41 +0000
@@ -30,10 +30,10 @@
'product_id': fields.many2one('product.product', 'Product', 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.\
+ 'subproduct_type': fields.selection([('fixed','Fixed'),('variable','Variable')], 'Quantity Type', required=True, help="Define how the quantity of byproducts will be set on the production orders using this BoM.\
+ 'Fixed' depicts a situation where the quantity of created byproduct 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\
- '(quantity of subproduct set on the BoM / quantity of manufactured product set on the BoM * quantity of manufactured product in the production order.)'"),
+ '(quantity of byproduct set on the BoM / quantity of manufactured product set on the BoM * quantity of manufactured product in the production order.)'"),
'bom_id': fields.many2one('mrp.bom', 'BoM'),
}
_defaults={
@@ -59,7 +59,7 @@
_inherit='mrp.bom'
_columns={
- 'sub_products':fields.one2many('mrp.subproduct', 'bom_id', 'sub_products'),
+ 'sub_products':fields.one2many('mrp.subproduct', 'bom_id', 'Byproducts'),
}
mrp_bom()
@@ -106,7 +106,7 @@
def _get_subproduct_factor(self, cr, uid, production_id, move_id=None, context=None):
"""Compute the factor to compute the qty of procucts to produce for the given production_id. By default,
it's always equal to the quantity encoded in the production order or the production wizard, but with
- the module mrp_subproduct installed it can differ for subproducts having type 'variable'.
+ the module mrp_byproduct installed it can differ for byproducts having type 'variable'.
:param production_id: ID of the mrp.order
:param move_id: ID of the stock move that needs to be produced. Identify the product to produce.
:return: The factor to apply to the quantity that we should produce for the given production order and stock move.
=== renamed file 'mrp_subproduct/mrp_subproduct_view.xml' => 'mrp_byproduct/mrp_byproduct_view.xml'
--- mrp_subproduct/mrp_subproduct_view.xml 2012-08-09 06:05:16 +0000
+++ mrp_byproduct/mrp_byproduct_view.xml 2012-10-08 12:13:41 +0000
@@ -7,15 +7,15 @@
<field name="inherit_id" ref="mrp.mrp_bom_form_view"/>
<field name="arch" type="xml">
<notebook position="inside">
- <page string="Sub Products" position="inside">
+ <page string="Byproducts" position="inside">
<field name="sub_products">
- <tree string="sub products" editable="top">
+ <tree string="Byproducts" editable="top">
<field name="product_id" on_change="onchange_product_id(product_id)"/>
<field name="product_uom" groups="product.group_uom"/>
<field name="product_qty"/>
<field name="subproduct_type"/>
</tree>
- <form string="Sub Products">
+ <form string="Byproducts">
<field name="product_id" on_change="onchange_product_id(product_id)"/>
<field name="product_uom" groups="product.group_uom"/>
<field name="product_qty"/>
=== renamed file 'mrp_subproduct/test/mrp_subproduct.yml' => 'mrp_byproduct/test/mrp_byproduct.yml'
=== modified file 'procurement/wizard/schedulers_all_view.xml'
--- procurement/wizard/schedulers_all_view.xml 2012-08-09 06:05:16 +0000
+++ procurement/wizard/schedulers_all_view.xml 2012-10-08 12:13:41 +0000
@@ -2,10 +2,10 @@
<openerp>
<data>
- <!-- Compute Schedulers -->
+ <!-- Run Schedulers -->
<record id="view_compute_schedulers_wizard" model="ir.ui.view">
- <field name="name">Compute Schedulers</field>
+ <field name="name">Run Schedulers</field>
<field name="model">procurement.order.compute.all</field>
<field name="arch" type="xml">
<form string="Scheduler Parameters" version="7.0">
@@ -13,7 +13,7 @@
<field name="automatic"/>
</group>
<footer>
- <button name="procure_calculation" string="Compute Schedulers" type="object" class="oe_highlight" />
+ <button name="procure_calculation" string="Run Schedulers" type="object" class="oe_highlight" />
or
<button string="Cancel" class="oe_link" special="cancel" />
</footer>
@@ -21,7 +21,7 @@
</field>
</record>
- <act_window name="Compute Schedulers"
+ <act_window name="Run Schedulers"
res_model="procurement.order.compute.all"
src_model="procurement.order"
view_mode="form"
=== modified file 'purchase_requisition/purchase_requisition.py'
--- purchase_requisition/purchase_requisition.py 2012-10-02 20:40:23 +0000
+++ purchase_requisition/purchase_requisition.py 2012-10-08 12:13:41 +0000
@@ -34,7 +34,7 @@
_inherit = ['mail.thread', 'ir.needaction_mixin']
_columns = {
'name': fields.char('Requisition Reference', size=32,required=True),
- 'origin': fields.char('Source', size=32),
+ 'origin': fields.char('Source Document', size=32),
'date_start': fields.datetime('Requisition Date'),
'date_end': fields.datetime('Requisition Deadline'),
'user_id': fields.many2one('res.users', 'Responsible'),
=== modified file 'stock/stock.py'
--- stock/stock.py 2012-10-02 20:40:23 +0000
+++ stock/stock.py 2012-10-08 12:13:41 +0000
@@ -627,7 +627,7 @@
_columns = {
'name': fields.char('Reference', size=64, select=True, states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}),
- 'origin': fields.char('Source', size=64, states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}, help="Reference of the document", select=True),
+ 'origin': fields.char('Source Document', size=64, states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}, help="Reference of the document", select=True),
'backorder_id': fields.many2one('stock.picking', 'Back Order of', states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}, help="If this shipment was split, then this field links to the shipment which contains the already processed part.", select=True),
'type': fields.selection([('out', 'Sending Goods'), ('in', 'Getting Goods'), ('internal', 'Internal')], 'Shipping Type', required=True, select=True, readonly=True, help="Shipping type specify, goods coming in or going out."),
'note': fields.text('Notes', states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}),
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
