diff options
| author | Fabien Pinckaers <fp@tinyerp.com> | 2010-04-09 09:14:08 +0200 |
|---|---|---|
| committer | Fabien Pinckaers <fp@tinyerp.com> | 2010-04-09 09:14:08 +0200 |
| commit | d29642c94d55ed53e4d2f3400a86a55722715138 (patch) | |
| tree | 1dc182ecae76cc8c642e838b94ca1a88f351c7d1 | |
| parent | 802fe10c850c1e8556c66b4918c69619a3eb4eac (diff) | |
fix
bzr revid: fp@tinyerp.com-20100409071408-s98vgyvrbq446d5j
| -rw-r--r-- | addons/board_manufacturing/board_manufacturing_view.xml | 4 | ||||
| -rw-r--r-- | addons/mrp/company.py | 2 | ||||
| -rw-r--r-- | addons/mrp/mrp.py | 10 | ||||
| -rw-r--r-- | addons/mrp/mrp_view.xml | 2 | ||||
| -rwxr-xr-x | addons/mrp/process/procurement_process.xml | 354 | ||||
| -rw-r--r-- | addons/mrp/schedulers.py | 2 | ||||
| -rw-r--r-- | addons/mrp/stock.py | 10 | ||||
| -rw-r--r-- | addons/mrp/wizard/make_procurement_view.xml | 56 | ||||
| -rw-r--r-- | addons/mrp/wizard/mrp_procurement_view.xml | 40 | ||||
| -rw-r--r-- | addons/mrp_jit/mrp_jit.xml | 2 | ||||
| -rw-r--r-- | addons/product/product.py | 4 | ||||
| -rw-r--r-- | addons/product/product_view.xml | 8 | ||||
| -rwxr-xr-x | addons/project_mrp/process/project_mrp_process.xml | 33 | ||||
| -rw-r--r-- | addons/project_mrp/project.py | 2 | ||||
| -rwxr-xr-x | addons/sale/process/sale_process.xml | 16 | ||||
| -rw-r--r-- | addons/sale/sale.py | 4 | ||||
| -rw-r--r-- | addons/sale/sale_view.xml | 4 | ||||
| -rw-r--r-- | addons/stock/product.py | 2 | ||||
| -rw-r--r-- | addons/stock/stock_view.xml | 4 | ||||
| -rw-r--r-- | addons/stock_location/stock_view.xml | 2 |
20 files changed, 268 insertions, 293 deletions
diff --git a/addons/board_manufacturing/board_manufacturing_view.xml b/addons/board_manufacturing/board_manufacturing_view.xml index df4a6805afb..17b4bc486bc 100644 --- a/addons/board_manufacturing/board_manufacturing_view.xml +++ b/addons/board_manufacturing/board_manufacturing_view.xml @@ -15,7 +15,7 @@ <child1> <action colspan="4" height="200" name="%(mrp.mrp_production_action2)d" string="Next production orders" width="510"/> <action colspan="4" name="%(stock.action_picking_all)d" string="Deliveries (Out picking)" domain="[('state','=','assigned'),('type','=','out')]"/> - <action colspan="4" name="%(mrp.mrp_procurement_action4)d" string=" Requisition in Exception"/> + <action colspan="4" name="%(mrp.mrp_procurement_action4)d" string="Procurements in Exception"/> </child1> @@ -37,7 +37,7 @@ <field name="view_id" ref="board_mrp_manager_form"/> </record> - <menuitem icon="terp-graph" id="base.dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/> + <menuitem icon="terp-graph" id="base.dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/> <menuitem id="next_id_87" name="Production" diff --git a/addons/mrp/company.py b/addons/mrp/company.py index 064b1034ba0..1844fff47eb 100644 --- a/addons/mrp/company.py +++ b/addons/mrp/company.py @@ -26,7 +26,7 @@ class company(osv.osv): _columns = { 'schedule_range': fields.float('Scheduler Range', required=True, help="This is the time frame analysed by the scheduler when "\ - "computing Requisitions. All Requisition that are not between "\ + "computing procurements. All procurements that are not between "\ "today and today+range are skipped for futur computation."), 'po_lead': fields.float('Purchase Lead Time', required=True, help="This is the leads/security time for each purchase order."), diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py index 40d204d34eb..eda4f076602 100644 --- a/addons/mrp/mrp.py +++ b/addons/mrp/mrp.py @@ -992,15 +992,15 @@ mrp_production_product_line() # class mrp_procurement(osv.osv): """ - Procument Orders / Requisitions + Procument Orders """ _name = "mrp.procurement" _description = "Procurement" _order = 'priority,date_planned' _columns = { - 'name': fields.char('Reason', size=64, required=True, help='Requisition name.'), + 'name': fields.char('Reason', size=64, required=True, help='Procurement name.'), 'origin': fields.char('Source Document', size=64, - help="Reference of the document that created this Requisition.\n" + help="Reference of the document that created this Procurement.\n" "This is automatically completed by Open ERP."), 'priority': fields.selection([('0','Not urgent'),('1','Normal'),('2','Urgent'),('3','Very Urgent')], 'Priority', required=True), 'date_planned': fields.datetime('Scheduled date', required=True), @@ -1056,7 +1056,7 @@ class mrp_procurement(osv.osv): if s['state'] in ['draft','cancel']: unlink_ids.append(s['id']) else: - raise osv.except_osv(_('Invalid action !'), _('Cannot delete Requisition Order(s) which are in %s State!' % s['state'])) + raise osv.except_osv(_('Invalid action !'), _('Cannot delete Procurement Order(s) which are in %s State!' % s['state'])) return osv.osv.unlink(self, cr, uid, unlink_ids, context=context) def onchange_product_id(self, cr, uid, ids, product_id, context={}): @@ -1250,7 +1250,7 @@ class mrp_procurement(osv.osv): move_obj = self.pool.get('stock.move') for procurement in self.browse(cr, uid, ids): if procurement.product_qty <= 0.00: - raise osv.except_osv(_('Data Insufficient !'), _('Please check the Quantity of Requisition Order(s), it should not be less than 1!')) + raise osv.except_osv(_('Data Insufficient !'), _('Please check the Quantity of Procurement Order(s), it should not be less than 1!')) if procurement.product_id.type in ('product', 'consu'): if not procurement.move_id: source = procurement.location_id.id diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml index 83ae9ea4e55..6b3918048af 100644 --- a/addons/mrp/mrp_view.xml +++ b/addons/mrp/mrp_view.xml @@ -885,7 +885,7 @@ sequence="2" /> <record id="mrp_procurement_action3" model="ir.actions.act_window"> - <field name="name">Requisitions</field> + <field name="name">Procurements</field> <field name="type">ir.actions.act_window</field> <field name="res_model">mrp.procurement</field> <field name="view_type">form</field> diff --git a/addons/mrp/process/procurement_process.xml b/addons/mrp/process/procurement_process.xml index 9162051086c..17d72a520f2 100755 --- a/addons/mrp/process/procurement_process.xml +++ b/addons/mrp/process/procurement_process.xml @@ -1,102 +1,102 @@ <?xml version="1.0" ?> <openerp> - <data> - - <!-- - Process - --> - - <record id="process_process_procurementprocess0" model="process.process"> - <field eval=""""Requisition"""" name="name"/> - <field name="model_id" ref="mrp.model_mrp_procurement"/> - <field eval="1" name="active"/> - </record> - - <!-- - Process Node - --> - - <record id="process_node_stockproduct1" model="process.node"> - <field name="menu_id" ref="mrp.menu_mrp_procurement_action"/> - <field name="model_id" ref="mrp.model_mrp_procurement"/> - <field eval=""""subflow"""" name="kind"/> - <field eval=""""For stockable products and consumables"""" name="note"/> - <field eval=""""Stockable Product"""" name="name"/> - <field name="process_id" ref="mrp.process_process_stockableproductprocess0"/> - <field name="subflow_id" ref="process_process_procurementprocess0"/> - <field eval=""""object.state in ('draft', 'confirmed', 'cancel', 'exception', 'running', 'done', 'waiting')"""" name="model_states"/> - <field eval="1" name="flow_start"/> - </record> - - <record id="process_node_serviceproduct1" model="process.node"> - <field name="menu_id" ref="mrp.menu_mrp_procurement_action"/> - <field name="model_id" ref="mrp.model_mrp_procurement"/> - <field eval=""""subflow"""" name="kind"/> - <field eval=""""For Services."""" name="note"/> - <field eval=""""Service"""" name="name"/> - <field name="process_id" ref="mrp.process_process_serviceproductprocess0"/> - <field name="subflow_id" ref="process_process_procurementprocess0"/> - <field eval=""""object.state in ('draft', 'confirmed', 'cancel', 'exception', 'running', 'done', 'waiting')"""" name="model_states"/> - <field eval="1" name="flow_start"/> - </record> - - <record id="process_node_productionorder0" model="process.node"> - <field name="menu_id" ref="mrp.menu_mrp_production_action"/> - <field name="model_id" ref="mrp.model_mrp_production"/> - <field eval=""""state"""" name="kind"/> - <field eval=""""Drives the requisition orders for raw material."""" name="note"/> - <field eval=""""Production Order"""" name="name"/> - <field name="process_id" ref="process_process_procurementprocess0"/> - <field eval=""""object.state in ('draft', 'picking_except', 'confirmed', 'ready', 'in_production', 'cancel', 'done')"""" name="model_states"/> - <field eval="1" name="flow_start"/> - </record> - - <record id="process_node_minimumstockrule0" model="process.node"> - <field name="menu_id" ref="mrp.menu_action_orderpoint_form"/> - <field name="model_id" ref="mrp.model_stock_warehouse_orderpoint"/> - <field eval=""""state"""" name="kind"/> - <field eval=""""Linked to the 'Minimum stock rule' supplying method."""" name="note"/> - <field eval=""""Minimum Stock"""" name="name"/> - <field name="process_id" ref="process_process_procurementprocess0"/> - <field eval="1" name="flow_start"/> - </record> - - <record id="process_node_procureproducts0" model="process.node"> - <field name="menu_id" ref="mrp.menu_mrp_procurement_action"/> - <field name="model_id" ref="mrp.model_mrp_procurement"/> - <field eval=""""state"""" name="kind"/> - <field eval=""""The way to requisition depends on the product type."""" name="note"/> - <field eval=""""Procure Products"""" name="name"/> - <field name="process_id" ref="process_process_procurementprocess0"/> - <field eval=""""object.state in ('draft', 'confirmed', 'cancel', 'exception', 'running', 'done', 'waiting')"""" name="model_states"/> - <field eval="0" name="flow_start"/> - </record> - - <record id="process_node_stockproduct0" model="process.node"> - <field name="menu_id" ref="mrp.menu_mrp_procurement_action"/> - <field name="model_id" ref="mrp.model_mrp_procurement"/> - <field eval=""""subflow"""" name="kind"/> - <field eval=""""Product type is Stockable or Consumable."""" name="note"/> - <field eval=""""Stockable Product"""" name="name"/> - <field name="subflow_id" ref="process_process_stockableproductprocess0"/> - <field name="process_id" ref="process_process_procurementprocess0"/> - <field eval=""""object.state in ('draft', 'confirmed', 'cancel', 'exception', 'running', 'done', 'waiting')"""" name="model_states"/> - <field eval="0" name="flow_start"/> - </record> - - <record id="process_node_serviceproduct0" model="process.node"> - <field name="menu_id" ref="mrp.menu_mrp_procurement_action"/> - <field name="model_id" ref="mrp.model_mrp_procurement"/> - <field eval=""""subflow"""" name="kind"/> - <field eval=""""Product type is service"""" name="note"/> - <field eval=""""Service"""" name="name"/> - <field name="subflow_id" ref="process_process_serviceproductprocess0"/> - <field name="process_id" ref="process_process_procurementprocess0"/> - <field eval=""""object.state in ('draft', 'confirmed', 'cancel', 'exception', 'running', 'done', 'waiting')"""" name="model_states"/> - <field eval="0" name="flow_start"/> - </record> - - <record id="process_node_purchaseprocure0" model="process.node"> + <data> + + <!-- + Process + --> + + <record id="process_process_procurementprocess0" model="process.process"> + <field eval=""""Procurement"""" name="name"/> + <field name="model_id" ref="mrp.model_mrp_procurement"/> + <field eval="1" name="active"/> + </record> + + <!-- + Process Node + --> + + <record id="process_node_stockproduct1" model="process.node"> + <field name="menu_id" ref="mrp.menu_mrp_procurement_action"/> + <field name="model_id" ref="mrp.model_mrp_procurement"/> + <field eval=""""subflow"""" name="kind"/> + <field eval=""""For stockable products and consumables"""" name="note"/> + <field eval=""""Stockable Product"""" name="name"/> + <field name="process_id" ref="mrp.process_process_stockableproductprocess0"/> + <field name="subflow_id" ref="process_process_procurementprocess0"/> + <field eval=""""object.state in ('draft', 'confirmed', 'cancel', 'exception', 'running', 'done', 'waiting')"""" name="model_states"/> + <field eval="1" name="flow_start"/> + </record> + + <record id="process_node_serviceproduct1" model="process.node"> + <field name="menu_id" ref="mrp.menu_mrp_procurement_action"/> + <field name="model_id" ref="mrp.model_mrp_procurement"/> + <field eval=""""subflow"""" name="kind"/> + <field eval=""""For Services."""" name="note"/> + <field eval=""""Service"""" name="name"/> + <field name="process_id" ref="mrp.process_process_serviceproductprocess0"/> + <field name="subflow_id" ref="process_process_procurementprocess0"/> + <field eval=""""object.state in ('draft', 'confirmed', 'cancel', 'exception', 'running', 'done', 'waiting')"""" name="model_states"/> + <field eval="1" name="flow_start"/> + </record> + + <record id="process_node_productionorder0" model="process.node"> + <field name="menu_id" ref="mrp.menu_mrp_production_action"/> + <field name="model_id" ref="mrp.model_mrp_production"/> + <field eval=""""state"""" name="kind"/> + <field eval=""""Drives the procurement orders for raw material."""" name="note"/> + <field eval=""""Production Order"""" name="name"/> + <field name="process_id" ref="process_process_procurementprocess0"/> + <field eval=""""object.state in ('draft', 'picking_except', 'confirmed', 'ready', 'in_production', 'cancel', 'done')"""" name="model_states"/> + <field eval="1" name="flow_start"/> + </record> + + <record id="process_node_minimumstockrule0" model="process.node"> + <field name="menu_id" ref="mrp.menu_action_orderpoint_form"/> + <field name="model_id" ref="mrp.model_stock_warehouse_orderpoint"/> + <field eval=""""state"""" name="kind"/> + <field eval=""""Linked to the 'Minimum stock rule' supplying method."""" name="note"/> + <field eval=""""Minimum Stock"""" name="name"/> + <field name="process_id" ref="process_process_procurementprocess0"/> + <field eval="1" name="flow_start"/> + </record> + + <record id="process_node_procureproducts0" model="process.node"> + <field name="menu_id" ref="mrp.menu_mrp_procurement_action"/> + <field name="model_id" ref="mrp.model_mrp_procurement"/> + <field eval=""""state"""" name="kind"/> + <field eval=""""The way to procurement depends on the product type."""" name="note"/> + <field eval=""""Procure Products"""" name="name"/> + <field name="process_id" ref="process_process_procurementprocess0"/> + <field eval=""""object.state in ('draft', 'confirmed', 'cancel', 'exception', 'running', 'done', 'waiting')"""" name="model_states"/> + <field eval="0" name="flow_start"/> + </record> + + <record id="process_node_stockproduct0" model="process.node"> + <field name="menu_id" ref="mrp.menu_mrp_procurement_action"/> + <field name="model_id" ref="mrp.model_mrp_procurement"/> + <field eval=""""subflow"""" name="kind"/> + <field eval=""""Product type is Stockable or Consumable."""" name="note"/> + <field eval=""""Stockable Product"""" name="name"/> + <field name="subflow_id" ref="process_process_stockableproductprocess0"/> + <field name="process_id" ref="process_process_procurementprocess0"/> + <field eval=""""object.state in ('draft', 'confirmed', 'cancel', 'exception', 'running', 'done', 'waiting')"""" name="model_states"/> + <field eval="0" name="flow_start"/> + </record> + + <record id="process_node_serviceproduct0" model="process.node"> + <field name="menu_id" ref="mrp.menu_mrp_procurement_action"/> + <field name="model_id" ref="mrp.model_mrp_procurement"/> + <field eval=""""subflow"""" name="kind"/> + <field eval=""""Product type is service"""" name="note"/> + <field eval=""""Service"""" name="name"/> + <field name="subflow_id" ref="process_process_serviceproductprocess0"/> + <field name="process_id" ref="process_process_procurementprocess0"/> + <field eval=""""object.state in ('draft', 'confirmed', 'cancel', 'exception', 'running', 'done', 'waiting')"""" name="model_states"/> + <field eval="0" name="flow_start"/> + </record> + + <record id="process_node_purchaseprocure0" model="process.node"> <field name="menu_id" ref="mrp.menu_mrp_procurement_action"/> <field name="model_id" ref="mrp.model_mrp_procurement"/> <field eval=""""subflow"""" name="kind"/> @@ -137,83 +137,83 @@ <field eval="0" name="flow_start"/> </record> - <!-- - Process Transition - --> - - <record id="process_transition_servicemto0" model="process.transition"> - <field eval="[(6,0,[])]" name="role_ids"/> - <field eval="[(6,0,[])]" name="transition_ids"/> - <field eval=""""Make to Order"""" name="name"/> - <field eval=""""If the service has a 'Produce' supply method, this creates a task in the project management module of OpenERP."""" name="note"/> - <field model="process.node" name="target_node_id" ref="mrp.process_node_serviceonorder0"/> - <field model="process.node" name="source_node_id" ref="process_node_serviceproduct1"/> - </record> - - <record id="process_transition_servicemts0" model="process.transition"> - <field eval="[(6,0,[])]" name="role_ids"/> - <field eval="[(6,0,[])]" name="transition_ids"/> - <field eval=""""Make to Stock"""" name="name"/> - <field eval=""""This is used in case of a service without any impact in the system, a training session for instance."""" name="note"/> - <field model="process.node" name="target_node_id" ref="mrp.process_node_servicemts0"/> - <field model="process.node" name="source_node_id" ref="process_node_serviceproduct1"/> - </record> - - <record id="process_transition_stockmts0" model="process.transition"> - <field eval="[(6,0,[])]" name="role_ids"/> - <field eval="[(6,0,[])]" name="transition_ids"/> - <field eval=""""Make to Stock"""" name="name"/> - <field eval=""""The system waits for the products to be available in the stock. These products are typically procured manually or through a minimum stock rule."""" name="note"/> - <field model="process.node" name="target_node_id" ref="mrp.process_node_mts0"/> - <field model="process.node" name="source_node_id" ref="process_node_stockproduct1"/> - </record> - - <record id="process_transition_stockproduct0" model="process.transition"> - <field eval="[(6,0,[])]" name="role_ids"/> - <field eval="[(6,0,[])]" name="transition_ids"/> - <field eval=""""Make to Order"""" name="name"/> - <field eval=""""The system creates an order (production or purchased) depending on the sold quantity and the products parameters."""" name="note"/> - <field model="process.node" name="target_node_id" ref="mrp.process_node_stock0"/> - <field model="process.node" name="source_node_id" ref="process_node_stockproduct1"/> - </record> - - <record id="process_transition_productionprocureproducts0" model="process.transition"> - <field eval="[(6,0,[])]" name="role_ids"/> - <field eval="[(6,0,[])]" name="transition_ids"/> - <field eval=""""Requisition of raw material"""" name="name"/> - <field eval=""""In order to supply raw material (to be purchased or produced), the production order creates as much requisition orders as components listed in the BOM, through a run of the schedulers (MRP)."""" name="note"/> - <field model="process.node" name="target_node_id" ref="process_node_procureproducts0"/> - <field model="process.node" name="source_node_id" ref="process_node_productionorder0"/> - </record> - - <record id="process_transition_minimumstockprocure0" model="process.transition"> - <field eval="[(6,0,[])]" name="role_ids"/> - <field eval="[(6,0,[])]" name="transition_ids"/> - <field eval=""""'Minimum stock rule' material"""" name="name"/> - <field eval=""""The 'Minimum stock rule' allows the system to create procurement orders automatically as soon as the minimum stock is reached."""" name="note"/> - <field model="process.node" name="target_node_id" ref="process_node_procureproducts0"/> - <field model="process.node" name="source_node_id" ref="process_node_minimumstockrule0"/> - </record> - - <record id="process_transition_procurestockableproduct0" model="process.transition"> - <field eval="[(6,0,[])]" name="role_ids"/> - <field eval="[(6,0,[])]" name="transition_ids"/> - <field eval=""""Procurement of stockable Products"""" name="name"/> - <field eval=""""Depending on the chosen method to supply the stockable products, the procurement order creates a RFQ, a production order, ... """" name="note"/> - <field model="process.node" name="target_node_id" ref="process_node_stockproduct0"/> - <field model="process.node" name="source_node_id" ref="process_node_procureproducts0"/> - </record> - - <record id="process_transition_procureserviceproduct0" model="process.transition"> - <field eval="[(6,0,[])]" name="role_ids"/> - <field eval="[(6,0,[])]" name="transition_ids"/> - <field eval=""""Requisition of services"""" name="name"/> - <field eval=""""Depending on the chosen method to 'supply' the service, the requisition order creates a RFQ for a subcontracting purchase order or waits until the service is done (= the delivery of the products)."""" name="note"/> - <field model="process.node" name="target_node_id" ref="process_node_serviceproduct0"/> - <field model="process.node" name="source_node_id" ref="process_node_procureproducts0"/> - </record> - - <record id="process_transition_purchaseprocure0" model="process.transition"> + <!-- + Process Transition + --> + + <record id="process_transition_servicemto0" model="process.transition"> + <field eval="[(6,0,[])]" name="role_ids"/> + <field eval="[(6,0,[])]" name="transition_ids"/> + <field eval=""""Make to Order"""" name="name"/> + <field eval=""""If the service has a 'Produce' supply method, this creates a task in the project management module of OpenERP."""" name="note"/> + <field model="process.node" name="target_node_id" ref="mrp.process_node_serviceonorder0"/> + <field model="process.node" name="source_node_id" ref="process_node_serviceproduct1"/> + </record> + + <record id="process_transition_servicemts0" model="process.transition"> + <field eval="[(6,0,[])]" name="role_ids"/> + <field eval="[(6,0,[])]" name="transition_ids"/> + <field eval=""""Make to Stock"""" name="name"/> + <field eval=""""This is used in case of a service without any impact in the system, a training session for instance."""" name="note"/> + <field model="process.node" name="target_node_id" ref="mrp.process_node_servicemts0"/> + <field model="process.node" name="source_node_id" ref="process_node_serviceproduct1"/> + </record> + + <record id="process_transition_stockmts0" model="process.transition"> + <field eval="[(6,0,[])]" name="role_ids"/> + <field eval="[(6,0,[])]" name="transition_ids"/> + <field eval=""""Make to Stock"""" name="name"/> + <field eval=""""The system waits for the products to be available in the stock. These products are typically procured manually or through a minimum stock rule."""" name="note"/> + <field model="process.node" name="target_node_id" ref="mrp.process_node_mts0"/> + <field model="process.node" name="source_node_id" ref="process_node_stockproduct1"/> + </record> + + <record id="process_transition_stockproduct0" model="process.transition"> + <field eval="[(6,0,[])]" name="role_ids"/> + <field eval="[(6,0,[])]" name="transition_ids"/> + <field eval=""""Make to Order"""" name="name"/> + <field eval=""""The system creates an order (production or purchased) depending on the sold quantity and the products parameters."""" name="note"/> + <field model="process.node" name="target_node_id" ref="mrp.process_node_stock0"/> + <field model="process.node" name="source_node_id" ref="process_node_stockproduct1"/> + </record> + + <record id="process_transition_productionprocureproducts0" model="process.transition"> + <field eval="[(6,0,[])]" name="role_ids"/> + <field eval="[(6,0,[])]" name="transition_ids"/> + <field eval=""""Procurement of raw material"""" name="name"/> + <field eval=""""In order to supply raw material (to be purchased or produced), the production order creates as much procurement orders as components listed in the BOM, through a run of the schedulers (MRP)."""" name="note"/> + <field model="process.node" name="target_node_id" ref="process_node_procureproducts0"/> + <field model="process.node" name="source_node_id" ref="process_node_productionorder0"/> + </record> + + <record id="process_transition_minimumstockprocure0" model="process.transition"> + <field eval="[(6,0,[])]" name="role_ids"/> + <field eval="[(6,0,[])]" name="transition_ids"/> + <field eval=""""'Minimum stock rule' material"""" name="name"/> + <field eval=""""The 'Minimum stock rule' allows the system to create procurement orders automatically as soon as the minimum stock is reached."""" name="note"/> + <field model="process.node" name="target_node_id" ref="process_node_procureproducts0"/> + <field model="process.node" name="source_node_id" ref="process_node_minimumstockrule0"/> + </record> + + <record id="process_transition_procurestockableproduct0" model="process.transition"> + <field eval="[(6,0,[])]" name="role_ids"/> + <field eval="[(6,0,[])]" name="transition_ids"/> + <field eval=""""Procurement of stockable Products"""" name="name"/> + <field eval=""""Depending on the chosen method to supply the stockable products, the procurement order creates a RFQ, a production order, ... """" name="note"/> + <field model="process.node" name="target_node_id" ref="process_node_stockproduct0"/> + <field model="process.node" name="source_node_id" ref="process_node_procureproducts0"/> + </record> + + <record id="process_transition_procureserviceproduct0" model="process.transition"> + <field eval="[(6,0,[])]" name="role_ids"/> + <field eval="[(6,0,[])]" name="transition_ids"/> + <field eval=""""Procurement of services"""" name="name"/> + <field eval=""""Depending on the chosen method to 'supply' the service, the procurement order creates a RFQ for a subcontracting purchase order or waits until the service is done (= the delivery of the products)."""" name="note"/> + <field model="process.node" name="target_node_id" ref="process_node_serviceproduct0"/> + <field model="process.node" name="source_node_id" ref="process_node_procureproducts0"/> + </record> + + <record id="process_transition_purchaseprocure0" model="process.transition"> <field eval="[(6,0,[])]" name="role_ids"/> <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""Automatic RFQ"""" name="name"/> @@ -240,7 +240,7 @@ <field model="process.node" name="source_node_id" ref="process_node_billofmaterial0"/> </record> - <record id="process_transition_bom0" model="process.transition"> + <record id="process_transition_bom0" model="process.transition"> <field eval="[(6,0,[])]" name="role_ids"/> <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""Manufacturing decomposition"""" name="name"/> @@ -249,5 +249,5 @@ <field model="process.node" name="source_node_id" ref="product.process_node_product0"/> </record> - </data> -</openerp>
\ No newline at end of file + </data> +</openerp> diff --git a/addons/mrp/schedulers.py b/addons/mrp/schedulers.py index 097f81f7529..f857f01dba7 100644 --- a/addons/mrp/schedulers.py +++ b/addons/mrp/schedulers.py @@ -115,7 +115,7 @@ class mrp_procurement(osv.osv): '''% (start_date, end_date, report_total, report_except, report_later) summary += '\n'.join(report) request.create(cr, uid, - {'name': "Requisition calculation report.", + {'name': "Procurement calculation report.", 'act_from': uid, 'act_to': uid, 'body': summary, diff --git a/addons/mrp/stock.py b/addons/mrp/stock.py index d395214b87a..0fc6a0ddc89 100644 --- a/addons/mrp/stock.py +++ b/addons/mrp/stock.py @@ -44,13 +44,13 @@ class stock_warehouse_orderpoint(osv.osv): 'product_uom': fields.many2one('product.uom', 'Product UOM', required=True ), 'product_min_qty': fields.float('Min Quantity', required=True, help="When the virtual stock goes belong the Min Quantity, Open ERP generates "\ - "a requisition to bring the virtual stock to the Max Quantity."), + "a procurement to bring the virtual stock to the Max Quantity."), 'product_max_qty': fields.float('Max Quantity', required=True, help="When the virtual stock goes belong the Min Quantity, Open ERP generates "\ - "a requisition to bring the virtual stock to the Max Quantity."), + "a procurement to bring the virtual stock to the Max Quantity."), 'qty_multiple': fields.integer('Qty Multiple', required=True, - help="The requisition quantity will by rounded up to this multiple."), - 'procurement_id': fields.many2one('mrp.procurement', 'Latest Requisition'), + help="The procurement quantity will by rounded up to this multiple."), + 'procurement_id': fields.many2one('mrp.procurement', 'Latest procurement'), 'company_id': fields.many2one('res.company','Company',required=True), } _defaults = { @@ -94,7 +94,7 @@ class StockMove(osv.osv): _inherit = 'stock.move' _columns = { 'production_id': fields.many2one('mrp.production', 'Production', select=True), - 'procurements': fields.one2many('mrp.procurement', 'move_id', 'Requisitions'), + 'procurements': fields.one2many('mrp.procurement', 'move_id', 'Procurements'), } def copy(self, cr, uid, id, default=None, context=None): default = default or {} diff --git a/addons/mrp/wizard/make_procurement_view.xml b/addons/mrp/wizard/make_procurement_view.xml index 08c4b2cabf5..c60f2818ab2 100644 --- a/addons/mrp/wizard/make_procurement_view.xml +++ b/addons/mrp/wizard/make_procurement_view.xml @@ -1,39 +1,39 @@ <?xml version="1.0" encoding="utf-8"?> <openerp> <data> - + <!-- Make Procurement --> - - <record id="view_make_procurment_wizard" model="ir.ui.view"> - <field name="name">Requisition Request</field> + + <record id="view_make_procurment_wizard" model="ir.ui.view"> + <field name="name">Procurement Request</field> <field name="model">make.procurement</field> <field name="type">form</field> <field name="arch" type="xml"> - <form string="Requisition Request"> - <label string="This wizard will plan the procurement for this product. This procurement may generate task, production orders or purchase orders." colspan="4"/> - <field name="product_id" on_change="onchange_product_id(product_id)"/> - <field name="qty"/> - <field name="uom_id"/> - <field name="date_planned"/> - <field name="warehouse_id" colspan="4"/> - <newline/> - <group col="2" colspan="4"> - <button icon='gtk-cancel' special="cancel" - string="Cancel" /> - <button name="make_procurement" string="Ask New Products" - colspan="1" type="object" icon="gtk-ok" /> - </group> + <form string="Procurement Request"> + <label string="This wizard will plan the procurement for this product. This procurement may generate task, production orders or purchase orders." colspan="4"/> + <field name="product_id" on_change="onchange_product_id(product_id)"/> + <field name="qty"/> + <field name="uom_id"/> + <field name="date_planned"/> + <field name="warehouse_id" colspan="4"/> + <newline/> + <group col="2" colspan="4"> + <button icon='gtk-cancel' special="cancel" + string="Cancel" /> + <button name="make_procurement" string="Ask New Products" + colspan="1" type="object" icon="gtk-ok" /> + </group> </form> </field> </record> - <act_window name="Requisition Request" - res_model="make.procurement" - src_model="product.product" - view_mode="form" - target="new" - key2="client_action_multi" - id="act_make_procurement"/> - - </data> -</openerp> + <act_window name="Procurement Request" + res_model="make.procurement" + src_model="product.product" + view_mode="form" + target="new" + key2="client_action_multi" + id="act_make_procurement"/> + + </data> +</openerp> diff --git a/addons/mrp/wizard/mrp_procurement_view.xml b/addons/mrp/wizard/mrp_procurement_view.xml index 6d78f89793d..817f7011e0c 100644 --- a/addons/mrp/wizard/mrp_procurement_view.xml +++ b/addons/mrp/wizard/mrp_procurement_view.xml @@ -1,34 +1,34 @@ <?xml version="1.0" encoding="utf-8"?> <openerp> <data> - + <!-- Compute Procurement --> - - <record id="view_compute_procurment_wizard" model="ir.ui.view"> + + <record id="view_compute_procurment_wizard" model="ir.ui.view"> <field name="name">Compute Procurements</field> <field name="model">mrp.procurement.compute</field> <field name="type">form</field> <field name="arch" type="xml"> <form string="Parameters"> - <label string="This wizard will schedule procurements." colspan="4" align="0.0"/> - <newline/> - <group col="2" colspan="4"> - <button icon='gtk-cancel' special="cancel" - string="Cancel" /> - <button name="procure_calculation" string="Compute Requisitions" - colspan="1" type="object" icon="gtk-ok" /> - </group> + <label string="This wizard will schedule procurements." colspan="4" align="0.0"/> + <newline/> + <group col="2" colspan="4"> + <button icon='gtk-cancel' special="cancel" + string="Cancel" /> + <button name="procure_calculation" string="Compute Procurements" + colspan="1" type="object" icon="gtk-ok" /> + </group> </form> </field> </record> -<!-- <act_window name="Compute Procurements" --> -<!-- res_model="mrp.procurement.compute"--> -<!-- src_model="mrp.procurement"--> -<!-- view_mode="form"--> -<!-- target="new" --> +<!-- <act_window name="Compute Procurements" --> +<!-- res_model="mrp.procurement.compute"--> +<!-- src_model="mrp.procurement"--> +<!-- view_mode="form"--> +<!-- target="new" --> <!-- key2="client_action_multi" --> -<!-- id="act_compute_procurement"/> --> - - </data> -</openerp> +<!-- id="act_compute_procurement"/> --> + + </data> +</openerp> diff --git a/addons/mrp_jit/mrp_jit.xml b/addons/mrp_jit/mrp_jit.xml index 14821c63e63..90f6f94cfa0 100644 --- a/addons/mrp_jit/mrp_jit.xml +++ b/addons/mrp_jit/mrp_jit.xml @@ -3,7 +3,7 @@ <data> # ----------------------------------------------------------- - # Requisition - Automatic schedule + # Procurements - Automatic schedule # ----------------------------------------------------------- <record model="workflow.transition" id="mrp.trans_confirm_confirm_wait"> diff --git a/addons/product/product.py b/addons/product/product.py index 72fcfa5afd2..6c3d7ef17b5 100644 --- a/addons/product/product.py +++ b/addons/product/product.py @@ -256,11 +256,11 @@ class product_template(osv.osv): 'description': fields.text('Description',translate=True), 'description_purchase': fields.text('Purchase Description',translate=True), 'description_sale': fields.text('Sale Description',translate=True), - 'type': fields.selection([('product','Stockable Product'),('consu', 'Consumable'),('service','Service')], 'Product Type', required=True, help="Will change the way requisitions are processed. Consumables are stockable products with infinite stock, or for use when you have no inventory management in the system."), + 'type': fields.selection([('product','Stockable Product'),('consu', 'Consumable'),('service','Service')], 'Product Type', required=True, help="Will change the way procurements are processed. Consumables are stockable products with infinite stock, or for use when you have no inventory management in the system."), 'supply_method': fields.selection([('produce','Produce'),('buy','Buy')], 'Supply method', required=True, help="Produce will generate production order or tasks, according to the product type. Purchase will trigger purchase orders when requested."), 'sale_delay': fields.float('Customer Lead Time', help="This is the average time between the confirmation of the customer order and the delivery of the finished products. It's the time you promise to your customers."), 'produce_delay': fields.float('Manufacturing Lead Time', help="Average time to produce this product. This is only for the production order and, if it is a multi-level bill of material, it's only for the level of this product. Different lead times will be summed for all levels and purchase orders."), - 'procure_method': fields.selection([('make_to_stock','Make to Stock'),('make_to_order','Make to Order')], 'Requisition Method', required=True, help="'Make to Stock': When needed, take from the stock or wait until re-supplying. 'Make to Order': When needed, purchase or produce for the requisition request."), + 'procure_method': fields.selection([('make_to_stock','Make to Stock'),('make_to_order','Make to Order')], 'Procurement Method', required=True, help="'Make to Stock': When needed, take from the stock or wait until re-supplying. 'Make to Order': When needed, purchase or produce for the procurement request."), 'rental': fields.boolean('Can be Rent'), 'categ_id': fields.many2one('product.category','Category', required=True, change_default=True, domain="[('type','=','normal')]"), 'list_price': fields.float('Sale Price', digits_compute=dp.get_precision('Sale Price'), help="Base price for computing the customer price. Sometimes called the catalog price."), diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml index a01649850c7..bf6b2d56740 100644 --- a/addons/product/product_view.xml +++ b/addons/product/product_view.xml @@ -84,7 +84,7 @@ <notebook colspan="4"> <page string="Information"> <group colspan="2" col="2"> - <separator string=" Requisition" colspan="2"/> + <separator string="Procurement" colspan="2"/> <field name="type" select="2"/> <field name="procure_method"/> <field name="supply_method"/> @@ -118,7 +118,7 @@ </group> </page> - <page string="Requisition & Locations"> + <page string="Procurement & Locations"> <group colspan="2" col="2" name="delay"> <separator string="Delays" colspan="2"/> <field name="sale_delay" attrs="{'readonly':[('sale_ok','=',0)]}"/> @@ -528,7 +528,7 @@ <notebook colspan="4"> <page string="Information"> <group colspan="2" col="2"> - <separator string="Requisition" colspan="2"/> + <separator string="Procurement" colspan="2"/> <field name="type" select="2"/> <field name="procure_method"/> <field name="supply_method"/> @@ -562,7 +562,7 @@ </group> </page> - <page string="Requisition & Locations"> + <page string="Procurement & Locations"> <group colspan="2" col="2" name="delay"> <separator string="Delays" colspan="2"/> <field name="sale_delay" attrs="{'readonly':[('sale_ok','=',0)]}"/> diff --git a/addons/project_mrp/process/project_mrp_process.xml b/addons/project_mrp/process/project_mrp_process.xml index b087883618f..78c858f43dc 100755 --- a/addons/project_mrp/process/project_mrp_process.xml +++ b/addons/project_mrp/process/project_mrp_process.xml @@ -6,7 +6,7 @@ Process Node --> - <record id="process_node_procuretasktask0" model="process.node"> + <record id="process_node_procuretasktask0" model="process.node"> <field name="menu_id" ref="project.menu_action_view_task"/> <field name="model_id" ref="project.model_project_task"/> <field eval=""""subflow"""" name="kind"/> @@ -46,9 +46,9 @@ Process Transition --> - <record id="process_transition_procuretask0" model="process.transition"> + <record id="process_transition_procuretask0" model="process.transition"> <field eval="[(6,0,[])]" name="transition_ids"/> - <field eval="""" Requisition Task"""" name="name"/> + <field eval=""""Procurement Task"""" name="name"/> <field eval=""""if product type is 'service' then it creates the task."""" name="note"/> <field model="process.node" name="target_node_id" ref="process_node_procuretasktask0"/> <field model="process.node" name="source_node_id" ref="sale.process_node_saleprocurement0"/> @@ -65,35 +65,10 @@ <record id="process_transition_ordertask0" model="process.transition"> <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""Order Task"""" name="name"/> - <field eval=""""If Requisition method is Make to order and supply method is produce"""" name="note"/> + <field eval=""""If procurement method is Make to order and supply method is produce"""" name="note"/> <field model="process.node" name="target_node_id" ref="process_node_mrptask0"/> <field model="process.node" name="source_node_id" ref="mrp.process_node_serviceonorder0"/> </record> - <!-- - Process Action - --> - -<!-- <record id="process_transition_action_orderconfirmtask0" model="process.transition.action">--> -<!-- <field eval=""""action_confirm"""" name="action"/>--> -<!-- <field eval=""""object"""" name="state"/>--> -<!-- <field eval=""""Confirm"""" name="name"/>--> -<!-- <field name="transition_id" ref="process_transition_ordertask0"/>--> -<!-- </record>--> -<!-- --> -<!-- <record id="process_transition_action_ordercanceltask0" model="process.transition.action">--> -<!-- <field eval=""""action_cancel"""" name="action"/>--> -<!-- <field eval=""""object"""" name="state"/>--> -<!-- <field eval=""""Cancel"""" name="name"/>--> -<!-- <field name="transition_id" ref="process_transition_ordertask0"/>--> -<!-- </record>--> -<!-- --> -<!-- <record id="process_transition_action_taskrunprocurement0" model="process.transition.action">--> -<!-- <field eval=""""write({'state':'exception'})"""" name="action"/>--> -<!-- <field eval=""""object"""" name="state"/>--> -<!-- <field eval=""""Run Requisition"""" name="name"/>--> -<!-- <field name="transition_id" ref="process_transition_ordertask0"/>--> -<!-- </record>--> - </data> </openerp> diff --git a/addons/project_mrp/project.py b/addons/project_mrp/project.py index 4f0cbdc2251..4a304362ec2 100644 --- a/addons/project_mrp/project.py +++ b/addons/project_mrp/project.py @@ -26,7 +26,7 @@ class project_task(osv.osv): _name = "project.task" _inherit = "project.task" _columns = { - 'procurement_id': fields.many2one('mrp.procurement', 'Requisition', ondelete='set null') + 'procurement_id': fields.many2one('mrp.procurement', 'Procurement', ondelete='set null') } def do_close(self, cr, uid, ids, *args): res = super(project_task, self).do_close(cr, uid, ids, *args) diff --git a/addons/sale/process/sale_process.xml b/addons/sale/process/sale_process.xml index 106bdd8793d..5da1a96f8d4 100755 --- a/addons/sale/process/sale_process.xml +++ b/addons/sale/process/sale_process.xml @@ -33,7 +33,7 @@ <field name="model_id" ref="sale.model_sale_order"/> <field eval=""""subflow"""" name="kind"/> <field eval=""""Sale Order Requisition"""" name="name"/> - <field eval=""""Drives requisition orders for every sale order line."""" name="note"/> + <field eval=""""Drives procurement orders for every sale order line."""" name="note"/> <field name="subflow_id" ref="process_process_salesprocess0"/> <field name="process_id" ref="mrp.process_process_procurementprocess0"/> <field eval=""""object.state in ('draft', 'waiting_date', 'manual', 'progress', 'shipping_except', 'invoice_except', 'done', 'cancel')"""" name="model_states"/> @@ -66,8 +66,8 @@ <field name="menu_id" ref="mrp.menu_mrp_procurement_action"/> <field name="model_id" ref="mrp.model_mrp_procurement"/> <field eval=""""subflow"""" name="kind"/> - <field eval=""""Requisition Order"""" name="name"/> - <field eval=""""One requisition order for each sale order line and for each of the components."""" name="note"/> + <field eval=""""Procurement Order"""" name="name"/> + <field eval=""""One Procurement order for each sale order line and for each of the components."""" name="note"/> <field name="subflow_id" ref="mrp.process_process_procurementprocess0"/> <field name="process_id" ref="process_process_salesprocess0"/> <field eval=""""object.state=='confirmed'"""" name="model_states"/> @@ -158,8 +158,8 @@ <record id="process_transition_saleprocurement0" model="process.transition"> <field eval="[(6,0,[])]" name="transition_ids"/> - <field eval=""""Create Requisition Order"""" name="name"/> - <field eval=""""A requisition order is automatically created as soon as a sale order is confirmed or as the invoice is paid. It drives the purchasing and the production of products regarding to the rules and to the sale order's parameters. """" name="note"/> + <field eval=""""Create Procurement Order"""" name="name"/> + <field eval=""""A procurement order is automatically created as soon as a sale order is confirmed or as the invoice is paid. It drives the purchasing and the production of products regarding to the rules and to the sale order's parameters. """" name="note"/> <field model="process.node" name="target_node_id" ref="process_node_saleprocurement0"/> <field model="process.node" name="source_node_id" ref="process_node_saleorder0"/> </record> @@ -167,7 +167,7 @@ <record id="process_transition_packing0" model="process.transition"> <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""Create Pick List"""" name="name"/> - <field eval=""""The Pick List form is created as soon as the sale order is confirmed, in the same time as the requisition order. It represents the assignment of parts to the sale order. There is 1 pick list by sale order line which evolves with the availability of parts."""" name="note"/> + <field eval=""""The Pick List form is created as soon as the sale order is confirmed, in the same time as the procurement order. It represents the assignment of parts to the sale order. There is 1 pick list by sale order line which evolves with the availability of parts."""" name="note"/> <field model="process.node" name="target_node_id" ref="process_node_packinglist0"/> <field model="process.node" name="source_node_id" ref="process_node_saleprocurement0"/> </record> @@ -200,8 +200,8 @@ <record id="process_transition_saleorderprocurement0" model="process.transition"> <field eval="[(6,0,[])]" name="role_ids"/> <field eval="[(6,0,[])]" name="transition_ids"/> - <field eval=""""Requisition of sold material"""" name="name"/> - <field eval=""""For every sale order line, a requisition order is created to supply the sold product."""" name="note"/> + <field eval=""""Procurement of sold material"""" name="name"/> + <field eval=""""For every sale order line, a procurement order is created to supply the sold product."""" name="note"/> <field model="process.node" name="target_node_id" ref="mrp.process_node_procureproducts0"/> <field model="process.node" name="source_node_id" ref="process_node_saleorderprocurement0"/> </record> diff --git a/addons/sale/sale.py b/addons/sale/sale.py index 8b77719171a..5428cd1c360 100644 --- a/addons/sale/sale.py +++ b/addons/sale/sale.py @@ -776,12 +776,12 @@ class sale_order_line(osv.osv): 'product_id': fields.many2one('product.product', 'Product', domain=[('sale_ok', '=', True)], change_default=True), 'invoice_lines': fields.many2many('account.invoice.line', 'sale_order_line_invoice_rel', 'order_line_id', 'invoice_id', 'Invoice Lines', readonly=True), 'invoiced': fields.boolean('Invoiced', readonly=True), - 'procurement_id': fields.many2one('mrp.procurement', 'Requisition'), + 'procurement_id': fields.many2one('mrp.procurement', 'Procurement'), 'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Sale Price'), readonly=True, states={'draft':[('readonly',False)]}), 'price_net': fields.function(_amount_line_net, method=True, string='Net Price', digits_compute= dp.get_precision('Sale Price')), 'price_subtotal': fields.function(_amount_line, method=True, string='Subtotal', digits_compute= dp.get_precision('Sale Price')), 'tax_id': fields.many2many('account.tax', 'sale_order_tax', 'order_line_id', 'tax_id', 'Taxes', readonly=True, states={'draft':[('readonly',False)]}), - 'type': fields.selection([('make_to_stock', 'from stock'), ('make_to_order', 'on order')], 'Requisition Method', required=True, readonly=True, states={'draft':[('readonly',False)]}), + 'type': fields.selection([('make_to_stock', 'from stock'), ('make_to_order', 'on order')], 'Procurement Method', required=True, readonly=True, states={'draft':[('readonly',False)]}), 'property_ids': fields.many2many('mrp.property', 'sale_order_line_property_rel', 'order_id', 'property_id', 'Properties', readonly=True, states={'draft':[('readonly',False)]}), 'address_allotment_id': fields.many2one('res.partner.address', 'Allotment Partner'), 'product_uom_qty': fields.float('Quantity (UoM)', digits=(16, 2), required=True, readonly=True, states={'draft':[('readonly',False)]}), diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml index 5b496586864..e193c0609f9 100644 --- a/addons/sale/sale_view.xml +++ b/addons/sale/sale_view.xml @@ -200,8 +200,8 @@ <button name="order_confirm" states="draft" string="Confirm Order" icon="gtk-apply"/> <button name="invoice_recreate" states="invoice_except" string="Recreate Invoice" icon="gtk-print"/> <button name="invoice_corrected" states="invoice_except" string="Invoice Corrected" icon="gtk-apply"/> - <button name="ship_recreate" states="shipping_except" string="Recreate Requisition" icon="gtk-ok"/> - <button name="ship_corrected" states="shipping_except" string="Requisition Corrected" icon="gtk-apply"/> + <button name="ship_recreate" states="shipping_except" string="Recreate Procurement" icon="gtk-ok"/> + <button name="ship_corrected" states="shipping_except" string="Procurement Corrected" icon="gtk-apply"/> <button name="manual_invoice" states="manual" string="Create Invoice" icon="gtk-print"/> <button name="ship_cancel" states="shipping_except" string="Cancel Order" icon="gtk-cancel"/> <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/> diff --git a/addons/stock/product.py b/addons/stock/product.py index ce933686760..ad189ee546a 100644 --- a/addons/stock/product.py +++ b/addons/stock/product.py @@ -335,7 +335,7 @@ class product_template(osv.osv): 'stock.location', type='many2one', relation='stock.location', - string="Requisition Location", + string="Procurement Location", method=True, view_load=True, domain=[('usage','like','procurement')], diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index 8d034b0ecee..512acab90e3 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -1439,7 +1439,7 @@ <field name="arch" type="xml"> <tree colors="grey:state in ('cancel','done');black:state not in ('cancel','done')" string="Moves"> <field name="picking_id" string="Reference"/> - <field name="origin" string="Latest Requisition"/> + <field name="origin" string="Latest Procurement"/> <field name="partner_id" string="Supplier"/> <field name="product_id"/> <field name="product_qty" /> @@ -1517,7 +1517,7 @@ <filter icon="terp-stock" string="Back Orders" domain="[('backorder_id','!=',False)]" help="Back Orders"/> <filter icon="terp-stock" string="Planned Today" domain="[('date_planned::date','=',time.strftime('%%Y-%%m-%%d'))]" help="Orders planned for today"/> <separator orientation="vertical"/> - <field name="origin" string="Latest Requisition" select="1"/> + <field name="origin" string="Latest Procurement" select="1"/> <field name="partner_id" string="Supplier" select="1"/> <field name="product_id"/> </group> diff --git a/addons/stock_location/stock_view.xml b/addons/stock_location/stock_view.xml index b3730cb4979..bdb62963c09 100644 --- a/addons/stock_location/stock_view.xml +++ b/addons/stock_location/stock_view.xml @@ -40,7 +40,7 @@ <field name="type">form</field> <field name="inherit_id" ref="product.product_normal_form_view"/> <field name="arch" type="xml"> - <page string="Requisition & Locations"> + <page string="Procurement & Locations"> <field name="path_ids" editable="bottom" colspan="4" nolabel="1"> <tree string="Location Paths" editable="bottom"> <field name="location_from_id"/> |