ajay javiya (OpenERP) has proposed merging 
lp:~openerp-dev/openobject-addons/trunk-bug-1071178-aja into 
lp:openobject-addons.

Requested reviews:
  OpenERP Core Team (openerp)
Related bugs:
  Bug #1071178 in OpenERP Server: "[trunk] 7.0 Error on opening Manufacturing 
in Serttings"
  https://bugs.launchpad.net/openobject-server/+bug/1071178

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-1071178-aja/+merge/132243

Hello,
Improve remaining changes for renaming from mrp_subproduct to mrp_byproudct.
Thank You.
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-1071178-aja/+merge/132243
Your team OpenERP R&D Team is subscribed to branch 
lp:~openerp-dev/openobject-addons/trunk-bug-1071178-aja.
=== modified file 'mrp/mrp.py'
--- mrp/mrp.py	2012-10-16 05:25:13 +0000
+++ mrp/mrp.py	2012-10-31 07:17:21 +0000
@@ -196,8 +196,8 @@
         'code': fields.char('Reference', size=16),
         'active': fields.boolean('Active', help="If the active field is set to False, it will allow you to hide the bills of material without removing it."),
         'type': fields.selection([('normal','Normal BoM'),('phantom','Sets / Phantom')], 'BoM Type', required=True,
-                                 help= "If a sub-product is used in several products, it can be useful to create its own BoM. "\
-                                 "Though if you don't want separated production orders for this sub-product, select Set/Phantom as BoM type. "\
+                                 help= "If a by-product is used in several products, it can be useful to create its own BoM. "\
+                                 "Though if you don't want separated production orders for this by-product, select Set/Phantom as BoM type. "\
                                  "If a Phantom BoM is used for a root product, it will be sold and shipped as a set of components, instead of being produced."),
         'method': fields.function(_compute_type, string='Method', type='selection', selection=[('',''),('stock','On Stock'),('order','On Order'),('set','Set / Pack')]),
         'date_start': fields.date('Valid From', help="Validity of this BoM or component. Keep empty if it's always valid."),
@@ -230,7 +230,7 @@
     _parent_name = "bom_id"
     _sql_constraints = [
         ('bom_qty_zero', 'CHECK (product_qty>0)',  'All product quantities must be greater than 0.\n' \
-            'You should install the mrp_subproduct module if you want to manage extra products on BoMs !'),
+            'You should install the mrp_byproduct module if you want to manage extra products on BoMs !'),
     ]
 
     def _check_recursion(self, cr, uid, ids, context=None):

=== modified file 'mrp/mrp_view.xml'
--- mrp/mrp_view.xml	2012-10-29 09:08:47 +0000
+++ mrp/mrp_view.xml	2012-10-31 07:17:21 +0000
@@ -507,7 +507,7 @@
               <p class="oe_view_nocontent_create">
                 Click to add a component to a bill of material.
               </p><p>
-                Bills of materials components are components and sub-products
+                Bills of materials components are components and by-products
                 used to create master bills of materials.  Use this menu to
                 search in which BoM a specific component is used.
               </p>

=== modified file 'mrp/res_config.py'
--- mrp/res_config.py	2012-09-13 12:51:54 +0000
+++ mrp/res_config.py	2012-10-31 07:17:21 +0000
@@ -44,11 +44,11 @@
         'module_mrp_operations': fields.boolean("Allow detailed planning of work order",
             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 several products from one manufacturing order",
-            help="""You can configure sub-products in the bill of material.
+        'module_mrp_byproduct': fields.boolean("Produce several products from one manufacturing order",
+            help="""You can configure by-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."""),
+                This installs the module mrp_byproduct."""),
         'module_mrp_jit': fields.boolean("Generate procurement in real time",
             help="""This allows Just In Time computation of procurement orders.
                 All procurement orders will be processed immediately, which could in some

=== modified file 'mrp/res_config_view.xml'
--- mrp/res_config_view.xml	2012-09-16 11:42:49 +0000
+++ mrp/res_config_view.xml	2012-10-31 07:17:21 +0000
@@ -28,8 +28,8 @@
                         <label for="id" string="Order"/>
                         <div>
                             <div>
-                                <field name="module_mrp_subproduct" class="oe_inline"/>
-                                <label for="module_mrp_subproduct"/>
+                                <field name="module_mrp_byproduct" class="oe_inline"/>
+                                <label for="module_mrp_byproduct"/>
                             </div>
                             <div>
                                 <field name="module_mrp_repair" class="oe_inline"/>

=== modified file 'mrp_byproduct/test/mrp_byproduct.yml'
--- mrp_byproduct/test/mrp_byproduct.yml	2012-10-08 10:28:36 +0000
+++ mrp_byproduct/test/mrp_byproduct.yml	2012-10-31 07:17:21 +0000
@@ -1,6 +1,6 @@
 -
-  In order to test mrp_subproduct with OpenERP, I add subproduct in bill of material.
-  I make a production order, confirm it so stock moves for subproducts are generated.
+  In order to test mrp_byproduct with OpenERP, I add byproduct in bill of material.
+  I make a production order, confirm it so stock moves for byproducts are generated.
 -
   I add a sub product in Bill of material for product External Hard Disk.
 -
@@ -37,7 +37,7 @@
   !assert {model: mrp.production, id: mrp_production_mo0, severity: error, string: Production order should be in state confirmed}:
     - state == 'confirmed'
 -
-  Now I check the stock moves for the subproduct I created in the bill of material.
+  Now I check the stock moves for the byproduct I created in the bill of material.
   This move is created automatically when I confirmed the production order.
 -
   !python {model: stock.move}: |

_______________________________________________
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

Reply via email to